/heart/resi/act/list添加actType

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActInfoResultDTO.java

@@ -87,4 +87,9 @@ public class ResiActInfoResultDTO implements Serializable {
      *用户报名状态（no_signed_up: 未报名，signed_up: 已报名）
      */
     private String signupFlag;
+
+    /**
+     * 活动类型 爱心活动heart 联建活动party
+     */
+    private String actType;
 }

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

@@ -63,7 +63,8 @@
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'signing_up' AS actCurrentState, -- 活动状态：报名中，未报满
-            IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
+            IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag,
+            i.ACT_TYPE as actType
         FROM act_info i
         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' AND u.USER_ID = #{userId}
         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
@@ -89,7 +90,8 @@
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'enough' AS actCurrentState, -- 活动状态：报名中，已报满
-            IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
+            IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag,
+            i.ACT_TYPE as actType
         FROM act_info i
         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' AND u.USER_ID = #{userId}
         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
@@ -116,7 +118,8 @@
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'end_sign_up' AS actCurrentState, -- 活动状态：未开始
-            IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
+            IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag,
+            i.ACT_TYPE as actType
         FROM act_info i
         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' AND u.USER_ID = #{userId}
         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
@@ -142,7 +145,8 @@
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'in_progress' AS actCurrentState, -- 活动状态：进行中
-            IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
+            IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag,
+            i.ACT_TYPE as actType
         FROM act_info i
         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' AND u.USER_ID = #{userId}
         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
@@ -173,7 +177,8 @@
             when  i.ACT_STATUS = 'canceled'
             then 'canceled'
             end as actCurrentState, -- 活动状态：已结束、已取消
-            IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
+            IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag,
+            i.ACT_TYPE as actType
         FROM act_info i
         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' AND u.USER_ID = #{userId}
         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