工作端活动管理列表返回actType

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;
 }

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;
 }

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;
 }

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