列表sql修改

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@@ -65,7 +65,7 @@
             'signing_up' AS actCurrentState, -- 活动状态：报名中，未报满
             IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
         FROM act_info i
-        LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0'
+        LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND  u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled'
         LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         AND i.ACT_STATUS = 'published'
@@ -92,7 +92,7 @@
             'enough' AS actCurrentState, -- 活动状态：报名中，已报满
             IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
         FROM act_info i
-        LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0'
+        LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND  u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled'
         LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         AND i.ACT_STATUS = 'published'
@@ -120,7 +120,7 @@
             'end_sign_up' AS actCurrentState, -- 活动状态：未开始
             IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
         FROM act_info i
-        LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0'
+        LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND  u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled'
         LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         --  活动开始时间 > 当前时间 并且  报名截止时间 < 当前时间   报名已结束,活动未开始   未开始
@@ -147,7 +147,7 @@
             'in_progress' AS actCurrentState, -- 活动状态：进行中
             IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
         FROM act_info i
-        LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0'
+        LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND  u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled'
         LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         --  活动开始时间 <= 当前时间  并且活动结束时间 >= 当前时间  进行中
@@ -174,7 +174,7 @@
             'finished' AS actCurrentState, -- 活动状态：已结束
             IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
         FROM act_info i
-        LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0'
+        LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND  u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled'
         LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         AND i.ACT_STATUS != 'canceled'
@@ -337,6 +337,7 @@
         AND r.DEL_FLAG = '0'
         AND r.USER_ID = #{userId}
         AND NOW() BETWEEN DATE_SUB(i.ACT_START_TIME, INTERVAL 1 HOUR) AND i.ACT_END_TIME
+        AND i.ACT_STATUS = 'published'
     </select>
 
     <!--活动回顾列表-->