diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java index 0e2029a8..8e0f0c9d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java @@ -33,6 +33,7 @@ public class EsDeclareFlow implements WorkCenterService { @Override public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { - + ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); + processAllService.specialTransfer(processAll, processApprovalRecord, toUserId); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java index 311369f6..b9616949 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java @@ -33,6 +33,7 @@ public class EsInspectFlow implements WorkCenterService { @Override public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { - + ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); + processAllService.specialTransfer(processAll, processApprovalRecord, toUserId); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java index 2ef1a2bb..754ebb9b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java @@ -33,6 +33,7 @@ public class EsInspectDelayApplyFlow implements WorkCenterService { @Override public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { - + ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); + processAllService.specialTransfer(processAll, processApprovalRecord, toUserId); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java index e4d9dd82..377e02a8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java @@ -33,6 +33,7 @@ public class EsInspectPlanFlow implements WorkCenterService { @Override public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { - + ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); + processAllService.specialTransfer(processAll, processApprovalRecord, toUserId); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java index 99ce08ce..af909f9c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java @@ -33,6 +33,7 @@ public class EsInspectRectifyFlow implements WorkCenterService { @Override public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { - + ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); + processAllService.specialTransfer(processAll, processApprovalRecord, toUserId); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java index d4473cec..eecbbd78 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java @@ -33,6 +33,7 @@ public class EsPermissionApplyFlow implements WorkCenterService { @Override public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { - + ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); + processAllService.specialTransfer(processAll, processApprovalRecord, toUserId); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index 6822652a..5a556553 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -641,12 +641,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl // 物理删除 processAllMapper.physicalDeleteByProjectId(tableName, projectId); } + + public void specialTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + // 特殊转办 + RuntimeService runtimeService = SpringContextUtil.getBean(RuntimeService.class); + ProcessNodeService processNodeService = SpringContextUtil.getBean(ProcessNodeService.class); + TaskService taskService = SpringContextUtil.getBean(TaskService.class); + Task task = taskService.createTaskQuery().taskId(processApprovalRecord.getTaskId()).singleResult(); + // 查询节点信息 + ProcessNode processNode = processNodeService.getOne( + new LambdaQueryWrapper() + .eq(ProcessNode::getProcessDefinitionId, processAll.getProcessDefinitionId()) + .eq(ProcessNode::getXmlNodeId, processApprovalRecord.getNodeId())); + if (!Objects.isNull(processNode) && VariableTypeEnum.STRING.getName().equals(processNode.getVariableType())){ + runtimeService.setVariable(task.getExecutionId(), processNode.getVariableName(), toUserId); + } + // 稽查延期申请流程 稽查联络人评估 节点特殊处理 + if (ProcessTypeEnum.ES_INSPECT_DELAY_APPLY.getValue().equals(processAll.getPrcType()) + && EsInspectDelayApplyCommon.PROCESS_NODE_3.equals(processApprovalRecord.getNodeId())){ + IProcessEsInspectDelayApplyService processEsInspectDelayApplyService = SpringContextUtil.getBean(IProcessEsInspectDelayApplyService.class); + processEsInspectDelayApplyService.update( + new LambdaUpdateWrapper() + .eq(ProcessEsInspectDelayApply::getProjectId, processAll.getProjectId()) + .eq(ProcessEsInspectDelayApply::getLiaisons, processApprovalRecord.getUserId()) + .set(ProcessEsInspectDelayApply::getLiaisons, toUserId)); + } + } }