From 1a425efc2c3205955b9cfb54d720bd5781922daf Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 23 Aug 2022 09:45:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/partyOrg/result/YearSearchDetailResultDTO.java         | 1 +
 .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java
index 24ff5a1061..ef6c80ed65 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java
@@ -17,6 +17,7 @@ public class YearSearchDetailResultDTO implements Serializable {
     private static final long serialVersionUID = 8961924457475202790L;
 
     private String type;
+    private String typeValue;
     private String frequency;
     private List<IcPartyActDetailResDTO> activityList;
 }
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 4f50089f27..07c6942eec 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
@@ -417,7 +417,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
             YearSearchDetailResultDTO dto = new YearSearchDetailResultDTO();
             activityTypeList.forEach(at -> {
                 if (at.getValue().equals(type)){
-                    dto.setType(at.getLabel());
+                    dto.setType(type);
+                    dto.setTypeValue(at.getLabel());
                     dto.setFrequency(at.getFrequencyDesc());
                 }
             });