From bbfde2813b28d1fbbd51e34dbac3bc54fb103723 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 5 Aug 2021 16:16:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E4=BA=8BID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java
index 77f4eb4d68..8035108f6a 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java
@@ -29,4 +29,6 @@ public class NewEventsResultDTO implements Serializable {
      * 事件图片
      */
     private List<String> eventImgs;
+
+    private String eventId;
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index fc1ad216cb..ec756161fa 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -160,6 +160,7 @@
     <resultMap id="newEventsMap" type="com.epmet.dto.result.NewEventsResultDTO">
         <result property="eventContent" column="eventContent"/>
         <result property="eventTime" column="eventTime"/>
+        <result property="eventId" column="eventId"/>
         <collection property="eventImgs" ofType="java.lang.String">
             <result column="img"/>
         </collection>
@@ -168,7 +169,8 @@
         SELECT
         IFNULL(re.EVENT_CONTENT,'') AS eventContent,
         DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i') AS eventTime,
-        IFNULL(ea.ATTACHMENT_URL,'') AS img
+        IFNULL(ea.ATTACHMENT_URL,'') AS img,
+        re.id as eventId
         FROM resi_event_report_org ro
         LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0')
         LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND