From aeceb008624e5b7472b991bb5e0f16ba576e3f43 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 22 Aug 2024 19:15:33 +0800 Subject: [PATCH] =?UTF-8?q?fix(88496):=20=E5=AE=A1=E6=A0=B8=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E8=BD=AC=E5=8A=9E=E5=90=8E=E9=A9=B3=E5=9B=9E=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E4=BA=BA=E9=A9=B3=E5=9B=9E=EF=BC=8C=E5=88=86?= =?UTF-8?q?=E5=8F=91=E8=8A=82=E7=82=B9=E7=9A=84=E5=BE=85=E5=8A=9E=E6=8E=A5?= =?UTF-8?q?=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StandardInterpretFlow.java | 50 +------------------ .../StandardInterpretFlowServiceImpl.java | 3 -- 2 files changed, 1 insertion(+), 52 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java index d7d76fec..2c6a0b59 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java @@ -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() - .eq(ProcessStandardInterpret::getProjectId, processAll.getProjectId()) - .set(ProcessStandardInterpret::getMasterInterpretId, toUserId)); -// TaskService taskService = SpringContextUtil.getBean(TaskService.class); -// RuntimeService runtimeService = SpringContextUtil.getBean(RuntimeService.class); -// // 更新主流程标准解读人流程变量 -// HashMap map = new HashMap<>(); -// map.put(StandardInterpretCommon.MASTER_INTERPRET, toUserId); -// runtimeService.setVariables(processAll.getProcessInstanceId(), map); -// // 更新人员信息绑定表 -// ProcessNodeService processNodeService = -// SpringContextUtil.getBean(ProcessNodeService.class); -// LambdaQueryWrapper queryProcessNode = new LambdaQueryWrapper<>(); -// queryProcessNode.eq(ProcessNode::getProcessDefinitionId, processAll.getProcessDefinitionId()); -// queryProcessNode.in(ProcessNode::getXmlNodeId, -// Arrays.asList(StandardInterpretCommon.MASTER_INTERPRET_APPROVE, -// StandardInterpretCommon.MASTER_INTERPRET_SUMMARY)); -// List processNodeList = processNodeService.list(queryProcessNode); -// ProcessNodeLinkService processNodeLinkService = SpringContextUtil.getBean(ProcessNodeLinkService.class); -// for (ProcessNode processNode : processNodeList) { -// LambdaUpdateWrapper 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 processApprovalRecordList = processApprovalRecordService.list( -// new LambdaQueryWrapper() -// .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); -// } - } } /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java index 08953c29..556f92c8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java @@ -1892,9 +1892,6 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe if (pass){ processStandardInterpretClauseSublistService .saveOrUpdateBatch(processStandardInterpretClauseSublistList); - }else { - // 驳回 - } break; // 会签（分发）