From 30f044bc9b7d22f58eb3372dd07dedf2e9ff4e55 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Tue, 23 May 2023 10:36:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/result/IcEventResultDTO.java  | 1 +
 .../src/main/resources/mapper/IcEventDao.xml                  | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java
index b22d8a944b..fcb1a04d13 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java
+++ b/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;
 
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index 0bee903e1c..4f237fb01f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/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 != ''">

From cc80e06b770df200f88871033d671d8e132f2240 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Tue, 23 May 2023 10:37:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-project-server/src/main/resources/mapper/IcEventDao.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index 4f237fb01f..5e135be6d9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
@@ -665,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 != ''">

From f6699621e75e830ed4bd7d10fc06ad0d101bbc97 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 23 May 2023 10:45:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=85=9A?=
 =?UTF-8?q?=E5=BB=BA=E6=B4=BB=E5=8A=A8=EF=BC=8C=E5=88=97=E8=A1=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/icpartyact/result/IcPartyActPageResultDTO.java         | 3 +++
 .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java
index f28f8a0083..3af4e5509a 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java
+++ b/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;
 }
 
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 c5d1d7244b..8d6142864d 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
@@ -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());