日历上的活动类型名称

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;

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 != "" '>