diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index fc6e316885..9ef48b062e 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -231,7 +231,7 @@ public class ArticleController { log.error("scanContent draftId:{} return result null", draftId); } if (syncScanResult.isAllPass()) { - articleService.scanAllPassPublishArticle(tokenDto, draftId); + articleService.scanAllPassPublishArticle(tokenDto, draftId, syncScanResult); } else { articleService.updateAuditStatusFailById(draftId, syncScanResult); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java index d9dfea5dff..be3e9ef287 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java @@ -176,7 +176,7 @@ public interface ArticleService extends BaseService { */ SyncScanResult scanContent(TokenDto tokenDto, String draftId); - void scanAllPassPublishArticle(TokenDto tokenDto, String draftId); + void scanAllPassPublishArticle(TokenDto tokenDto, String draftId, SyncScanResult syncScanResult); /** * desc:修改审核状态为失败 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 e1b2be9bcf..293621d66d 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 @@ -61,6 +61,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -850,7 +851,7 @@ public class ArticleServiceImpl extends BaseServiceImpl NumConstant.ZERO){ draftContents.forEach(content -> { - content.setAuditStatus(ModuleConstant.AUDIT_STATUS_PASS); + //content.setAuditStatus(ModuleConstant.AUDIT_STATUS_PASS); content.setOrderNum(content.getOrderNum()); ArticleContentEntity contentToInsert = ConvertUtils.sourceToTarget(content,ArticleContentEntity.class); @@ -858,7 +859,7 @@ public class ArticleServiceImpl extends BaseServiceImpl NumConstant.ZERO){ @@ -869,14 +870,14 @@ public class ArticleServiceImpl extends BaseServiceImpl updateGridTagCacheDTOS = this.updateGridTag(tokenDto, draftId, updateCustomerTagCacheDTO);