From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop

---
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/SysQuartzLogMapper.xml |   70 +++++++++++++++++++++++++++++++++++
 1 files changed, 70 insertions(+), 0 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
new file mode 100644
index 0000000..bac0744
--- /dev/null
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/SysQuartzLogMapper.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.quartz.mapper.SysQuartzLogMapper">
+
+    <!--鍒嗛〉鍒楄〃鏌ヨ-->
+    <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,
+            t2.description description,
+            t1.exception_detail exceptionDetail,
+            t1.is_success isSuccess,
+            t1.execution_time executionTime,
+            t1.create_time createTime
+        FROM
+            sys_quartz_log t1
+            LEFT JOIN sys_quartz_job t2 ON t1.job_id = t2.id
+        <where>
+            AND t2.id = #{ sysQuartzLogVo.jobId }
+            <if test="sysQuartzLogVo.isSuccess != null">
+                AND t1.is_success = #{ sysQuartzLogVo.isSuccess }
+            </if>
+            <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.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 }),'%')
+            </if>
+        </where>
+        ORDER BY t1.create_time DESC
+    </select>
+
+
+    <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,
+            t2.description description,
+            t1.exception_detail exceptionDetail,
+            t1.is_success isSuccess,
+            t1.execution_time executionTime,
+            t1.create_time createTime
+        FROM
+            sys_quartz_log t1
+            LEFT JOIN sys_quartz_job t2 ON t1.job_id = t2.id
+            <where>
+            AND t2.id = #{ sysQuartzLogVo.jobId }
+            <if test="sysQuartzLogVo.isSuccess != null">
+                AND t1.is_success = #{ sysQuartzLogVo.isSuccess }
+            </if>
+            <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.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 }),'%')
+            </if>
+        </where>
+        ORDER BY t1.create_time DESC
+    </select>
+</mapper>
\ No newline at end of file

--
Gitblit v1.9.3