From 78ae50b3a12cc96834222d0f15dca4982492f934 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 5 Jan 2022 11:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9EactType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/work/CanceledActResultDTO.java  | 4 ++++
 .../com/epmet/dto/result/work/FinishedActResultDTO.java  | 5 +++++
 .../epmet/dto/result/work/InProgressActResultDTO.java    | 5 +++++
 .../src/main/resources/mapper/ActInfoDao.xml             | 9 ++++++---
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java
index 17e21fc678..89b1374c03 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java
@@ -57,4 +57,8 @@ public class CanceledActResultDTO implements Serializable {
      * 活动地点
      */
     private String actAddress;
+    /**
+     * 活动类型 爱心活动heart 联建活动party
+     */
+    private String actType;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java
index a908287e24..113d5dc46e 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java
@@ -58,4 +58,9 @@ public class FinishedActResultDTO implements Serializable {
      * 活动地点
      */
     private String actAddress;
+
+    /**
+     * 活动类型 爱心活动heart 联建活动party
+     */
+    private String actType;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java
index 7f0d214f70..eae286055b 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java
@@ -82,4 +82,9 @@ public class InProgressActResultDTO implements Serializable {
      * 活动地点
      */
     private String actAddress;
+
+    /**
+     * 活动类型 爱心活动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 6d3b77e446..f06e68a08f 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
@@ -532,7 +532,8 @@
             ) AS signedUp,
         ai.SIGN_UP_END_TIME as signUpEndTime,
         ai.SIGN_UP_START_TIME as signUpStartTime,
-        ai.ACT_ADDRESS as actAddress
+        ai.ACT_ADDRESS as actAddress,
+        ai.act_type as actType
         FROM
             act_info ai
         WHERE
@@ -553,7 +554,8 @@
             ai.ACT_END_TIME AS actEndTime,
             ai.CANCEL_TIME AS cancelTime,
             ai.CANCEL_REASON AS cancelReason,
-            ai.ACT_ADDRESS as actAddress
+            ai.ACT_ADDRESS as actAddress,
+            ai.act_type as actType
         FROM
             act_info ai
         WHERE
@@ -575,7 +577,8 @@
             ai.ACT_END_TIME AS actEndTime,
             ai.ACTUAL_START_TIME as actualStartTime,
             ai.ACTUAL_END_TIME as actualEndTime,
-            ai.ACT_ADDRESS as actAddress
+            ai.ACT_ADDRESS as actAddress,
+            ai.act_type as actType
         FROM
             act_info ai
         WHERE