QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 89150 法规符合性排查流程--主排查人--分发节点、审核节点、汇总节点，转办后存在问题

Browse Source
This commit is contained in:
mzaxd
2024-08-21 21:09:46 +08:00
parent 28b686d472
commit 324f85f6be
1 changed files with 29 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/StandardComplianceCheckFlow.java
+29 -40
View File
@@ -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<ProcessStandardComplianceCheck> sccWrapper = new LambdaQueryWrapper<>();
sccWrapper.eq(ProcessStandardComplianceCheck::getProcessInstanceId, mainInstanceId);
ProcessStandardComplianceCheck scc = sccService.getOne(sccWrapper);
LambdaQueryWrapper<ProcessStandardComplianceCheckDetail> sccDetailWrapper = new LambdaQueryWrapper<>();
sccDetailWrapper.eq(ProcessStandardComplianceCheckDetail::getCheckId, scc.getId());
sccDetailWrapper.isNotNull(ProcessStandardComplianceCheckDetail::getProcessInstanceId);
List<ProcessStandardComplianceCheckDetail> sccDetailList = sccDetailService.list(sccDetailWrapper);
if (CollUtil.isEmpty(sccDetailList)) {
return;
}
List<String> 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<ProcessStandardComplianceCheck> sccWrapper = new LambdaQueryWrapper<>();
// sccWrapper.eq(ProcessStandardComplianceCheck::getProcessInstanceId, mainInstanceId);
// ProcessStandardComplianceCheck scc = sccService.getOne(sccWrapper);
// LambdaQueryWrapper<ProcessStandardComplianceCheckDetail> sccDetailWrapper = new LambdaQueryWrapper<>();
// sccDetailWrapper.eq(ProcessStandardComplianceCheckDetail::getCheckId, scc.getId());
// sccDetailWrapper.isNotNull(ProcessStandardComplianceCheckDetail::getProcessInstanceId);
// List<ProcessStandardComplianceCheckDetail> sccDetailList = sccDetailService.list(sccDetailWrapper);
// if (CollUtil.isEmpty(sccDetailList)) {
// return;
// }
// List<String> 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