diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java index 85bd61cf..eb268edd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java @@ -13,9 +13,13 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.entity.ProcessNode; import com.jero.modules.activiti.enums.CommitFlagEnum; import com.jero.modules.activiti.enums.FinishFlagEnum; +import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.enums.VariableTypeEnum; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.service.ProcessDraftService; +import com.jero.modules.activiti.process.esinspectdelayapply.common.EsInspectDelayApplyCommon; +import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsInspectDelayApply; +import com.jero.modules.activiti.process.esinspectdelayapply.service.IProcessEsInspectDelayApplyService; import com.jero.modules.activiti.process.esinspectplan.common.EsInspectPlanCommon; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; @@ -276,7 +280,7 @@ public class ProcessAspect { log.info("==========流程转办后置方法开始=========="); if (!Objects.isNull(jp.getArgs())) { String taskId = JSON.parseObject(JSON.toJSONString(jp.getArgs()[0]), String.class); - String userId = JSON.parseObject(JSON.toJSONString(jp.getArgs()[1]), String.class); + String toUserId = JSON.parseObject(JSON.toJSONString(jp.getArgs()[1]), String.class); ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getToDoByTaskId(taskId); String processInstanceId = processApprovalRecord.getProcessInstanceId(); ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); @@ -288,7 +292,18 @@ public class ProcessAspect { .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(), userId); + runtimeService.setVariable(task.getExecutionId(), processNode.getVariableName(), toUserId); + } + // 稽查延期申请流程 稽查联络人评估 节点特殊处理 + if (ProcessTypeEnum.ES_INSPECT_DELAY_APPLY.getValue().equals(processAll.getPrcType()) + && EsInspectDelayApplyCommon.PROCESS_NODE_3.equals(processApprovalRecord.getNodeId())){ + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + IProcessEsInspectDelayApplyService processEsInspectDelayApplyService = SpringContextUtil.getBean(IProcessEsInspectDelayApplyService.class); + processEsInspectDelayApplyService.update( + new LambdaUpdateWrapper() + .eq(ProcessEsInspectDelayApply::getProjectId, processAll.getProjectId()) + .eq(ProcessEsInspectDelayApply::getLiaisons, loginUser.getId()) + .set(ProcessEsInspectDelayApply::getLiaisons, toUserId)); } } log.info("==========流程转办后置方法结束=========="); 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 8e0f0c9d..ba30a5cb 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 @@ -32,8 +32,8 @@ public class EsDeclareFlow implements WorkCenterService { } @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId); + processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); } } 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 b9616949..dca5fa70 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 @@ -32,8 +32,8 @@ public class EsInspectFlow implements WorkCenterService { } @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId); + processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); } } 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 754ebb9b..8f08a9b1 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 @@ -32,8 +32,8 @@ public class EsInspectDelayApplyFlow implements WorkCenterService { } @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId); + processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); } } 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 377e02a8..37d650e7 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 @@ -32,8 +32,8 @@ public class EsInspectPlanFlow implements WorkCenterService { } @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId); + processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); } } 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 af909f9c..b76468c9 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 @@ -32,8 +32,8 @@ public class EsInspectRectifyFlow implements WorkCenterService { } @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId); + processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); } } 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 eecbbd78..5aeb413b 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 @@ -32,8 +32,8 @@ public class EsPermissionApplyFlow implements WorkCenterService { } @Override - public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); - processAllService.specialTransfer(processAll, processApprovalRecord, toUserId); + processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); } } 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 5a556553..5a94fdf3 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 @@ -640,8 +640,8 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl processAllMapper.physicalDeleteByProjectId(tableName, projectId); } - public void specialTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) { + public void specialTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { // 特殊转办 RuntimeService runtimeService = SpringContextUtil.getBean(RuntimeService.class); ProcessNodeService processNodeService = SpringContextUtil.getBean(ProcessNodeService.class); @@ -415,7 +415,7 @@ public class ProcessAllService extends ServiceImpl processEsInspectDelayApplyService.update( new LambdaUpdateWrapper() .eq(ProcessEsInspectDelayApply::getProjectId, processAll.getProjectId()) - .eq(ProcessEsInspectDelayApply::getLiaisons, processApprovalRecord.getUserId()) + .eq(ProcessEsInspectDelayApply::getLiaisons, userId) .set(ProcessEsInspectDelayApply::getLiaisons, toUserId)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/WorkCenterService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/WorkCenterService.java index c3a659e7..7c4bf272 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/WorkCenterService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/WorkCenterService.java @@ -16,9 +16,11 @@ public interface WorkCenterService { /** * 处理转办 + * * @param processAll * @param processApprovalRecord * @param toUserId + * @param userId */ - void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId); + void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId); }