From 324f85f6be87f32af753f8d24cd557148f469dd3 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 21 Aug 2024 21:09:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2089150=20=E6=B3=95=E8=A7=84=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B--?= =?UTF-8?q?=E4=B8=BB=E6=8E=92=E6=9F=A5=E4=BA=BA--=E5=88=86=E5=8F=91?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E3=80=81=E5=AE=A1=E6=A0=B8=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E3=80=81=E6=B1=87=E6=80=BB=E8=8A=82=E7=82=B9=EF=BC=8C=E8=BD=AC?= =?UTF-8?q?=E5=8A=9E=E5=90=8E=E5=AD=98=E5=9C=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StandardComplianceCheckFlow.java | 69 ++++++++----------- 1 file changed, 29 insertions(+), 40 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/StandardComplianceCheckFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/StandardComplianceCheckFlow.java index dcfde514..40d5bd65 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/StandardComplianceCheckFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/StandardComplianceCheckFlow.java @@ -1,32 +1,21 @@ package com.jero.modules.activiti.process.standardComplianceCheck.service; -import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheck; -import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail; -import com.jero.modules.activiti.process.standardComplianceCheck.service.impl.ProcessStandardComplianceCheckDetailServiceImpl; -import com.jero.modules.activiti.process.standardComplianceCheck.service.impl.ProcessStandardComplianceCheckServiceImpl; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret; import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretService; import com.jero.modules.activiti.service.WorkCenterService; import com.jero.modules.activiti.util.SpringContextUtil; import com.jero.modules.activiti.vo.DelegateTaskParam; import lombok.extern.slf4j.Slf4j; -import org.activiti.engine.RuntimeService; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; - -import static com.jero.modules.activiti.common.ActivitiCommon.MAIN_INSTANCE_ID; -import static com.jero.modules.activiti.process.standardComplianceCheck.common.ProcessStandardComplianceCheckConstants.*; /** * @ClassName: EsInspectPlanFlowService @@ -64,35 +53,35 @@ public class StandardComplianceCheckFlow implements WorkCenterService { */ @Override public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { - RuntimeService runtimeService = SpringContextUtil.getBean(RuntimeService.class); - ProcessStandardComplianceCheckServiceImpl sccService = SpringContextUtil.getBean(ProcessStandardComplianceCheckServiceImpl.class); - ProcessStandardComplianceCheckDetailServiceImpl sccDetailService = SpringContextUtil.getBean(ProcessStandardComplianceCheckDetailServiceImpl.class); - // 子流程中的主排查人的转办需要修改其余所有子流程及主流程中的数据 - String nodeId = processApprovalRecord.getNodeId(); - if (nodeId.equals(MAIN_CHECK_USER_APPROVAL) || nodeId.equals(MAIN_CHECK_USER_DISTRIBUTE) || - nodeId.equals(MAIN_CHECK_USER_REDISTRIBUTE)) { - String processInstanceId = processAll.getProcessInstanceId(); - String mainInstanceId = (String) runtimeService.getVariable(processInstanceId, MAIN_INSTANCE_ID); - LambdaQueryWrapper sccWrapper = new LambdaQueryWrapper<>(); - sccWrapper.eq(ProcessStandardComplianceCheck::getProcessInstanceId, mainInstanceId); - ProcessStandardComplianceCheck scc = sccService.getOne(sccWrapper); - LambdaQueryWrapper sccDetailWrapper = new LambdaQueryWrapper<>(); - sccDetailWrapper.eq(ProcessStandardComplianceCheckDetail::getCheckId, scc.getId()); - sccDetailWrapper.isNotNull(ProcessStandardComplianceCheckDetail::getProcessInstanceId); - List sccDetailList = sccDetailService.list(sccDetailWrapper); - if (CollUtil.isEmpty(sccDetailList)) { - return; - } - List allChildProcessInstanceId = sccDetailList.stream() - .map(ProcessStandardComplianceCheckDetail::getProcessInstanceId).distinct().collect(Collectors.toList()); - allChildProcessInstanceId.add(mainInstanceId); - allChildProcessInstanceId.forEach(childProcessInstanceId -> { - // 检查实例是否存在并且处于激活状态 - if (runtimeService.createProcessInstanceQuery().processInstanceId(childProcessInstanceId).active().singleResult() != null) { - runtimeService.setVariable(childProcessInstanceId, MAIN_CHECK_USER, toUserId); - } - }); - } +// RuntimeService runtimeService = SpringContextUtil.getBean(RuntimeService.class); +// ProcessStandardComplianceCheckServiceImpl sccService = SpringContextUtil.getBean(ProcessStandardComplianceCheckServiceImpl.class); +// ProcessStandardComplianceCheckDetailServiceImpl sccDetailService = SpringContextUtil.getBean(ProcessStandardComplianceCheckDetailServiceImpl.class); +// // 子流程中的主排查人的转办需要修改其余所有子流程及主流程中的数据 +// String nodeId = processApprovalRecord.getNodeId(); +// if (nodeId.equals(MAIN_CHECK_USER_APPROVAL) || nodeId.equals(MAIN_CHECK_USER_DISTRIBUTE) || +// nodeId.equals(MAIN_CHECK_USER_REDISTRIBUTE)) { +// String processInstanceId = processAll.getProcessInstanceId(); +// String mainInstanceId = (String) runtimeService.getVariable(processInstanceId, MAIN_INSTANCE_ID); +// LambdaQueryWrapper sccWrapper = new LambdaQueryWrapper<>(); +// sccWrapper.eq(ProcessStandardComplianceCheck::getProcessInstanceId, mainInstanceId); +// ProcessStandardComplianceCheck scc = sccService.getOne(sccWrapper); +// LambdaQueryWrapper sccDetailWrapper = new LambdaQueryWrapper<>(); +// sccDetailWrapper.eq(ProcessStandardComplianceCheckDetail::getCheckId, scc.getId()); +// sccDetailWrapper.isNotNull(ProcessStandardComplianceCheckDetail::getProcessInstanceId); +// List sccDetailList = sccDetailService.list(sccDetailWrapper); +// if (CollUtil.isEmpty(sccDetailList)) { +// return; +// } +// List allChildProcessInstanceId = sccDetailList.stream() +// .map(ProcessStandardComplianceCheckDetail::getProcessInstanceId).distinct().collect(Collectors.toList()); +// allChildProcessInstanceId.add(mainInstanceId); +// allChildProcessInstanceId.forEach(childProcessInstanceId -> { +// // 检查实例是否存在并且处于激活状态 +// if (runtimeService.createProcessInstanceQuery().processInstanceId(childProcessInstanceId).active().singleResult() != null) { +// runtimeService.setVariable(childProcessInstanceId, MAIN_CHECK_USER, toUserId); +// } +// }); +// } } @Override