From c6acf648b8bcee16df04dcc26e146c5d2dfb00b4 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 08 七月 2025 11:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/SysQuartzLogMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/SysQuartzLogMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/SysQuartzLogMapper.xml
index af40faf..bac0744 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/SysQuartzLogMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/SysQuartzLogMapper.xml
@@ -5,6 +5,7 @@
<!--鍒嗛〉鍒楄〃鏌ヨ-->
<select id="pageList" resultType="org.jeecg.modules.quartz.dto.SysQuartzLogDto">
SELECT
+ t2.job_name jobName,
t2.job_class_name jobClassName,
t2.cron_expression cronExpression,
t1.params params,
@@ -24,8 +25,8 @@
<if test="sysQuartzLogVo.startTime != null and sysQuartzLogVo.startTime != '' and sysQuartzLogVo.endTime != null and sysQuartzLogVo.endTime != ''">
AND t1.create_time BETWEEN #{ sysQuartzLogVo.startTime } AND #{ sysQuartzLogVo.endTime }
</if>
- <if test="sysQuartzLogVo.jobClassName != null and sysQuartzLogVo.jobClassName != ''">
- AND t2.job_class_name LIKE CONCAT(CONCAT('%',#{ sysQuartzLogVo.jobClassName }),'%')
+ <if test="sysQuartzLogVo.jobName != null and sysQuartzLogVo.jobName != ''">
+ AND t2.job_name LIKE CONCAT(CONCAT('%',#{ sysQuartzLogVo.jobName }),'%')
</if>
<if test="sysQuartzLogVo.description != null and sysQuartzLogVo.description != ''">
AND t2.description LIKE CONCAT(CONCAT('%',#{ sysQuartzLogVo.description }),'%')
@@ -37,6 +38,7 @@
<select id="list" resultType="org.jeecg.modules.quartz.dto.SysQuartzLogDto">
SELECT
+ t2.job_name jobName,
t2.job_class_name jobClassName,
t2.cron_expression cronExpression,
t1.params params,
@@ -56,8 +58,8 @@
<if test="sysQuartzLogVo.startTime != null and sysQuartzLogVo.startTime != '' and sysQuartzLogVo.endTime != null and sysQuartzLogVo.endTime != ''">
AND t1.create_time BETWEEN #{ sysQuartzLogVo.startTime } AND #{ sysQuartzLogVo.endTime }
</if>
- <if test="sysQuartzLogVo.jobClassName != null and sysQuartzLogVo.jobClassName != ''">
- AND t2.job_class_name LIKE CONCAT(CONCAT('%',#{ sysQuartzLogVo.jobClassName }),'%')
+ <if test="sysQuartzLogVo.jobName != null and sysQuartzLogVo.jobName != ''">
+ AND t2.job_name LIKE CONCAT(CONCAT('%',#{ sysQuartzLogVo.jobName }),'%')
</if>
<if test="sysQuartzLogVo.description != null and sysQuartzLogVo.description != ''">
AND t2.description LIKE CONCAT(CONCAT('%',#{ sysQuartzLogVo.description }),'%')
--
Gitblit v1.9.3