From 982bc25185dada2373603699ae412b4631b7e08c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 31 Jan 2024 17:13:30 +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 |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 46cba56..4729a6b 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
@@ -287,10 +287,10 @@
         where (d."ad_code" = aab."guid" or c."ad_code" = aab."guid" or b."ad_code" = aab."guid" )
         and spt.is_deleted = 0
         <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
-            AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &gt;= #{patrolTaskReport.startTime}
+            AND spt.start_time &gt;= #{patrolTaskReport.startTime}
         </if>
         <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
-            AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &lt;= #{patrolTaskReport.endTime}
+            AND spt.start_time &lt;= #{patrolTaskReport.endTime}
         </if>
         ) need ,
         (
@@ -302,10 +302,10 @@
         where (d."ad_code" = aab."guid" or c."ad_code" = aab."guid" or b."ad_code" = aab."guid" )
         and spt.is_deleted = 0 and spt.state = 3
         <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
-            AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &gt;= #{patrolTaskReport.startTime}
+            AND spt.start_time &gt;= #{patrolTaskReport.startTime}
         </if>
         <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
-            AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &lt;= #{patrolTaskReport.endTime}
+            AND spt.start_time &lt;= #{patrolTaskReport.endTime}
         </if>
         ) finish ,
         (
@@ -317,10 +317,10 @@
         where (d."ad_code" = aab."guid" or c."ad_code" = aab."guid" or b."ad_code" = aab."guid" )
         and spt.is_deleted = 0 and (spt.state = 1 or spt.state = 2)
         <if test="patrolTaskReport.startTime !=null and patrolTaskReport.startTime !=''">
-            AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &gt;= #{patrolTaskReport.startTime}
+            AND spt.start_time &gt;= #{patrolTaskReport.startTime}
         </if>
         <if test="patrolTaskReport.endTime !=null and patrolTaskReport.endTime !=''">
-            AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &lt;= #{patrolTaskReport.endTime}
+            AND spt.start_time &lt;= #{patrolTaskReport.endTime}
         </if>
         ) todo ,
         (

--
Gitblit v1.9.3