From d3473ccb4222f8573a7978c1c02e6aa6772854d1 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 5 Jan 2022 10:39:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0actType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/resi/ResiInProgressActResultDTO.java   |  5 +++++
 .../dto/result/resi/ResiLatestActResultDTO.java   |  5 +++++
 .../src/main/resources/mapper/ActInfoDao.xml      | 15 ++++++++++-----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiInProgressActResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiInProgressActResultDTO.java
index b6905711fe..055e35663d 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiInProgressActResultDTO.java
+++ b/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;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLatestActResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLatestActResultDTO.java
index 1bf6b8124e..c0a4aadbf0 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLatestActResultDTO.java
+++ b/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;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
index e0444a82d3..f2054d890f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
@@ -228,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'
@@ -253,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'
@@ -278,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'
@@ -315,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'
@@ -335,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'