From 990c3a14b622a647e7a4ce0ad9bb58eb55d940be Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 3 Jun 2020 15:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8sql?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
index 31d3fc6c..53886f82 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
@@ -156,14 +156,13 @@
         when <![CDATA[actInfo.SIGNUP_NUM >= ACT_QUOTA ]]> and actInfo.ACT_QUOTA_CATEGORY = 1 then '1'
         else '0' end
         when <![CDATA[ DATE_FORMAT(actInfo.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') > ]]> #{timestamp}
+        and <![CDATA[ DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> #{timestamp}
         then '2'
         when <![CDATA[ DATE_FORMAT(actInfo.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         and <![CDATA[ DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{timestamp}
         then '3'
         when <![CDATA[ DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> #{timestamp}
         then '4'
-        WHEN  actInfo.ACT_STATUS = '0'
-        THEN '5'
         end as actCurrentState,
         IF(relation.USER_ID = #{userId},'1','0') as signupFlag
         FROM
@@ -172,7 +171,7 @@
         and relation.USER_ID = #{userId}
         and relation.STATUS not in ('3','4')
         and actInfo.ID = relation.ACT_ID
-        WHERE actInfo.DEL_FLAG = '0'
+        WHERE actInfo.DEL_FLAG = '0'  and actInfo.ACT_STATUS = '1'
         <if test="timestamp != null">
             <![CDATA[ AND DATE_FORMAT(actInfo.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>