From 501379ad082a34302734eb3cb708c6e157c0abfd Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 10 Jun 2022 09:43:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=AF=AD=E9=9F=B3=E9=99=84=E4=BB=B6=E8=BF=94=E5=8F=82?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/IcEventListResultDTO.java     |  2 +-
 .../com/epmet/service/impl/IcEventServiceImpl.java     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java
index 3daaf0de18..408d0c1ea6 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java
@@ -44,7 +44,7 @@ public class IcEventListResultDTO implements Serializable {
     /**
      * 音频[url集合]
      */
-    private List<String> voiceList;
+    private List<Attachment> voiceList;
     /**
      * 上报渠道
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index 7a43bf8e82..438cbc54ae 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -135,12 +135,12 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 //每个事件对应的图片数据
                 if(!CollectionUtils.isEmpty(dto.getAttachmentList())){
                     List<String> imageList = new ArrayList<>();
-                    List<String> voiceList = new ArrayList<>();
+                    List<IcEventListResultDTO.Attachment> voiceList = new ArrayList<>();
                     for(IcEventListResultDTO.Attachment file: dto.getAttachmentList()){
                         if ("image".equals(file.getType())) {
                             imageList.add(file.getUrl());
                         } else if ("voice".equals(file.getType())) {
-                            voiceList.add(file.getUrl());
+                            voiceList.add(file);
                         }
                     }
                     dto.setImageList(imageList);
@@ -993,7 +993,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
 
     /**
      * @Author sun
-     * @Description 事件管理-评价
+     * @Description 事件管理-详情
      **/
     @Override
     public IcEventListResultDTO detail(IcEventListFormDTO formDTO) {
@@ -1022,12 +1022,12 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             //每个事件对应的图片数据
             if(!CollectionUtils.isEmpty(resultDTO.getAttachmentList())){
                 List<String> imageList = new ArrayList<>();
-                List<String> voiceList = new ArrayList<>();
+                List<IcEventListResultDTO.Attachment> voiceList = new ArrayList<>();
                 resultDTO.getAttachmentList().forEach(file -> {
                     if ("image".equals(file.getType())) {
                         imageList.add(file.getUrl());
                     } else if ("voice".equals(file.getType())) {
-                        voiceList.add(file.getUrl());
+                        voiceList.add(file);
                     }
                 });
                 resultDTO.setImageList(imageList);