From 200f9e99bab7dcab9360f34fa25f6fa97c33c167 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 05 Mar 2024 14:59:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
index 778888e..a064cc8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
@@ -61,11 +61,17 @@
<if test="patrolTask.title !=null and patrolTask.title!=''">
AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
</if>
+<!-- <if test="patrolTask.startTime !=null and patrolTask.startTime !=''">-->
+<!-- AND spt.start_time >= #{patrolTask.startTime}-->
+<!-- </if>-->
+<!-- <if test="patrolTask.endTime !=null and patrolTask.endTime !=''">-->
+<!-- AND spt.end_time <= #{patrolTask.endTime}-->
+<!-- </if>-->
<if test="patrolTask.startTime !=null and patrolTask.startTime !=''">
- AND spt.start_time >= #{patrolTask.startTime}
+ AND spt.create_time >= #{patrolTask.startTime}
</if>
<if test="patrolTask.endTime !=null and patrolTask.endTime !=''">
- AND spt.end_time <= #{patrolTask.endTime}
+ AND spt.create_time <= #{patrolTask.endTime}
</if>
<if test="patrolTask.projectId !=null and patrolTask.projectId !='' ">
AND spt.project_id = #{patrolTask.projectId}
--
Gitblit v1.9.3