发布范围更新发布状态

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集合

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);

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,