From 891a7b53db19c46199d56b6e96cdf04222d5f1b5 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 25 Dec 2020 15:20:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../topic/service/impl/TopicDraftServiceImpl.java      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
index f2cde9802d..97532861c0 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@@ -298,9 +298,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
             }
         }
         List<VoiceTaskDTO> voiceDTOList = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(formDTO.getVideoList())){
+        if(CollectionUtils.isNotEmpty(formDTO.getVoiceList())){
             int sort = 0;
-            for(FileDTO file : formDTO.getVideoList()){
+            for(FileDTO file : formDTO.getVoiceList()){
                 TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO();
                 attachment.setCustomerId(formDTO.getCustomerId());
                 attachment.setAttachmentUrl(file.getUrl());
@@ -309,6 +309,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
                 attachment.setAttachmentFormat(file.getUrl().substring(file.getUrl().lastIndexOf(".") + NumConstant.ONE).toLowerCase());
                 attachment.setSort(sort++);
                 attachment.setAttachmentType("voice");
+                attachment.setDuration(file.getDuration());
                 attachment.setStatus(TopicConstant.AUDITING);
                 topicDraftAttachmentService.save(attachment);
 
@@ -680,9 +681,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
             throw new RenException(ModuleConstant.NO_PRIMARY_KEY_RETURNED);
         }
         if(CollectionUtils.isNotEmpty(formDTO.getImageList())){
-            ResiTopicAttachmentEntity attachment = new ResiTopicAttachmentEntity();
             int sort = 0;
             for(String url : formDTO.getImageList()){
+                ResiTopicAttachmentEntity attachment = new ResiTopicAttachmentEntity();
                 attachment.setAttachmentUrl(url);
                 attachment.setTopicId(topic.getId());
                 attachment.setCreatedBy(tokenDto.getUserId());
@@ -694,14 +695,15 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         }
 
         if(CollectionUtils.isNotEmpty(formDTO.getVoiceList())){
-            ResiTopicAttachmentEntity attachment = new ResiTopicAttachmentEntity();
             int sort = 0;
             for(FileDTO file : formDTO.getVoiceList()){
+                ResiTopicAttachmentEntity attachment = new ResiTopicAttachmentEntity();
                 attachment.setAttachmentUrl(file.getUrl());
                 attachment.setTopicId(topic.getId());
                 attachment.setCreatedBy(tokenDto.getUserId());
                 attachment.setAttachmentFormat(file.getUrl().substring(file.getUrl().lastIndexOf(".") + NumConstant.ONE).toLowerCase());
                 attachment.setSort(sort++);
+                attachment.setDuration(file.getDuration());
                 attachment.setAttachmentType("voice");
                 resiTopicAttachmentDao.insertOne(attachment);
             }