From 6b96cc216e1713c5bf3a3b3e3ec42064bb22065c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 28 Nov 2022 14:01:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2test2:BETWEEN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcPartyActivityDao.xml       | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
index 9fccc0de07..6592c11b89 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
@@ -89,11 +89,8 @@
             <if test='null != serviceMatter and "" != serviceMatter'>
                 AND sr.SERVICE_MATTER = #{serviceMatter}
             </if>
-            <if test=" null != startTime and startTime != '' ">
-                AND a.ACTIVITY_TIME <![CDATA[ >= ]]> #{startTime}
-            </if>
-            <if test="null != endTime and endTime != '' ">
-                AND a.ACTIVITY_TIME <![CDATA[ <= ]]> #{endTime}
+            <if test=" null != startTime and startTime != '' and null != endTime and endTime != ''">
+                AND a.ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime}
             </if>
             GROUP BY a.id
         ORDER BY a.ACTIVITY_TIME DESC