From 79e4db6e264046fea17272e8316fb5db8817aa8c Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 23 Nov 2020 14:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E6=8F=90=E4=BA=A4=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E6=96=B0=E5=A2=9Eapplication=5Fhistory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IssueServiceImpl.java  | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 6cc96a4dd5..2bc157531b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -345,6 +345,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                 applicationParam.put(ModuleConstants.FIELD_JAVA_TOPIC_ID, param.getTopicId());
                 List<IssueApplicationDTO> applicationList = applicationService.list(applicationParam);
                 List<String> applyIds = new LinkedList<>();
+                boolean ifRepeat = false;
                 //没有历史提交记录
                 if (CollectionUtils.isEmpty(applicationList)) {
                     //审核开关开启
@@ -358,6 +359,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                     }
                 } else {
                     //重新提交 或 工作端审核议题 更新application
+                    if(!isStaffAudition) ifRepeat = true;
                     if (applicationList.size() > NumConstant.ONE)
                         logger.error("com.epmet.service.impl.IssueServiceImpl.topicShiftedToIssueV2，查出多条转移提提交记录，话题Id：{}", param.getTopicId());
 
@@ -376,19 +378,21 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
                         applyIds.add(apply.getId());
                     });
+
+                if(!ifRepeat) {
                     //新增history
                     applyIds.forEach(id -> {
 
-                            IssueApplicationHistoryDTO history = new IssueApplicationHistoryDTO();
-                            history.setActionType(defaultStatusUnderAuditing);
-                            history.setCreatedTime(param.getCreatedTime());
-                            history.setCustomerId(param.getCustomerId());
-                            history.setIssueApplicationId(id);
-                            history.setReason(isStaffAudition ? param.getAudition().getReason() : null);
-                            history.setStaffName(isStaffAudition ? param.getAudition().getStaffName() : null);
+                        IssueApplicationHistoryDTO history = new IssueApplicationHistoryDTO();
+                        history.setActionType(defaultStatusUnderAuditing);
+                        history.setCreatedTime(param.getCreatedTime());
+                        history.setCustomerId(param.getCustomerId());
+                        history.setIssueApplicationId(id);
+                        history.setReason(isStaffAudition ? param.getAudition().getReason() : null);
+                        history.setStaffName(isStaffAudition ? param.getAudition().getStaffName() : null);
 
-                            historyService.save(history);
-                        if(!ifOpen){
+                        historyService.save(history);
+                        if (!ifOpen) {
                             IssueApplicationHistoryDTO repeatApplyRecord = new IssueApplicationHistoryDTO();
                             repeatApplyRecord.setActionType(ModuleConstants.ISSUE_APPLICATION_STATUS_UNDER_AUDITING);
                             repeatApplyRecord.setCreatedTime(param.getCreatedTime());
@@ -399,6 +403,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                         }
                     });
 
+                }
                     result.setIssueApplicationId(applyIds.iterator().next());