From 89ca18b91f82af4d1e0db8e913b0ae883f8604e9 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 22 Dec 2021 16:38:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85=E8=BF=94?=
 =?UTF-8?q?=E5=8F=82=E9=99=84=E4=BB=B6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/EventDetailResultDTO.java      | 23 +++++++++++++++++++
 .../service/impl/ResiEventServiceImpl.java    | 13 +++++++++++
 .../main/resources/mapper/ResiEventDao.xml    |  9 ++++++--
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
index 0b6bb8ccb2..71b72e456d 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java
@@ -76,6 +76,16 @@ public class EventDetailResultDTO implements Serializable {
      */
     private String eventPeopleName;
 
+    /**
+     * 语音附件url集合
+     */
+    private List<String> voiceList;
+    /**
+     * 报事图片
+     */
+    @JsonIgnore
+    private List<Attachment> attachmentList;
+
     @JsonIgnore
     private String eventUserId;
 
@@ -105,4 +115,17 @@ public class EventDetailResultDTO implements Serializable {
         this.eventPerson = new ArrayList<>();
         this.projectInfo = new EventProjectInfoDTO();
     }
+
+    @Data
+    public static class Attachment {
+        /**
+         * url
+         */
+        private String url;
+
+        /**
+         * 附件类型
+         */
+        private String type;
+    }
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 0748e862f4..ac6121bcaa 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -200,6 +200,19 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         if (null == dto){
             return new EventDetailResultDTO();
         }
+        //附件按类型分组【图片、语音】
+        List<String> eventImgs = new ArrayList<>();
+        List<String> voiceList = new ArrayList<>();
+        dto.getAttachmentList().forEach(file->{
+            if("image".equals(file.getType())){
+                eventImgs.add(file.getUrl());
+            }else if("voice".equals(file.getType())){
+                voiceList.add(file.getUrl());
+            }
+        });
+        dto.setEventImgs(eventImgs);
+        dto.setVoiceList(voiceList);
+
         // 已转项目
         if (dto.getIsProject()){
             // 查询项目信息
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 d88575dbab..8ab7e0266d 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
@@ -121,8 +121,12 @@
         <result property="projectId" column="projectId"/>
         <result property="gridId" column="gridId"/>
         <result property="eventUserId" column="eventUserId"/>
-        <collection property="eventImgs" ofType="java.lang.String">
+        <!--<collection property="eventImgs" ofType="java.lang.String">
             <result column="eventImg"/>
+        </collection>-->
+        <collection property="attachmentList" ofType="com.epmet.dto.result.EventDetailResultDTO$Attachment">
+            <result column="url" property="url"/>
+            <result column="type" property="type"/>
         </collection>
         <collection property="eventPerson" ofType="java.lang.String">
             <result column="person"/>
@@ -141,7 +145,8 @@
             (CASE WHEN re.READ_FLAG = 1 THEN FALSE ELSE TRUE END) AS isRollback,
             (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject,
             IFNULL(re.project_id,'') AS projectId,
-            ea.ATTACHMENT_URL AS eventImg,
+            ea.ATTACHMENT_URL AS url,
+            ea.ATTACHMENT_TYPE AS type,
             IF(ISNULL(em.USER_SHOW_NAME),NULL,concat('人大代表-',em.USER_SHOW_NAME)) AS person,
             re.GRID_ID AS gridId,
             re.CREATED_BY AS eventUserId,