From 547f31cb6ff37c183c0cc2915fd659b0d477e9fd Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 3 Jan 2024 13:54:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E6=B5=81=E7=A8=8B):=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=98=E5=82=A8=E6=96=B9=E5=BC=8F=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EsDeclareFlowServiceImpl.java | 5 -- .../impl/EsInspectFlowServiceImpl.java | 67 +++++++++---------- .../process/esinspect/vo/EsInspectFlowVO.java | 5 ++ .../EsInspectDelayApplyFlowServiceImpl.java | 29 ++++++-- .../vo/EsInspectDelayApplyFlowVO.java | 5 ++ .../impl/EsInspectPlanFlowServiceImpl.java | 7 +- .../esinspectplan/vo/EsInspectPlanFlowVO.java | 6 ++ .../impl/EsInspectRectifyFlowServiceImpl.java | 15 +++-- .../EsPermissionApplyFlowServiceImpl.java | 20 +++--- .../impl/MeetingManageFlowServiceImpl.java | 5 -- 10 files changed, 97 insertions(+), 67 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 76c19637..98670e6c 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 @@ -136,11 +136,6 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService { // 自动完成第一个节点 taskService.complete(task.getId()); - // 删除草稿 - processDraftService.remove(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, processAll.getProjectId()) - .eq(ProcessDraft::getUserId, loginUser.getId())); - // 发起即结束 ProcessEsDeclare processEsDeclare = processEsDeclareService.queryByProjectId(processAll.getProjectId()); // 保存数据至企标宣贯 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 801e613e..8be2aae0 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 @@ -158,9 +158,16 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { private void handleBusinessData(EsInspectFlowVO esInspectFlowVO) { List processEsInspectList = esInspectFlowVO.getProcessEsInspectList(); + // 删除数据 + if (StringUtils.isNotBlank(esInspectFlowVO.getProcessAllDelIds())){ + List idList = Arrays.asList(esInspectFlowVO.getProcessAllDelIds().split(",")); + processEsInspectService.removeByIds(idList); + enterpriseStandardInspectContentService.removeByIds(idList); + enterpriseStandardInspectReportService.removeByIds(idList); + enterpriseStandardInspectRectifyPlanService.removeByIds(idList); + } ProcessAll processAll = esInspectFlowVO.getProcessAll(); String projectId = processAll.getProjectId(); - processEsInspectList.stream().map(v -> { if (StringUtils.isBlank(v.getId())){ v.setId(String.valueOf(SnowflakeUtils.snowflake())); @@ -175,49 +182,37 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { for (ProcessEsInspect processEsInspect : processEsInspectList) { // 处理稽查内容 if (EsInspectCommon.PROCESS_NODE_1.equals(processAll.getNodeId())){ - // 清除旧稽查内容 - enterpriseStandardInspectContentService.remove( - new LambdaQueryWrapper() - .eq(EnterpriseStandardInspectContent::getProcessEsInspectId, processEsInspect.getId())); - // 添加新稽查内容 List enterpriseStandardInspectContentList = processEsInspect.getEnterpriseStandardInspectContentList(); + enterpriseStandardInspectContentList = enterpriseStandardInspectContentList.stream().filter(v -> StringUtils.isBlank(v.getId())).collect(Collectors.toList()); for (EnterpriseStandardInspectContent enterpriseStandardInspectContent : enterpriseStandardInspectContentList) { - if (StringUtils.isBlank(enterpriseStandardInspectContent.getId())){ - enterpriseStandardInspectContent.setId(String.valueOf(SnowflakeUtils.snowflake())); - } + enterpriseStandardInspectContent.setId(String.valueOf(SnowflakeUtils.snowflake())); enterpriseStandardInspectContent.setProcessEsInspectId(processEsInspect.getId()); } enterpriseStandardInspectContentService.saveOrUpdateBatch(enterpriseStandardInspectContentList); } // 处理稽查报告 和 整改计划 - if (EsInspectCommon.PROCESS_NODE_3.equals(processAll.getNodeId())){ - // 清除旧稽查报告 - enterpriseStandardInspectReportService.remove( - new LambdaQueryWrapper() - .eq(EnterpriseStandardInspectReport::getProcessEsInspectId, processEsInspect.getId())); - // 添加新稽查报告 - List enterpriseStandardInspectReportList = processEsInspect.getEnterpriseStandardInspectReportList(); - for (EnterpriseStandardInspectReport enterpriseStandardInspectReport : enterpriseStandardInspectReportList) { - if (StringUtils.isBlank(enterpriseStandardInspectReport.getId())){ - enterpriseStandardInspectReport.setId(String.valueOf(SnowflakeUtils.snowflake())); - } - enterpriseStandardInspectReport.setInspectId(processEsInspect.getId()); - } - enterpriseStandardInspectReportService.saveOrUpdateBatch(enterpriseStandardInspectReportList); + handleReportAndRectifyPlan(processAll, processEsInspect); + } + } - // 清除旧整改计划 - enterpriseStandardInspectRectifyPlanService.remove( - new LambdaQueryWrapper() - .eq(EnterpriseStandardInspectRectifyPlan::getProcessEsInspectId, processEsInspect.getId())); - // 添加新整改计划 - List enterpriseStandardInspectRectifyPlanList = processEsInspect.getEnterpriseStandardInspectRectifyPlanList(); - for (EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan : enterpriseStandardInspectRectifyPlanList) { - if (StringUtils.isBlank(enterpriseStandardInspectRectifyPlan.getId())){ - enterpriseStandardInspectRectifyPlan.setId(String.valueOf(SnowflakeUtils.snowflake())); - } - enterpriseStandardInspectRectifyPlan.setInspectId(processEsInspect.getId()); - } + private void handleReportAndRectifyPlan(ProcessAll processAll, ProcessEsInspect processEsInspect) { + if (EsInspectCommon.PROCESS_NODE_3.equals(processAll.getNodeId())){ + // 添加新稽查报告 + List enterpriseStandardInspectReportList = processEsInspect.getEnterpriseStandardInspectReportList(); + enterpriseStandardInspectReportList = enterpriseStandardInspectReportList.stream().filter(v -> StringUtils.isBlank(v.getId())).collect(Collectors.toList()); + for (EnterpriseStandardInspectReport enterpriseStandardInspectReport : enterpriseStandardInspectReportList) { + enterpriseStandardInspectReport.setId(String.valueOf(SnowflakeUtils.snowflake())); + enterpriseStandardInspectReport.setInspectId(processEsInspect.getId()); + } + enterpriseStandardInspectReportService.saveOrUpdateBatch(enterpriseStandardInspectReportList); + + // 添加新整改计划 + List enterpriseStandardInspectRectifyPlanList = processEsInspect.getEnterpriseStandardInspectRectifyPlanList(); + enterpriseStandardInspectRectifyPlanList = enterpriseStandardInspectRectifyPlanList.stream().filter(v -> StringUtils.isBlank(v.getId())).collect(Collectors.toList()); + for (EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan : enterpriseStandardInspectRectifyPlanList) { + enterpriseStandardInspectRectifyPlan.setId(String.valueOf(SnowflakeUtils.snowflake())); + enterpriseStandardInspectRectifyPlan.setInspectId(processEsInspect.getId()); } } } @@ -226,7 +221,7 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { List list = processEsInspectService.list( new LambdaQueryWrapper() .in(ProcessEsInspect::getId, processEsInspectList.stream().map(ProcessEsInspect::getId).collect(Collectors.toList()))); - if (list.size() > 0){ + if (!list.isEmpty()){ List enterpriseStandardInspectList = enterpriseStandardInspectService.listByIds(list.stream().map(ProcessEsInspect::getInspectId).collect(Collectors.toList())); String inspectNos = enterpriseStandardInspectList.stream().map(EnterpriseStandardInspect::getInspectNo).collect(Collectors.joining(",")); throw new JeroBootException("稽查依据标准编号为：" + inspectNos + "的稽查已发起过企标稽查流程，请勿重复选择！"); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java index 334e9739..49c09741 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java @@ -33,4 +33,9 @@ public class EsInspectFlowVO { /**草稿信息json字符串*/ @ApiModelProperty(value = "草稿信息json字符串") private String infoJsonStr; + /** + * 流程全局删除ids + */ + @ApiModelProperty(value="流程全局删除ids") + private String processAllDelIds; } 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 8c89aee6..e7f9228c 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 @@ -117,16 +117,33 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getTaskId, task.getId())); + // 处理业务表数据 + handleBusinessData(esInspectDelayApplyFlowVO); + // 新增流程实例节点关联用户表 processNodeLinkService.saveNodeUserLink(processInstance.getProcessDefinitionId(), processInstance.getId(), listToString(map)); // 自动完成第一个节点 taskService.complete(task.getId()); + } - // 删除草稿 - processDraftService.remove(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, processAll.getProjectId()) - .eq(ProcessDraft::getUserId, loginUser.getId())); + private void handleBusinessData(EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO) { + List processEsInspectDelayApplyList = esInspectDelayApplyFlowVO.getProcessEsInspectDelayApplyList(); + // 删除数据 + if (StringUtils.isNotBlank(esInspectDelayApplyFlowVO.getProcessAllDelIds())){ + List idList = Arrays.asList(esInspectDelayApplyFlowVO.getProcessAllDelIds().split(",")); + processEsInspectDelayApplyService.removeByIds(idList); + } + ProcessAll processAll = esInspectDelayApplyFlowVO.getProcessAll(); + String projectId = processAll.getProjectId(); + processEsInspectDelayApplyList.stream().map(v -> { + if (StringUtils.isBlank(v.getId())){ + v.setId(String.valueOf(SnowflakeUtils.snowflake())); + } + v.setProjectId(projectId); + return v; + }).collect(Collectors.toList()).forEach(v -> log.info(v.toString())); + processEsInspectDelayApplyService.saveOrUpdateBatch(processEsInspectDelayApplyList); } private Map listToString(Map map) { @@ -183,6 +200,8 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF .eq(ProcessDraft::getUserId, loginUser.getId())); // 保存新草稿 processDraftService.save(processDraft); + // 处理业务表数据 + handleBusinessData(esInspectDelayApplyFlowVO); } @Override @@ -264,6 +283,8 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF if (task!= null) { // 完成任务 taskService.complete(task.getId(), map); + // 处理业务表数据 + handleBusinessData(esInspectDelayApplyFlowVO); // 再次更新流程审批信息 processApprovalRecordService.update(new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java index 4e537f43..faa14f1a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java @@ -33,4 +33,9 @@ public class EsInspectDelayApplyFlowVO { /**草稿信息json字符串*/ @ApiModelProperty(value = "草稿信息json字符串") private String infoJsonStr; + /** + * 流程全局删除ids + */ + @ApiModelProperty(value="流程全局删除ids") + private String processAllDelIds; } 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 4ddcad7b..a7eab2d8 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 @@ -153,6 +153,12 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { private void handleBusinessData(EsInspectPlanFlowVO esInspectPlanFlowVO) { List processEsInspectPlanList = esInspectPlanFlowVO.getProcessEsInspectPlanList(); + // 删除数据 + if (StringUtils.isNotBlank(esInspectPlanFlowVO.getProcessAllDelIds())){ + List idList = Arrays.asList(esInspectPlanFlowVO.getProcessAllDelIds().split(",")); + processEsInspectPlanService.removeByIds(idList); + processEsInspectPlanOpinionService.removeByIds(idList); + } ProcessAll processAll = esInspectPlanFlowVO.getProcessAll(); String projectId = processAll.getProjectId(); processEsInspectPlanList.stream().map(v -> { @@ -179,7 +185,6 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { // 保存意见 processEsInspectPlanOpinionService.saveOrUpdateBatch(processEsInspectPlanOpinions); } - } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/EsInspectPlanFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/EsInspectPlanFlowVO.java index f283113a..c6abe93b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/EsInspectPlanFlowVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/vo/EsInspectPlanFlowVO.java @@ -51,4 +51,10 @@ public class EsInspectPlanFlowVO { */ @ApiModelProperty(value="会签人员 翻译") private String countersignDictText; + + /** + * 流程全局删除ids + */ + @ApiModelProperty(value="流程全局删除ids") + private String processAllDelIds; } 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 0e454887..dd0d481e 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 @@ -121,6 +121,11 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer processNodeLinkService.saveNodeUserLink(processInstance.getProcessDefinitionId(), processInstance.getId(), listToString(map)); } + private void handleBusinessData(EsInspectRectifyFlowVO esInspectReportFlowVO) { + ProcessEsInspectRectify processEsInspectRectify = esInspectReportFlowVO.getProcessEsInspectRectify(); + processEsInspectRectifyService.saveOrUpdate(processEsInspectRectify); + } + @Override public void flowSave(EsInspectRectifyFlowVO esInspectReportFlowVO) { // 流程信息 @@ -164,9 +169,8 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer // 保存新草稿 processDraftService.save(processDraft); - // 保存业务表信息 - ProcessEsInspectRectify processEsInspectReport = esInspectReportFlowVO.getProcessEsInspectRectify(); - processEsInspectRectifyService.updateById(processEsInspectReport); + // 处理业务表数据 + handleBusinessData(esInspectReportFlowVO); } @Override @@ -244,9 +248,8 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer .set(ProcessNodeLink::getUserId, userInfo.getLinkUserIds())); } - // 保存业务表信息 - ProcessEsInspectRectify processEsInspectReport = esInspectReportFlowVO.getProcessEsInspectRectify(); - processEsInspectRectifyService.updateById(processEsInspectReport); + // 处理业务表数据 + handleBusinessData(esInspectReportFlowVO); // 更新流程审批信息 processApprovalRecordService.update( 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 64298cad..89c54ec8 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 @@ -86,9 +86,8 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe // 再次设置map runtimeService.setVariables(processInstance.getId(), map); - // 保存业务数据 - ProcessEsPermissionApply processEsPermissionApply = esPermissionApplyFlowVO.getProcessEsPermissionApply(); - processEsPermissionApplyService.saveOrUpdate(processEsPermissionApply); + // 处理业务表数据 + handleBusinessData(esPermissionApplyFlowVO); // 更新流程总表信息 LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -117,11 +116,11 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe // 自动完成第一个节点 taskService.complete(task.getId()); + } - // 删除草稿 - processDraftService.remove(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, processAll.getProjectId()) - .eq(ProcessDraft::getUserId, loginUser.getId())); + private void handleBusinessData(EsPermissionApplyFlowVO esPermissionApplyFlowVO) { + ProcessEsPermissionApply processEsPermissionApply = esPermissionApplyFlowVO.getProcessEsPermissionApply(); + processEsPermissionApplyService.saveOrUpdate(processEsPermissionApply); } private Map listToString(Map map) { @@ -179,9 +178,8 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe // 保存新草稿 processDraftService.save(processDraft); - // 保存业务数据 - ProcessEsPermissionApply processEsPermissionApply = esPermissionApplyFlowVO.getProcessEsPermissionApply(); - processEsPermissionApplyService.saveOrUpdate(processEsPermissionApply); + // 处理业务表数据 + handleBusinessData(esPermissionApplyFlowVO); } @Override @@ -263,6 +261,8 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe if (task!= null) { // 完成任务 taskService.complete(task.getId(), map); + // 处理业务表数据 + handleBusinessData(esPermissionApplyFlowVO); // 再次更新流程审批信息 processApprovalRecordService.update(new LambdaUpdateWrapper() .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) 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 d5ede3c4..53c5e4c1 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 @@ -132,11 +132,6 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService { // 自动完成第一个节点 taskService.complete(task.getId()); - - // 删除草稿 - processDraftService.remove(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, processAll.getProjectId()) - .eq(ProcessDraft::getUserId, loginUser.getId())); } @Override