diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java index 97b05186..a0a788f6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java @@ -304,6 +304,11 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { if (task!= null) { // 完成任务 taskService.complete(task.getId(), map); + // 再次更新流程审批信息 + processApprovalRecordService.update(new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) + .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) + .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())); // 判断是否是最后一个节点 if (isLastNode(processAll.getProcessInstanceId())){ // 企标稽查计划 生成数据 保存企标库 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java index 83327610..832f43a2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java @@ -259,6 +259,11 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF if (task!= null) { // 完成任务 taskService.complete(task.getId(), map); + // 再次更新流程审批信息 + processApprovalRecordService.update(new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) + .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) + .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())); // 判断是否是最后一个节点 if (isLastNode(processAll.getProcessInstanceId())){ // 稽查延期申请流程 生成数据 企业标准稽查延期 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java index 9c98ef2e..87c22bfb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java @@ -347,9 +347,14 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); if (task != null) { // 稽查联络人汇总节点保存会签信息 - saveCountersign(esInspectPlanFlowVO, map, task); + saveCountersign(esInspectPlanFlowVO, map); // 完成任务 taskService.complete(task.getId(), map); + // 再次更新流程审批信息 + processApprovalRecordService.update(new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) + .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) + .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())); // 可跳过节点处理 if (map.containsKey("pass") && (boolean) map.get("pass")){ // 更新流程实例节点关联用户表 @@ -392,7 +397,7 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { } } - private static void saveCountersign(EsInspectPlanFlowVO esInspectPlanFlowVO, Map map, Task task) { + private static void saveCountersign(EsInspectPlanFlowVO esInspectPlanFlowVO, Map map) { if (map.containsKey("pass") && (boolean) map.get("pass")){ if (StringUtils.isNotBlank(esInspectPlanFlowVO.getCountersign())){ map.put(COUNTERSIGN, esInspectPlanFlowVO.getCountersign()); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java index c82a9607..33e47680 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java @@ -262,6 +262,11 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer if (task!= null) { // 完成任务 taskService.complete(task.getId(), map); + // 再次更新流程审批信息 + processApprovalRecordService.update(new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) + .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) + .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())); // 判断是否是最后一个节点 if (isLastNode(processAll.getProcessInstanceId())){ ProcessEsInspectRectifyVO processEsInspectReportVO = processEsInspectRectifyService.queryByProjectId(processAll.getProjectId()); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java index 65f5f65a..64298cad 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java @@ -263,6 +263,11 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe if (task!= null) { // 完成任务 taskService.complete(task.getId(), map); + // 再次更新流程审批信息 + processApprovalRecordService.update(new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) + .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) + .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())); // 判断是否是最后一个节点 if (isLastNode(processAll.getProcessInstanceId()) && map.containsKey("pass") && (boolean) map.get("pass")){ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java index 0989fc19..d5ede3c4 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java @@ -284,7 +284,11 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService { if (task!= null) { // 完成任务 taskService.complete(task.getId(), map); - + // 再次更新流程审批信息 + processApprovalRecordService.update(new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) + .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) + .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())); // 查询业务表数据 ProcessMeetingManage processMeetingManage = processMeetingManageService.getOne( new LambdaQueryWrapper()