From 8ee3a47937ddcf6354675ce8e50fb49f9c594d62 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 10 Jun 2020 13:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=8C=83=E5=9B=B4=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=8F=91=E5=B8=83=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/DraftPublishRangeDao.java     | 3 +--
 .../main/java/com/epmet/service/impl/ArticleServiceImpl.java  | 4 +++-
 .../src/main/resources/mapper/DraftPublishRangeDao.xml        | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java
index 7a5d41c9ea..fc1968224f 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java
@@ -18,7 +18,6 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.DraftPublishRangeDTO;
 import com.epmet.entity.DraftPublishRangeEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -41,7 +40,7 @@ public interface DraftPublishRangeDao extends BaseDao<DraftPublishRangeEntity> {
      * @author wangc
      * @date 2020.06.05 10:28
      **/
-    List<DraftPublishRangeDTO> selectByDraftId(@Param("draftId")String draftId);
+    List<DraftPublishRangeEntity> selectByDraftId(@Param("draftId")String draftId);
 
     /**
      * @Description  根据草稿id查询发布范围id集合
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index 1f2920a2bc..0161b9674d 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -843,7 +843,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			//直接查询改草稿的 封面及内容
 			List<DraftContentEntity> draftContents = draftContentDao.selectByDraftId(draftId,null);
 			DraftCoverEntity draftCover = draftCoverDao.selectByDraftId(draftId,null);
-			List<DraftPublishRangeDTO> draftPublishRange = draftPublishRangeDao.selectByDraftId(draftId);
+			List<DraftPublishRangeEntity> draftPublishRange = draftPublishRangeDao.selectByDraftId(draftId);
 
 			//3.生成文章以及相关记录
 			ArticleEntity article = ConvertUtils.sourceToTarget(draft,ArticleEntity.class);
@@ -865,10 +865,12 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			}
 			if(null != draftPublishRange && draftPublishRange.size() > NumConstant.ZERO){
 				draftPublishRange.forEach(range -> {
+					range.setPublishStatus(DraftConstant.PUBLISHED);
 					ArticlePublishRangeEntity rangeToInsert = ConvertUtils.sourceToTarget(range,ArticlePublishRangeEntity.class);
 					rangeToInsert.setArticleId(article.getId());
 					rangeToInsert.setId(null);
 					articlePublishRangeDao.insert(rangeToInsert);
+					articlePublishRangeDao.updateById(range);
 				});
 				if(null != draftCover){
 					//draftCover.setAuditStatus(ModuleConstant.AUDIT_STATUS_PASS);
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml
index 014ccbed68..179283e897 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml
@@ -4,7 +4,7 @@
 <mapper namespace="com.epmet.dao.DraftPublishRangeDao">
 
     <!-- 通过草稿Id获取草稿发布范围 -->
-    <select id="selectByDraftId" resultType="com.epmet.dto.DraftPublishRangeDTO">
+    <select id="selectByDraftId" resultType="com.epmet.entity.DraftPublishRangeEntity">
         SELECT
             CUSTOMER_ID,
             GRID_ID,