活动修改

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

@@ -331,7 +331,7 @@
         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 '3'
+        then IF( relation.STATUS NOT IN ( '3', '4' ) AND relation.STATUS IS NOT NULL, '1', '3' )
         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}