From 8bb52031470caf07ab8b8d2ed2cd5129c819ddfa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 三月 2025 11:50:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
system/src/main/resources/mapper/quartz/SysJobLogMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/system/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/system/src/main/resources/mapper/quartz/SysJobLogMapper.xml
index 2343c73..b9d6b6c 100644
--- a/system/src/main/resources/mapper/quartz/SysJobLogMapper.xml
+++ b/system/src/main/resources/mapper/quartz/SysJobLogMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hnct.quartz.mapper.SysJobLogMapper">
+<mapper namespace="com.ycl.quartz.mapper.SysJobLogMapper">
- <resultMap type="com.hnct.quartz.domain.SysJobLog" id="SysJobLogResult">
+ <resultMap type="SysJobLog" id="SysJobLogResult">
<id property="jobLogId" column="job_log_id" />
<result property="jobName" column="job_name" />
<result property="jobGroup" column="job_group" />
@@ -20,7 +20,7 @@
from sys_job_log
</sql>
- <select id="selectJobLogList" parameterType="com.hnct.quartz.domain.SysJobLog" resultMap="SysJobLogResult">
+ <select id="selectJobLogList" parameterType="SysJobLog" resultMap="SysJobLogResult">
<include refid="selectJobLogVo"/>
<where>
<if test="jobName != null and jobName != ''">
@@ -36,10 +36,10 @@
AND invoke_target like concat('%', #{invokeTarget}, '%')
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
+ and date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
+ and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
order by create_time desc
@@ -69,7 +69,7 @@
truncate table sys_job_log
</update>
- <insert id="insertJobLog" parameterType="com.hnct.quartz.domain.SysJobLog">
+ <insert id="insertJobLog" parameterType="SysJobLog">
insert into sys_job_log(
<if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
<if test="jobName != null and jobName != ''">job_name,</if>
--
Gitblit v1.8.0