From 5566a9a1378fcdd5fa13d21c873b94bcf51ccb58 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 11 Jan 2021 16:53:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=AE=A1=E6=A0=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TopicDraftServiceImpl.java      |  4 ++++
 .../mapper/topic/ResiTopicAttachmentDao.xml      |  2 ++
 .../resources/mapper/topic/TopicDraftDao.xml     | 16 ++++++++++++++--
 3 files changed, 20 insertions(+), 2 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 0bd6bb3135..64df5855ad 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
@@ -740,6 +740,10 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
             resiTopic.setId(null);
             resiTopic.setStatus(TopicConstant.PUBLISHMENT);
             resiTopicDao.insert(resiTopic);
+            entity = new TopicDraftEntity();
+            entity.setId(formDTO.getTopicDraftId());
+            entity.setTopicId(resiTopic.getId());
+            baseDao.updateById(entity);
             //将草稿附件存入附件表
             List<TopicDraftAttachmentDTO> attachmentList = topicDraftAttachmentService.getFileList(formDTO.getTopicDraftId(), null);
             List<ResiTopicAttachmentEntity> topicAttachments = ConvertUtils.sourceToTarget(attachmentList, ResiTopicAttachmentEntity.class);
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml
index 9ec26817f1..4df90acb9e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml
@@ -84,6 +84,7 @@
         del_flag,
         revision,
         sort,
+        duration,
         created_by,
         created_time,
         updated_by,
@@ -100,6 +101,7 @@
             #{item.delFlag},
             #{item.revision},
             #{item.sort},
+            #{item.duration},
             #{item.createdBy},
             now(),
             #{item.updatedBy},
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftDao.xml
index a956df46d7..e7bbab6d1e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/TopicDraftDao.xml
@@ -28,8 +28,13 @@
     <select id="selectTopicDraftByGroup" resultType="com.epmet.resi.group.dto.topic.result.TopicAuditResultDTO">
         SELECT ID AS topicDraftId,
                TOPIC_CONTENT AS topicContent,
-               CREATED_BY AS userName,
-        UNIX_TIMESTAMP(CREATED_TIME) AS releaseTime
+        <if test="status == 'review'">
+            UNIX_TIMESTAMP(CREATED_TIME) AS releaseTime,
+        </if>
+        <if test="status == 'rejected'">
+            UNIX_TIMESTAMP(UPDATED_TIME) AS releaseTime,
+        </if>
+        CREATED_BY AS userName
         FROM
             topic_draft
         WHERE
@@ -41,6 +46,13 @@
         <if test="status == 'rejected'">
             AND (DRAFT_STATUS = 'block' OR DRAFT_STATUS = 'rejected')
         </if>
+        ORDER BY
+        <if test="status == 'review'">
+            CREATED_TIME DESC
+        </if>
+        <if test="status == 'rejected'">
+            UPDATED_TIME DESC
+        </if>
     </select>
     <select id="selectTopicDraftDetail" resultType="com.epmet.resi.group.dto.topic.result.DraftDetailResultDTO">