Merge remote-tracking branch 'origin/dev_ic_mp' into develop

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-client/src/main/java/com/epmet/dto/result/resi/ResiInProgressActResultDTO.java

@@ -41,4 +41,9 @@ public class ResiInProgressActResultDTO implements Serializable {
      * 标题
      */
     private String title;
+
+    /**
+     * 活动类型 爱心活动heart 联建活动party
+     */
+    private String actType;
 }

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

@@ -82,4 +82,9 @@ public class ResiLatestActResultDTO implements Serializable {
      * 活动状态：(报名中：signing_up；已报满：enough；截止报名: end_sign_up; 已开始： in_progress;）
      */
     private String actCurrentState;
+
+    /**
+     * 活动类型 爱心活动heart 联建活动party
+     */
+    private String actType;
 }

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

@@ -66,4 +66,9 @@ public class ResiLookBackActResultDTO implements Serializable {
      * 活动状态：(已结束：finished；)
      */
     private String actCurrentState;
+
+    /**
+     * 活动类型 爱心活动heart 联建活动party
+     */
+    private String actType;
 }

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

@@ -82,4 +82,9 @@ public class ResiMyActResultDTO implements Serializable {
      * 活动当前状态(审核中auditing，审核通过passed，审核不通过refused，已结束canceld)
      */
     private String actCurrentState;
+
+    /**
+     * 活动类型 爱心活动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
@@ -197,7 +202,8 @@
             i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1)  false： 不限制名额(0)）
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
-            'auditing' AS actCurrentState -- 活动状态
+            'auditing' AS actCurrentState, -- 活动状态
+            i.act_type as actType
         FROM act_user_relation u LEFT JOIN act_info i  ON i.ID = u.ACT_ID
         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'
@@ -222,7 +228,8 @@
             i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1)  false： 不限制名额(0)）
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
-            'passed' AS actCurrentState -- 活动状态
+            'passed' AS actCurrentState, -- 活动状态
+            i.act_type as actType
         FROM act_user_relation u LEFT JOIN act_info i  ON i.ID = u.ACT_ID
         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'
@@ -247,7 +254,8 @@
             i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1)  false： 不限制名额(0)）
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
-            'refused' AS actCurrentState -- 活动状态
+            'refused' AS actCurrentState, -- 活动状态
+            i.act_type as actType
         FROM act_user_relation u LEFT JOIN act_info i  ON i.ID = u.ACT_ID
         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'
@@ -272,7 +280,8 @@
             i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1)  false： 不限制名额(0)）
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
-            'canceld' AS actCurrentState -- 活动状态
+            'canceld' AS actCurrentState, -- 活动状态
+            i.act_type as actType
         FROM act_user_relation u LEFT JOIN act_info i  ON i.ID = u.ACT_ID
         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'
@@ -309,7 +318,8 @@
             then 'end_sign_up'
             when <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> NOW()
             then 'in_progress'
-            end as actCurrentState
+            end as actCurrentState,
+            i.act_type as actType
 		FROM act_info i
         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'
@@ -329,7 +339,8 @@
             '您报名的活动即将开始'
             ELSE
             '活动进行中'
-            END title
+            END title,
+            i.act_type as actType
         FROM act_info i LEFT JOIN act_user_relation r ON i.ID = r.ACT_ID
         WHERE i.DEL_FLAG = '0'
         AND r.DEL_FLAG = '0'
@@ -349,7 +360,8 @@
             a.actStartTime,
             a.actEndTime,
             a.actAddress,
-            a.actCurrentState
+            a.actCurrentState,
+            a.actType
          FROM(
              SELECT
                 i.ID actId,
@@ -360,7 +372,8 @@
                 DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime,
                 i.ACT_ADDRESS actAddress,
                 'finished' actCurrentState,
-                i.CREATED_TIME
+                i.CREATED_TIME,
+                i.ACT_TYPE as actType
             FROM act_info i
             LEFT JOIN act_live_rec r ON r.ACT_ID = i.ID AND r.DEL_FLAG = '0'
             WHERE i.DEL_FLAG = '0'