From 57d1619f215d596616110584195536e1fd420b39 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 5 Jan 2022 10:26:32 +0800
Subject: [PATCH] =?UTF-8?q?/heart/resi/act/actlookback=E6=B7=BB=E5=8A=A0ac?=
 =?UTF-8?q?tType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/resi/ResiLookBackActResultDTO.java | 5 +++++
 .../src/main/resources/mapper/ActInfoDao.xml                | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLookBackActResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLookBackActResultDTO.java
index fc7d7d39e7..986bcb06c5 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLookBackActResultDTO.java
+++ b/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;
 }
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 799418736d..56e7dd02d2 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
@@ -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'