From 3be95bc577c4f63da3b09f791b3e4854a481938f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 12 Jul 2019 10:11:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E7=BB=84=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/quartz/SysJobLogMapper.xml | 3 +++
 .../src/main/resources/templates/monitor/job/jobLog.html | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
index ac35e6281..745bed364 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
+++ b/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>
diff --git a/ruoyi-quartz/src/main/resources/templates/monitor/job/jobLog.html b/ruoyi-quartz/src/main/resources/templates/monitor/job/jobLog.html
index 47a4c931f..a287e08dc 100644
--- a/ruoyi-quartz/src/main/resources/templates/monitor/job/jobLog.html
+++ b/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>