From 4ac8f90948fbb56b6b5b36ba8e1a9c179a639bbe Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 28 Dec 2023 15:34:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A8=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRevisionServiceImpl.java   | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index 612dedc7..1470d047 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -13,6 +13,7 @@ import com.jero.modules.activiti.process.common.entity.CommonVO;
 import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConstants;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
+import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectStatus;
 import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPRevisionType;
 import com.jero.modules.activiti.process.esRevision.entity.EsRevisionAdvice;
 import com.jero.modules.activiti.process.esRevision.entity.OperateTypeEnum;
@@ -166,7 +167,19 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         EnterpriseStandardPlan esp = espService.getById(espId);
         String mainDraftUser = esp.getMainDraftingUser();
         if (StrUtil.isBlank(mainDraftUser)) {
-            log.info("新企标编号为{}的企标计划的主起草人为空，无法自动发起制修订流程", esp.getNewEnStandardNo());
+            log.error("新企标编号为{}的企标计划的主起草人为空，无法自动发起制修订流程", esp.getNewEnStandardNo());
+            // 企标计划改为未开始
+            esp.setProjectStatus(ESPProjectStatus.NOT_STARTED.getValue());
+            espService.updateById(esp);
+            return;
+        }
+        // 根据流程实例id更新流程总表
+        String standardNo = esp.getNewEnStandardNo();
+        if (StrUtil.isBlank(standardNo)) {
+            log.error("企标计划Id为{}的企标计划新企标编号为空，无法自动发起制修订流程", esp.getId());
+            // 企标计划改为未开始
+            esp.setProjectStatus(ESPProjectStatus.NOT_STARTED.getValue());
+            espService.updateById(esp);
             return;
         }
         // 流程Key
@@ -188,17 +201,15 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         // 保存选人信息
         // 人员
         processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, variables);
-        // 根据流程实例id更新流程总表
-        String standardNo = esp.getNewEnStandardNo();
-        if (StrUtil.isBlank(standardNo)) {
-            throw new JeroBootException("企标计划Id为{}的企标计划新企标编号为空，无法正常自动发起制修订流程", esp.getId());
-        }
         String newStandardName = esp.getNewEnStandardName();
         String revisionType = esp.getProjectType().equals(ESPRevisionType.ENACT.getValue()) ? "制定" : "修订";
         String prcName = standardNo + "-" + newStandardName + "-" + revisionType;
         Integer prcType = ProcessTypeEnum.ES_REVISION.getValue();
         actFlowCommonService.updateProcessAll(processInstanceId, mainDraftUser, prcName, null, prcType, null);
         processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables));
+        // 将企标计划改为运行中
+        esp.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue());
+        espService.updateById(esp);
     }
 
     @Override
@@ -323,8 +334,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                     taskService.setVariables(taskId, deadlineMap);
                     data.setOtherDraftUserVOS(otherDraftUserVOS);
                     data.setOtherDrafterUploadFileJson(otherDraftUserVOS);
-                    saveOrUpdate(data);
                 }
+                saveOrUpdate(data);
                 String standardizationUser = (String) flowUser.get("standardizationUser");
                 taskService.setVariable(taskId, "standardizationUser", standardizationUser);
                 // 保存人员信息