志愿者-活动列表接口修改

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml

@@ -155,13 +155,14 @@
         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
@@ -170,18 +171,15 @@
         and relation.USER_ID = #{userId}
         and relation.STATUS not in ('3','4')
         and actInfo.ID = relation.ACT_ID
-        WHERE actInfo.DEL_FLAG = '0' and actInfo.ACT_STATUS = '1'
+        WHERE actInfo.DEL_FLAG = '0'
         <if test="timestamp != null">
             <![CDATA[ AND DATE_FORMAT(actInfo.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
         <if test='actId != null and actId != "" '>
             AND actInfo.ID = #{actId}
         </if>
-        <if test='actType != null and actType != "" and actType == "0"'>
-            <![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{timestamp}
-        </if>
         <if test='actType != null and actType != "" and actType == "1"'>
-            <![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
+            <![CDATA[ AND DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
         ) temp
         ORDER BY temp.actCurrentState ASC