From a1b24f5e0e377699fc8415deeeb275a04b28b458 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 4 Aug 2020 09:39:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E6=B4=BB=E5=8A=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
index 532a1ec5b2..2c11d426dd 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
@@ -303,7 +303,6 @@
             and <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW()
             then 'end_sign_up'
             when <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> NOW()
-            and <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW()
             then 'in_progress'
             end as actCurrentState
 		FROM act_info i
@@ -311,7 +310,6 @@
         WHERE i.DEL_FLAG = '0'
         AND i.CUSTOMER_ID = #{customerId}
         AND i.ACT_STATUS != 'finished' AND i.ACT_STATUS != 'canceled'
-        AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW()
         ORDER BY i.CREATED_TIME DESC
         LIMIT 0, #{num}
     </select>