From 687072536cad72c4cb18bb2c13564fe18d5f7706 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 24 Dec 2020 16:15:35 +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

---
 .../service/impl/TopicDraftAttachmentServiceImpl.java |  2 +-
 .../topic/service/impl/TopicDraftServiceImpl.java     | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftAttachmentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftAttachmentServiceImpl.java
index 5c304dacf1..a614e3db2b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftAttachmentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftAttachmentServiceImpl.java
@@ -83,7 +83,7 @@ public class TopicDraftAttachmentServiceImpl extends BaseServiceImpl<TopicDraftA
     public void save(TopicDraftAttachmentDTO dto) {
         TopicDraftAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, TopicDraftAttachmentEntity.class);
         insert(entity);
-		ConvertUtils.sourceToTarget(entity, TopicDraftAttachmentDTO.class);
+        dto.setId(entity.getId());
     }
 
     @Override
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 8077d5933f..edac718249 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
@@ -267,6 +267,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         TopicDraftEntity topic = ConvertUtils.sourceToTarget(formDTO,TopicDraftEntity.class);
         topic.setCreatedBy(tokenDto.getUserId());
         topic.setDraftStatus(TopicConstant.AUDITING);
+        topic.setIsSee(NumConstant.ZERO_STR);
         baseDao.insert(topic);
         if (StringUtils.isNotEmpty(formDTO.getTopicDraftId())) {
             //隐藏旧话题草稿
@@ -280,12 +281,14 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
             TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO();
             int sort = 0;
             for(String url : formDTO.getImageList()){
+                attachment.setCustomerId(formDTO.getCustomerId());
                 attachment.setAttachmentUrl(url);
                 attachment.setTopicDraftId(topic.getId());
                 attachment.setCreatedBy(tokenDto.getUserId());
                 attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase());
                 attachment.setSort(sort++);
                 attachment.setAttachmentType("image");
+                attachment.setStatus(TopicConstant.AUDITING);
                 topicDraftAttachmentService.save(attachment);
 
                 ImgTaskDTO task = new ImgTaskDTO();
@@ -299,12 +302,14 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
             TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO();
             int sort = 0;
             for(FileDTO file : formDTO.getVideoList()){
+                attachment.setCustomerId(formDTO.getCustomerId());
                 attachment.setAttachmentUrl(file.getUrl());
                 attachment.setTopicDraftId(topic.getId());
                 attachment.setCreatedBy(tokenDto.getUserId());
                 attachment.setAttachmentFormat(file.getUrl().substring(file.getUrl().lastIndexOf(".") + NumConstant.ONE).toLowerCase());
                 attachment.setSort(sort++);
                 attachment.setAttachmentType("voice");
+                attachment.setStatus(TopicConstant.AUDITING);
                 topicDraftAttachmentService.save(attachment);
 
                 VoiceTaskDTO task = new VoiceTaskDTO();
@@ -316,6 +321,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
 
         //话题操作记录
         TopicDraftOperationDTO operation = new TopicDraftOperationDTO();
+        operation.setCustomerId(formDTO.getCustomerId());
         operation.setTopicDraftId(topic.getId());
         operation.setOperateType(TopicConstant.SUBMIT);
         operation.setCreatedBy(tokenDto.getUserId());
@@ -343,6 +349,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
                     baseDao.updateById(draftEntity);
                     //话题操作记录
                     TopicDraftOperationDTO operationDTO = new TopicDraftOperationDTO();
+                    operationDTO.setCustomerId(formDTO.getCustomerId());
                     operationDTO.setTopicDraftId(topic.getId());
                     operationDTO.setOperateType(TopicConstant.BLOCK);
                     operationDTO.setCreatedBy(tokenDto.getUserId());
@@ -370,6 +377,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
                     baseDao.updateById(draftEntity);
                     //话题操作记录
                     TopicDraftOperationDTO operationDTO = new TopicDraftOperationDTO();
+                    operationDTO.setCustomerId(formDTO.getCustomerId());
                     operationDTO.setTopicDraftId(topic.getId());
                     operationDTO.setOperateType(TopicConstant.BLOCK);
                     operationDTO.setCreatedBy(tokenDto.getUserId());
@@ -493,6 +501,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
             baseDao.updateById(draftEntity);
             //话题操作记录
             TopicDraftOperationDTO operationDTO = new TopicDraftOperationDTO();
+            operationDTO.setCustomerId(formDTO.getCustomerId());
             operationDTO.setTopicDraftId(topic.getId());
             operationDTO.setOperateType(TopicConstant.AUTO_PASSED);
             operationDTO.setCreatedBy(tokenDto.getUserId());
@@ -632,7 +641,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
             sendMqMsg(draft.getCreatedBy(), draft.getCustomerId());
         }
         //记录操作记录
+        entity = baseDao.selectById(formDTO.getTopicDraftId());
         TopicDraftOperationDTO operationDTO = new TopicDraftOperationDTO();
+        operationDTO.setCustomerId(entity.getCustomerId());
         operationDTO.setTopicDraftId(formDTO.getTopicDraftId());
         operationDTO.setOperateType(formDTO.getAuditType());
         operationDTO.setCreatedBy(tokenDto.getUserId());