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 { * @author wangc * @date 2020.06.05 10:28 **/ - List selectByDraftId(@Param("draftId")String draftId); + List 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 draftContents = draftContentDao.selectByDraftId(draftId,null); DraftCoverEntity draftCover = draftCoverDao.selectByDraftId(draftId,null); - List draftPublishRange = draftPublishRangeDao.selectByDraftId(draftId); + List draftPublishRange = draftPublishRangeDao.selectByDraftId(draftId); //3.生成文章以及相关记录 ArticleEntity article = ConvertUtils.sourceToTarget(draft,ArticleEntity.class); @@ -865,10 +865,12 @@ public class ArticleServiceImpl extends BaseServiceImpl 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 @@ - SELECT CUSTOMER_ID, GRID_ID,