From 2b8916dc3050dd5c7a74a7c15a62ee6ec2453abe Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 29 Aug 2022 11:20:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86=E4=B8=8A=E7=9A=84=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/partyOrg/result/ActAndScheduleListResultDTO.java       | 1 +
 .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml       | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java
index fe782a2083..218c29a284 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java
@@ -42,6 +42,7 @@ public class ActAndScheduleListResultDTO implements Serializable {
         private String isAutoInform;
         private String autoInformDay;
         private String type;
+        private String actTypeName;
         private String isPublicValue;
         private String isPublish;
         private String joinTypeValue;
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
index 5ca5f6c2b5..437085a29d 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
@@ -29,6 +29,7 @@
         <result property="isPublicValue" column="isPublicValue"/>
         <result property="isPublish" column="isPublish"/>
         <result property="type" column="type"/>
+        <result property="actTypeName" column="actTypeName"></result>
         <result property="autoPublicTime" column="autoPublicTime"/>
         <result property="autoInformDay" column="autoInformDay"/>
         <result property="isAutoInformValue" column="isAutoInformValue"/>
@@ -51,6 +52,7 @@
             if(AUTO_PUBLIC_TYPE != 0,concat('活动开始前',pa.AUTO_PUBLIC_TYPE,'天'),'立即发布') as autoInformDay,
             DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') AS dateId,
             pa.ACT_TYPE AS type,
+            d.TYPE_NAME as actTypeName,
             (CASE WHEN pa.JOIN_USER_TYPE = '1' THEN '支部委员'
                 WHEN pa.JOIN_USER_TYPE = '0' THEN '全体党员'
                 ELSE '全体党员' END) AS joinTypeValue,
@@ -63,6 +65,7 @@
             ao.JOIN_ORG_ID AS partyOrgId
         FROM ic_party_act pa
         LEFT JOIN ic_party_act_org ao ON (ao.IC_PARTY_ACT_ID = pa.ID AND ao.DEL_FLAG = 0)
+        left join ic_party_act_type_dict d on(pa.act_type=d.TYPE_KEY and pa.CUSTOMER_ID=d.CUSTOMER_ID)
         WHERE pa.DEL_FLAG = 0
             AND pa.CUSTOMER_ID = #{customerId}
             <if test='null != dateId and dateId != "" '>