fix: 79885 79993 80029

2024-01-17 15:59:40 +08:00
parent 08a20d3398
commit cb0ba223fb
3 changed files with 61 additions and 0 deletions
@@ -11,17 +11,21 @@ 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.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
+import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish;
 import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO;
 import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService;
 import com.jero.modules.activiti.process.esAbolish.mapper.ProcessEsAbolishMapper;
+import com.jero.modules.activiti.process.esEnable.entity.ProcessEsEnable;
 import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssess;
 import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
+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.RuntimeService;
@@ -60,6 +64,9 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
    @Resource
    private TaskService taskService;

+    @Resource
+    private ILawsEnterpriseStandardService esService;
+
    @Override
    public void startProcess(ESAbolishDataVO abolishData) {
        // 执行流程发起前的操作
@@ -185,6 +192,18 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
        if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
        }
+        // 如果是最后一个节点的审批则需要判断是否可以通过
+        String taskName = taskService.createTaskQuery().taskId(taskId).singleResult().getName();
+        if (pass && taskName.equals("标准化审批")) {
+            ProcessEsAbolish data = this.getOne(new LambdaQueryWrapper<ProcessEsAbolish>()
+                    .eq(ProcessEsAbolish::getProcessInstanceId, processInstanceId));
+            String standardNumber = data.getStandardNumber();
+            LawsEnterpriseStandard es = esService.getOne(new LambdaQueryWrapper<LawsEnterpriseStandard>()
+                    .eq(LawsEnterpriseStandard::getStandardNumber, standardNumber));
+            if (StandardStateEnum.ABOLISH.getStateValue().equals(es.getStandardState())) {
+                throw new JeroBootException("该标准已废止，需要驳回重新选择");
+            }
+        }
        ProcessEsAbolish data = abolishData.getData();
        if (data != null) {
            updateById(data);
@@ -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.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
+import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish;
 import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO;
@@ -25,6 +26,8 @@ import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
+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.RuntimeService;
@@ -63,6 +66,9 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
    @Resource
    private IProcessHandleService processHandleService;

+    @Resource
+    private ILawsEnterpriseStandardService esService;
+
    @Override
    public void startProcess(ESArchiveDataVO archiveData) {
        // 执行流程发起前的操作
@@ -188,6 +194,21 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
        if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
        }
+        // 如果是最后一个节点的审批则需要判断是否可以通过
+        String taskName = taskService.createTaskQuery().taskId(taskId).singleResult().getName();
+        if (pass && taskName.equals("标准化审批")) {
+            ProcessEsArchive data = this.getOne(new LambdaQueryWrapper<ProcessEsArchive>()
+                    .eq(ProcessEsArchive::getProcessInstanceId, processInstanceId));
+            String standardNumber = data.getStandardNumber();
+            LawsEnterpriseStandard es = esService.getOne(new LambdaQueryWrapper<LawsEnterpriseStandard>()
+                    .eq(LawsEnterpriseStandard::getStandardNumber, standardNumber));
+            if (StandardStateEnum.ARCHIVE.getStateValue().equals(es.getStandardState())) {
+                throw new JeroBootException("该标准已封存，需要驳回重新选择");
+            }
+            if (StandardStateEnum.ABOLISH.getStateValue().equals(es.getStandardState())) {
+                throw new JeroBootException("该标准已废止，需要驳回重新选择");
+            }
+        }
        ProcessEsArchive data = archiveDataVO.getData();
        if (data != null) {
            updateById(data);
@@ -11,6 +11,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.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
+import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive;
 import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
@@ -22,6 +23,8 @@ import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
+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.RuntimeService;
@@ -59,6 +62,9 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe

    @Resource
    private TaskService taskService;
+
+    @Resource
+    private ILawsEnterpriseStandardService esService;
    
    @Override
    public void startProcess(ESEnableDataVO enableData) {
@@ -185,6 +191,21 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
        if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
        }
+        // 如果是最后一个节点的审批则需要判断是否可以通过
+        String taskName = taskService.createTaskQuery().taskId(taskId).singleResult().getName();
+        if (pass && taskName.equals("标准化审批")) {
+            ProcessEsEnable data = this.getOne(new LambdaQueryWrapper<ProcessEsEnable>()
+                    .eq(ProcessEsEnable::getProcessInstanceId, processInstanceId));
+            String standardNumber = data.getStandardNumber();
+            LawsEnterpriseStandard es = esService.getOne(new LambdaQueryWrapper<LawsEnterpriseStandard>()
+                    .eq(LawsEnterpriseStandard::getStandardNumber, standardNumber));
+            if (StandardStateEnum.CURRENTLY_EFFECTIVE.getStateValue().equals(es.getStandardState())) {
+                throw new JeroBootException("该标准已现行有效，需要驳回重新选择");
+            }
+            if (StandardStateEnum.ABOLISH.getStateValue().equals(es.getStandardState())) {
+                throw new JeroBootException("该标准已废止，需要驳回重新选择");
+            }
+        }
        ProcessEsEnable data = enableData.getData();
        if (data != null) {
            updateById(data);