From 4a96b8e7a859ca64f8bd9aa93a0e75102d0c8e72 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Wed, 24 Aug 2022 09:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/partyOrg/result/IcPartyActListResultDTO.java         | 4 ++++
 .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java
index 29c968ba90..8644aa81c2 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java
@@ -22,6 +22,10 @@ public class IcPartyActListResultDTO implements Serializable {
 	 * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动；
 	 */
 	private String actType;
+	/**
+	 * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动；
+	 */
+	private String actTypeName;
 	/**
 	 * 活动时间
 	 */
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
index 5bd4ea3bc8..702ed4ff31 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
@@ -694,6 +694,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
 
         //2.根据所属支部及查询条件筛选数据
         List<IcPartyActListResultDTO> list = baseDao.selectresiPartyActList(formDTO);
+
+        //3.封装数据
+        List<IcPartActTypeDTO> dict = actTypeList(formDTO.getCustomerId());
+        list.forEach(u -> dict.stream().filter(r -> u.getActType().equals(r.getValue())).forEach(d -> u.setActTypeName(d.getLabel())));
+
         PageInfo<IcPartyActListResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }