From fae7378cd9d0835617c6df035267b9ca5c291d20 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sun, 25 Apr 2021 10:17:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/group/dto/act/result/ActDetailResultDTO.java |  8 +++++++-
 .../act/service/impl/GroupActInfoServiceImpl.java     | 11 ++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java
index 86b4e9ed07..73a0659098 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.resi.group.dto.act.result;
 
+import com.epmet.resi.group.dto.topic.form.FileDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -118,7 +119,12 @@ public class ActDetailResultDTO implements Serializable {
     /**
      * 图片列表
      */
-    private List<String> imgList;
+    private List<String> imgArrayList;
+
+    /**
+     * 图片列表，最多3张
+     */
+    private List<FileDTO> imgList;
 
     //以下字段需要单独赋值
     /**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index 3e1d9af54e..1493c65a5e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -491,7 +491,16 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         ActDetailResultDTO resultDTO=ConvertUtils.sourceToTarget(groupActInfoEntity,ActDetailResultDTO.class);
         resultDTO.setGroupActId(formDTO.getGroupActId());
         resultDTO.setTextList(groupActContentDao.selectContentList(formDTO.getGroupActId(),GroupActConstant.TEXT));
-        resultDTO.setImgList(groupActContentDao.selectContentList(formDTO.getGroupActId(),GroupActConstant.IMG));
+        resultDTO.setImgArrayList(groupActContentDao.selectContentList(formDTO.getGroupActId(),GroupActConstant.IMG));
+        List<FileDTO> imgList=new ArrayList<>();
+        resultDTO.getImgArrayList().forEach(imgUrl->{
+            FileDTO fileDTO=new FileDTO();
+            fileDTO.setUrl(imgUrl);
+            //文件类型(图片 - image、 视频 - video、 语音 - voice、 文档 - doc)
+            fileDTO.setType("image");
+            imgList.add(fileDTO);
+        });
+        resultDTO.setImgList(imgList);
         resultDTO.setCanceledReason(GroupActConstant.CANCELED.equals(resultDTO.getStatus()) ? actOperationRecordDao.selectCanceledReason(formDTO.getGroupActId()) : StrConstant.EPMETY_STR);
 
         handleSignInDesc(resultDTO,formDTO.getUserId());