From 65f8dc99b678f2811292a5dfc6cd65528a7fc343 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 10 Jan 2022 15:06:02 +0800
Subject: [PATCH] =?UTF-8?q?fix=2047074=20=E4=BC=81=E4=B8=9A=E7=AB=AF--?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE--=E6=9F=A5=E8=AF=A2=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E4=BC=9A=E8=AE=AE--=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E4=BA=86=E5=B7=B2=E7=BB=93=E6=9D=9F=E7=9A=84=E4=BC=9A=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/mapper/xml/PayMeetingMapper.xml   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
index 3a6fc209..25596ea8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
@@ -77,10 +77,10 @@
                         pm.create_time as create_time,
                         GROUP_CONCAT(pms.company_contact_id) company_contact_ids,
                         (case
-                                when date_format(start_time, '%Y-%m-%d') > #{now} then 2
-                                when date_format(start_time, '%Y-%m-%d') <![CDATA[<=]]> #{now}
-                                        and #{now} <![CDATA[<=]]> date_format(end_time, '%Y-%m-%d') then 3
-                                when date_format(end_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} then 4
+                                when start_time > #{now} then 2
+                                when start_time <![CDATA[<=]]> #{now}
+                                        and #{now} <![CDATA[<=]]> end_time then 3
+                                when end_time <![CDATA[<]]> #{now} then 4
                                 END
                                 ) as                         meetingStatus
         from pay_meeting pm
@@ -132,10 +132,10 @@
                         pm.id,
                         pm.create_time as create_time,
                         (case
-                                when date_format(start_time, '%Y-%m-%d') > #{now} then 2
-                                when date_format(start_time, '%Y-%m-%d') <![CDATA[<=]]> #{now}
-                                        and #{now} <![CDATA[<=]]> date_format(end_time, '%Y-%m-%d') then 3
-                                when date_format(end_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} then 4
+                                when start_time > #{now} then 2
+                                when start_time <![CDATA[<=]]> #{now}
+                                        and #{now} <![CDATA[<=]]> end_time then 3
+                                when end_time <![CDATA[<]]> #{now} then 4
                                 END
                                 ) as meetingStatus
         from pay_meeting pm
@@ -148,10 +148,10 @@
     <select id="pageListContract3" resultMap="PayMeetingResultMap">
         SELECT *,
                (case
-                       when date_format(start_time, '%Y-%m-%d') > #{now} then 2
-                       when date_format(start_time, '%Y-%m-%d') <![CDATA[<=]]> #{now}
-                               and #{now} <![CDATA[<=]]> date_format(end_time, '%Y-%m-%d') then 3
-                       when date_format(end_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} then 4
+                       when start_time > #{now} then 2
+                       when start_time <![CDATA[<=]]> #{now}
+                               and #{now} <![CDATA[<=]]> end_time then 3
+                       when end_time <![CDATA[<]]> #{now} then 4
                        END
                        ) as meetingStatus
         FROM (
@@ -238,10 +238,10 @@
     <select id="queryByIdAndTime" resultMap="PayMeetingResultMap">
         select *,
             (case
-            when date_format(start_time, '%Y-%m-%d') > #{now} then 2
-            when date_format(start_time, '%Y-%m-%d') <![CDATA[<=]]> #{now}
-            and #{now} <![CDATA[<=]]> date_format(end_time, '%Y-%m-%d') then 3
-            when date_format(end_time, '%Y-%m-%d') <![CDATA[<=]]> #{now} then 4
+            when start_time > #{now} then 2
+            when start_time <![CDATA[<=]]> #{now}
+            and #{now} <![CDATA[<=]]> end_time then 3
+            when end_time <![CDATA[<]]> #{now} then 4
             END
             ) as meetingStatus
         from pay_meeting pm where id = #{id}