From 7e980e07e099ffd7be2c46c81b9fd9d6968a969c Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 13 Dec 2023 11:48:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=A1=E6=89=B9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esinspect/service/impl/EsInspectFlowServiceImpl.java | 4 +++- .../service/impl/EsInspectDelayApplyFlowServiceImpl.java | 4 +++- .../service/impl/EsInspectPlanFlowServiceImpl.java | 3 ++- .../service/impl/EsInspectRectifyFlowServiceImpl.java | 4 +++- .../service/impl/EsPermissionApplyFlowServiceImpl.java | 4 +++- .../service/impl/MeetingManageFlowServiceImpl.java | 4 +++- 6 files changed, 17 insertions(+), 6 deletions(-) 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 a399474e..238b5194 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 @@ -290,7 +290,9 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { .set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()), ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()) - .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())); + .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue()) + .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()) + .set(ProcessApprovalRecord::getEndTime, new Date())); Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); if (task!= null) { 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 37b97ec3..61c89070 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 @@ -245,7 +245,9 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF .set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()), ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()) - .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())); + .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue()) + .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()) + .set(ProcessApprovalRecord::getEndTime, new Date())); Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); if (task!= null) { 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 ea37af2e..12d7e915 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 @@ -319,8 +319,9 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) .set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()), ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) - .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()) + .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()) .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue()) + .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()) .set(ProcessApprovalRecord::getEndTime, new Date())); Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); 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 ec891400..c46ec3da 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 @@ -248,7 +248,9 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer .set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()), ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()) - .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())); + .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue()) + .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()) + .set(ProcessApprovalRecord::getEndTime, new Date())); Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); if (task!= null) { 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 68dddacc..7b24f51e 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 @@ -256,7 +256,9 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe .set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()), ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()) - .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())); + .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue()) + .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()) + .set(ProcessApprovalRecord::getEndTime, new Date())); Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); if (task!= null) { 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 88ed5ab0..adb70605 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 @@ -261,7 +261,9 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService { .set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()), ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()) - .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())); + .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue()) + .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()) + .set(ProcessApprovalRecord::getEndTime, new Date())); Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); if (task!= null) {