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

fix(88496): 审核节点转办后驳回，解读人驳回，分发节点的待办接收

Browse Source
This commit is contained in:
yjz
2024-08-22 19:15:33 +08:00
parent c8decb108a
commit aeceb00862
2 changed files with 1 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java
+1 -49
View File
@@ -97,10 +97,8 @@ public class StandardInterpretFlow implements WorkCenterService {
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord,
String toUserId, String userId) {
ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
ProcessApprovalRecordService processApprovalRecordService =
SpringContextUtil.getBean(ProcessApprovalRecordService.class);
// 更新流程人员变量
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
// processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
// 解读人填写信息（分发）
String node = processApprovalRecord.getNodeId();
if (StandardInterpretCommon.INTERPRETING_PEOPLE_FILLOUT.equals(node)){
@@ -120,52 +118,6 @@ public class StandardInterpretFlow implements WorkCenterService {
.set(ProcessStandardInterpretClauseSublist::getInterpretPersonId, toUserId));
}
}
// 标准主解读人审核（分发）
if (StandardInterpretCommon.MASTER_INTERPRET_APPROVE.equals(node)){
// 更新标准主解读人
ProcessStandardInterpretService processStandardInterpretService =
SpringContextUtil.getBean(ProcessStandardInterpretService.class);
processStandardInterpretService.update(new LambdaUpdateWrapper<ProcessStandardInterpret>()
.eq(ProcessStandardInterpret::getProjectId, processAll.getProjectId())
.set(ProcessStandardInterpret::getMasterInterpretId, toUserId));
// TaskService taskService = SpringContextUtil.getBean(TaskService.class);
// RuntimeService runtimeService = SpringContextUtil.getBean(RuntimeService.class);
// // 更新主流程标准解读人流程变量
// HashMap<String, Object> map = new HashMap<>();
// map.put(StandardInterpretCommon.MASTER_INTERPRET, toUserId);
// runtimeService.setVariables(processAll.getProcessInstanceId(), map);
// // 更新人员信息绑定表
// ProcessNodeService processNodeService =
// SpringContextUtil.getBean(ProcessNodeService.class);
// LambdaQueryWrapper<ProcessNode> queryProcessNode = new LambdaQueryWrapper<>();
// queryProcessNode.eq(ProcessNode::getProcessDefinitionId, processAll.getProcessDefinitionId());
// queryProcessNode.in(ProcessNode::getXmlNodeId,
// Arrays.asList(StandardInterpretCommon.MASTER_INTERPRET_APPROVE,
// StandardInterpretCommon.MASTER_INTERPRET_SUMMARY));
// List<ProcessNode> processNodeList = processNodeService.list(queryProcessNode);
// ProcessNodeLinkService processNodeLinkService = SpringContextUtil.getBean(ProcessNodeLinkService.class);
// for (ProcessNode processNode : processNodeList) {
// LambdaUpdateWrapper<ProcessNodeLink> updateProcessNodeLink = new LambdaUpdateWrapper<>();
// updateProcessNodeLink.eq(ProcessNodeLink::getProcessInstanceId, processAll.getProcessInstanceId());
// updateProcessNodeLink.eq(ProcessNodeLink::getProcessNodeId, processNode.getId());
// updateProcessNodeLink.eq(ProcessNodeLink::getProcessDefinitionId, processAll.getProcessDefinitionId());
// updateProcessNodeLink.set(ProcessNodeLink::getUserId, toUserId);
// processNodeLinkService.update(updateProcessNodeLink);
// }
//
// // 查询其他子流程
// List<ProcessApprovalRecord> processApprovalRecordList = processApprovalRecordService.list(
// new LambdaQueryWrapper<ProcessApprovalRecord>()
// .eq(ProcessApprovalRecord::getProcessInstanceId, processApprovalRecord.getProcessInstanceId())
// .eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue())
// .isNotNull(ProcessApprovalRecord::getParentTaskId)
// .ne(ProcessApprovalRecord::getNodeId, StandardInterpretCommon.MASTER_INTERPRET_APPROVE));
// // 更新子流程标准解读人流程变量
// for (ProcessApprovalRecord approvalRecord : processApprovalRecordList) {
// Task task2 = taskService.createTaskQuery().taskId(approvalRecord.getTaskId()).singleResult();
// runtimeService.setVariable(task2.getExecutionId(), StandardInterpretCommon.MASTER_INTERPRET, toUserId);
// }
}
}
/**
laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
-3
View File
@@ -1892,9 +1892,6 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
if (pass){
processStandardInterpretClauseSublistService
.saveOrUpdateBatch(processStandardInterpretClauseSublistList);
}else {
// 驳回
}
break;
// 会签（分发）