Browse Source

任务日志增加分组条件查询

RuoYi 5 years ago
parent
commit
3be95bc577

+ 3 - 0
ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml

@@ -26,6 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="jobName != null and jobName != ''">
 				AND job_name like concat('%', #{jobName}, '%')
 			</if>
+			<if test="jobGroup != null and jobGroup != ''">
+				AND job_group = #{jobGroup}
+			</if>
 			<if test="status != null and status != ''">
 				AND status = #{status}
 			</if>

+ 6 - 3
ruoyi-quartz/src/main/resources/templates/monitor/job/jobLog.html

@@ -12,13 +12,16 @@
 					<div class="select-list">
 						<ul>
 							<li>
-								<label>任务名称:</label><input type="text" name="jobName"/>
+								任务名称:<input type="text" name="jobName"/>
 							</li>
 							<li>
-								<label>方法名称:</label><input type="text" name="methodName"/>
+								任务分组:<select name="jobGroup" th:with="type=${@dict.getType('sys_job_group')}">
+									<option value="">所有</option>
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+								</select>
 							</li>
 							<li>
-								<label>执行状态:</label><select name="status" th:with="type=${@dict.getType('sys_common_status')}">
+								执行状态:<select name="status" th:with="type=${@dict.getType('sys_common_status')}">
 									<option value="">所有</option>
 									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
 								</select>