From 7572552bcebd353050f95a1965526e2fadb31f67 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 08 Aug 2023 16:56:31 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml
index d0c896a..561f6fa 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml
@@ -41,8 +41,11 @@
         <if test="vo.source !=null and vo.source !=''">
             AND L.SOURCE = #{vo.source}
         </if>
-        <if test="vo.daterange !=null and  vo.daterange.length >  0">
-            AND L.CREATE_TIME &gt;= #{vo.daterange[0]} AND L.CREATE_TIME &lt;= #{vo.daterange[1]}
+        <if test="vo.startTime !=null and vo.startTime !=''">
+            AND DATE_FORMAT(L.create_time,'%Y-%m-%d') &gt;= #{vo.startTime}
+        </if>
+        <if test="vo.endTime !=null and vo.endTime !=''">
+            AND DATE_FORMAT(L.create_time,'%Y-%m-%d') &lt;= #{vo.endTime}
         </if>
         ORDER BY L.CREATE_TIME DESC
     </select>

--
Gitblit v1.9.3