/heart/resi/act/actlookback添加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-server/src/main/resources/mapper/ActInfoDao.xml

@@ -354,7 +354,8 @@
             a.actStartTime,
             a.actEndTime,
             a.actAddress,
-            a.actCurrentState
+            a.actCurrentState,
+            a.actType
          FROM(
              SELECT
                 i.ID actId,
@@ -365,7 +366,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'