From d75d1af0e6f9f9724dfe4ece3edd7f5f9d711e1d Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 15 Jan 2024 09:46:43 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=A8=BD=E6=9F=A5=E6=B5=81=E7=A8=8B):=20?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EsDeclareFlowServiceImpl.java | 16 +++++++++++++++- .../impl/EsInspectFlowServiceImpl.java | 18 ++++++++++++++++-- .../EsInspectDelayApplyFlowServiceImpl.java | 19 +++++++++++++++++-- .../impl/EsInspectPlanFlowServiceImpl.java | 17 +++++++++++++++-- .../impl/EsInspectRectifyFlowServiceImpl.java | 18 ++++++++++++++++-- .../EsPermissionApplyFlowServiceImpl.java | 18 ++++++++++++++++-- .../impl/MeetingManageFlowServiceImpl.java | 19 +++++++++++++++++-- 7 files changed, 112 insertions(+), 13 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java index 181e7a2f..b59cee5a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java @@ -170,6 +170,21 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService { public void flowSave(EsDeclareFlowVO esDeclareFlowVO) { // 企标宣贯业务表 processEsDeclareService.saveOrUpdate(esDeclareFlowVO.getProcessEsDeclare()); + // 流程信息 + ProcessAll processAll = esDeclareFlowVO.getProcessAll(); + // 流程审批信息 + ProcessApprovalRecord processApprovalRecord = esDeclareFlowVO.getProcessApprovalRecord(); + + // 更新流程信息 + processAllService.update(new LambdaUpdateWrapper() + .eq(ProcessAll::getId, processAll.getId()) + .set(ProcessAll::getPrcName, processAll.getPrcName()) + .set(ProcessAll::getPrcMes, processAll.getMes())); + // 更新流程审批信息 + processApprovalRecordService.update(new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) + .set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) + .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())); } @Override @@ -217,7 +232,6 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService { }else { // 不存在草稿 processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getProjectId, projectId) .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) .eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId) , false); 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 d569f918..d3113730 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 @@ -237,6 +237,21 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { public void flowSave(EsInspectFlowVO esInspectFlowVO) { // 处理业务表数据 handleBusinessData(esInspectFlowVO); + // 流程信息 + ProcessAll processAll = esInspectFlowVO.getProcessAll(); + // 流程审批信息 + ProcessApprovalRecord processApprovalRecord = esInspectFlowVO.getProcessApprovalRecord(); + + // 更新流程信息 + processAllService.update(new LambdaUpdateWrapper() + .eq(ProcessAll::getId, processAll.getId()) + .set(ProcessAll::getPrcName, processAll.getPrcName()) + .set(ProcessAll::getPrcMes, processAll.getMes())); + // 更新流程审批信息 + processApprovalRecordService.update(new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) + .set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) + .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())); } @Override @@ -284,9 +299,8 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { }else { // 不存在草稿 processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getProjectId, projectId) .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId) + .eq(ProcessApprovalRecord::getTaskId, taskId) , false); } // 业务表数据 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 1299e724..5aed282c 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 @@ -163,6 +163,22 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF public void flowSave(EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO) { // 处理业务表数据 handleBusinessData(esInspectDelayApplyFlowVO); + + // 流程信息 + ProcessAll processAll = esInspectDelayApplyFlowVO.getProcessAll(); + // 流程审批信息 + ProcessApprovalRecord processApprovalRecord = esInspectDelayApplyFlowVO.getProcessApprovalRecord(); + + // 更新流程信息 + processAllService.update(new LambdaUpdateWrapper() + .eq(ProcessAll::getId, processAll.getId()) + .set(ProcessAll::getPrcName, processAll.getPrcName()) + .set(ProcessAll::getPrcMes, processAll.getMes())); + // 更新流程审批信息 + processApprovalRecordService.update(new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) + .set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) + .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())); } @Override @@ -210,9 +226,8 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF }else { // 不存在草稿 processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getProjectId, projectId) .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId) + .eq(ProcessApprovalRecord::getTaskId, taskId) , false); } // 业务表数据 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 c418ce58..876ae408 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 @@ -192,6 +192,9 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { public void flowSave(EsInspectPlanFlowVO esInspectPlanFlowVO) { // 流程信息 ProcessAll processAll = esInspectPlanFlowVO.getProcessAll(); + // 流程审批信息 + ProcessApprovalRecord processApprovalRecord = esInspectPlanFlowVO.getProcessApprovalRecord(); + // 处理业务表数据 handleBusinessData(esInspectPlanFlowVO); @@ -203,6 +206,17 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { taskService.setVariable(processAll.getTaskId(), COUNTERSIGN_TAG, esInspectPlanFlowVO.getCountersignTag()); } } + + // 更新流程信息 + processAllService.update(new LambdaUpdateWrapper() + .eq(ProcessAll::getId, processAll.getId()) + .set(ProcessAll::getPrcName, processAll.getPrcName()) + .set(ProcessAll::getPrcMes, processAll.getMes())); + // 更新流程审批信息 + processApprovalRecordService.update(new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) + .set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) + .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())); } private Map listToString(Map map) { @@ -262,9 +276,8 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { }else { // 不存在草稿 processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getProjectId, projectId) .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId) + .eq(ProcessApprovalRecord::getTaskId, taskId) , false); } // 会签信息 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 df39920b..231e15ec 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 @@ -130,6 +130,21 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer public void flowSave(EsInspectRectifyFlowVO esInspectReportFlowVO) { // 处理业务表数据 handleBusinessData(esInspectReportFlowVO); + // 流程信息 + ProcessAll processAll = esInspectReportFlowVO.getProcessAll(); + // 流程审批信息 + ProcessApprovalRecord processApprovalRecord = esInspectReportFlowVO.getProcessApprovalRecord(); + + // 更新流程信息 + processAllService.update(new LambdaUpdateWrapper() + .eq(ProcessAll::getId, processAll.getId()) + .set(ProcessAll::getPrcName, processAll.getPrcName()) + .set(ProcessAll::getPrcMes, processAll.getMes())); + // 更新流程审批信息 + processApprovalRecordService.update(new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) + .set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) + .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())); } @Override @@ -177,9 +192,8 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer }else { // 不存在草稿 processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getProjectId, projectId) .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId) + .eq(ProcessApprovalRecord::getTaskId, taskId) , false); } esInspectReportFlowVO.setProcessAll(processAll); 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 0cec2e30..c2f69057 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 @@ -139,6 +139,21 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe public void flowSave(EsPermissionApplyFlowVO esPermissionApplyFlowVO) { // 处理业务表数据 handleBusinessData(esPermissionApplyFlowVO); + // 流程信息 + ProcessAll processAll = esPermissionApplyFlowVO.getProcessAll(); + // 流程审批信息 + ProcessApprovalRecord processApprovalRecord = esPermissionApplyFlowVO.getProcessApprovalRecord(); + + // 更新流程信息 + processAllService.update(new LambdaUpdateWrapper() + .eq(ProcessAll::getId, processAll.getId()) + .set(ProcessAll::getPrcName, processAll.getPrcName()) + .set(ProcessAll::getPrcMes, processAll.getMes())); + // 更新流程审批信息 + processApprovalRecordService.update(new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) + .set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) + .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())); } @Override @@ -186,9 +201,8 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe }else { // 不存在草稿 processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getProjectId, projectId) .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId) + .eq(ProcessApprovalRecord::getTaskId, taskId) , false); } esPermissionApplyFlowVO.setProcessAll(processAll); 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 86e563ae..46f4b386 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 @@ -158,6 +158,22 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService { processMeetingManagePersonnelService.save(processMeetingManagePersonnel); } } + + // 流程信息 + ProcessAll processAll = meetingManageFlowVO.getProcessAll(); + // 流程审批信息 + ProcessApprovalRecord processApprovalRecord = meetingManageFlowVO.getProcessApprovalRecord(); + + // 更新流程信息 + processAllService.update(new LambdaUpdateWrapper() + .eq(ProcessAll::getId, processAll.getId()) + .set(ProcessAll::getPrcName, processAll.getPrcName()) + .set(ProcessAll::getPrcMes, processAll.getMes())); + // 更新流程审批信息 + processApprovalRecordService.update(new LambdaUpdateWrapper() + .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) + .set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) + .set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())); } @Override @@ -205,9 +221,8 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService { }else { // 不存在草稿 processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() - .eq(ProcessApprovalRecord::getProjectId, projectId) .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) - .eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId) + .eq(ProcessApprovalRecord::getTaskId, taskId) , false); } meetingManageFlowVO.setProcessAll(processAll);