From 189ca1bf08c0a9d2a9ea093303b5a7ede1e7dd99 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 19 Jan 2024 14:11:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E6=9B=B4=E6=94=B9=20?=
 =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B=20=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=A2=9E=E5=8A=A0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/ActFlowCommonService.java   | 18 ++++++++++++++++++
 .../impl/ProcessEsChangeServiceImpl.java       | 13 +------------
 .../impl/ProcessEsRecheckServiceImpl.java      | 17 +++++++++++------
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
index c1c98ba5..2996c481 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.activiti.entity.ProcessAll;
@@ -15,6 +16,7 @@ import com.jero.modules.activiti.process.common.common.DraftCommon;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.entity.StandTypeVO;
+import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
 import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
 import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
 import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
@@ -25,6 +27,8 @@ import com.jero.modules.activiti.service.ProcessApprovalRecordService;
 import com.jero.modules.laws.common.util.CurrentUserUtil;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
+import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
+import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import com.jero.modules.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RepositoryService;
@@ -76,6 +80,9 @@ public class ActFlowCommonService {
     @Resource
     private IProcessHandleService processHandleService;
 
+    @Resource
+    private ILawsEnterpriseStandardService esService;
+
     /**
      * 启动流程实例
      */
@@ -474,4 +481,15 @@ public class ActFlowCommonService {
         processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO);
         return processInfoVO;
     }
+
+    public void checkStandardState(String standardId) {
+        LawsEnterpriseStandard es = esService.getById(standardId);
+        if (es != null) {
+            String standardState = es.getStandardState();
+            if (StandardStateEnum.ABOLISH.getStateValue().equals(standardState) ||
+                    StandardStateEnum.ARCHIVE.getStateValue().equals(standardState)) {
+                throw new JeroBootException(ResultCommon.CAN_NOT_EDIT_ABOLISH_OR_ARCHIVE_ES);
+            }
+        }
+    }
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
index e09d824a..c72e5743 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
@@ -72,9 +72,6 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
     @Resource
     private TaskService taskService;
 
-    @Resource
-    private ILawsEnterpriseStandardService esService;
-
     @Override
     public void startProcess(ESChangeDataVO changeData) {
         // 执行流程发起前的操作
@@ -172,15 +169,7 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
         // 如果标准当前状态是废止或封存，不能发起变更流程
         ProcessEsChange data = changeData.getData();
         if (data != null) {
-            String standardId = data.getStandardId();
-            LawsEnterpriseStandard es = esService.getById(standardId);
-            if (es != null) {
-                String standardState = es.getStandardState();
-                if (StandardStateEnum.ABOLISH.getStateValue().equals(standardState) ||
-                        StandardStateEnum.ARCHIVE.getStateValue().equals(standardState)) {
-                    throw new JeroBootException(ResultCommon.CAN_NOT_EDIT_ABOLISH_OR_ARCHIVE_ES);
-                }
-            }
+            actFlowCommonService.checkStandardState(data.getStandardId());
         }
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
index afadc949..fcb80fd1 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
@@ -10,6 +10,7 @@ import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
+import com.jero.modules.activiti.process.esChange.entity.ProcessEsChange;
 import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck;
 import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
 import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService;
@@ -34,15 +35,15 @@ import java.util.*;
 import static com.jero.modules.activiti.process.esRecheck.entity.RecheckTaskNameConstant.*;
 
 /**
-* @author ThinkBook
-* @description 针对表【process_es_recheck(企业标准)】的数据库操作Service实现
-* @createDate 2023-10-29 21:00:54
-*/
+ * @author ThinkBook
+ * @description 针对表【process_es_recheck(企业标准)】的数据库操作Service实现
+ * @createDate 2023-10-29 21:00:54
+ */
 @Slf4j
 @Transactional(rollbackFor = JeroBootException.class)
 @Service
 public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMapper, ProcessEsRecheck>
-    implements ProcessEsRecheckService{
+        implements ProcessEsRecheckService {
 
     @Resource
     private ActFlowCommonService actFlowCommonService;
@@ -179,7 +180,11 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
     }
 
     public void startRunTask(ESRecheckDataVO recheckData) {
-        // do nothing now
+        // 如果标准当前状态是废止或封存，不能发起变更流程
+        ProcessEsRecheck data = recheckData.getData();
+        if (data != null) {
+            actFlowCommonService.checkStandardState(data.getStandardId());
+        }
     }
 
     @Override