Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java

@@ -22,5 +22,6 @@ public class IcEventResultDTO {
     private String mobile;
     private String address;
     private String happenTime;
+    private String imgUrl;
 
 }

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -626,7 +626,8 @@
             e.LONGITUDE,
             e.EVENT_CONTENT AS eventContent,
             r.MANAGE_STATUS AS manageStatus,
-            c.CATEGORY_CODE AS categoryCode
+            c.CATEGORY_CODE AS categoryCode,
+            rea.ATTACHMENT_URL AS imgUrl
     </sql>
 
     <select id="getListByStatus" resultType="com.epmet.dto.result.IcEventResultDTO">
@@ -635,6 +636,7 @@
         FROM ic_event e
         LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID
         LEFT JOIN ic_event_category c ON c.IC_EVENT_ID = e.ID
+        LEFT JOIN ic_event_attachment rea ON rea.ic_event_id = e.ID AND rea.del_flag = '0'
         <where>
             e.DEL_FLAG = 0
             <if test="null != orgIdPath and orgIdPath != ''">
@@ -663,6 +665,7 @@
         FROM ic_event e
         LEFT JOIN ic_event_reply r ON r.IC_EVENT_ID = e.ID
         LEFT JOIN ic_event_category c ON c.IC_EVENT_ID = e.ID
+        LEFT JOIN ic_event_attachment rea ON rea.ic_event_id = e.ID AND rea.del_flag = '0'
         <where>
             e.DEL_FLAG = 0
             <if test="null != orgIdPath and orgIdPath != ''">

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.resi.partymember.dto.icpartyact.result;
 
+import com.epmet.commons.tools.dto.form.FileCommonDTO;
 import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -79,5 +80,7 @@ public class IcPartyActPageResultDTO implements Serializable {
     private List<JoinOrgDTO> joinOrgList;
     //导出用
     private String joinOrgNameStr;
+
+    private List<FileCommonDTO> attachments;
 }
 

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java

@@ -8,6 +8,7 @@ import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.form.FileCommonDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -290,6 +291,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         if(!formDTO.getIsPage()){
             pageInfo.getList().forEach(l->{
                 l.setJoinOrgList(icPartyActOrgDao.selectJoinOrgList(l.getIcPartyActId()));
+                l.setAttachments(resiPartymemberAttachmentDao.selectListByBusinessId(l.getIcPartyActId()));
             });
         }
         return new PageData<>(pageInfo.getList(), pageInfo.getTotal());