From 8e316015ab062dd8838aa89901fac3ff4e178358 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 27 Sep 2023 11:36:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=92=8C=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=88=A0=E9=99=A4-=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=90=8C=E6=AD=A5=E5=88=A0=E9=99=A4=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...formProjectLawsInventoryEOServiceImpl.java | 95 +++--------------- .../ProjectLawsInventoryEOServiceImpl.java | 97 +++---------------- 2 files changed, 26 insertions(+), 166 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index 540ba1425..0169059a1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -690,6 +690,10 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl piFlowTypeList = new ArrayList<>(); @@ -4862,7 +4875,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl taskInventoryQueryWrapper = new QueryWrapper<>(); - taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,idList); - List projectTaskInventoryList = this.projectTaskInventoryEOService.getBaseMapper().selectList(taskInventoryQueryWrapper); - - //删除流程历史 - if(CollectionUtils.isNotEmpty(projectTaskInventoryList)){ - List actiProcInstIdList = new ArrayList<>(); - List verifyPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getVerifyPId).distinct().collect(Collectors.toList()); - List prehomoPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getPrehomoPId).distinct().collect(Collectors.toList()); - List designPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getDesignPId).distinct().collect(Collectors.toList()); - - actiProcInstIdList.addAll(verifyPIdList); - actiProcInstIdList.addAll(prehomoPIdList); - actiProcInstIdList.addAll(designPIdList); - - actiProcInstIdList = actiProcInstIdList.stream().distinct().collect(Collectors.toList());; - if(CollectionUtils.isNotEmpty(actiProcInstIdList)){ - QueryWrapper processHistoryDeleteWrapper = new QueryWrapper<>(); - processHistoryDeleteWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId,actiProcInstIdList); - processHistoryEOService.remove(processHistoryDeleteWrapper); - } - pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(",")); - } - - QueryWrapper queryLawsInventoryWrapper = new QueryWrapper<>(); - queryLawsInventoryWrapper.lambda().in(ProjectLawsInventoryEO::getId,idList); - - List projectTaskInventoryEOList = new ArrayList<>(); - List projectLawsInventoryEOList = this.baseMapper.selectList(queryLawsInventoryWrapper); - projectLawsInventoryEOList.forEach(projectLawsInventory -> { - ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO(); - String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", ""); - projectTaskInventoryEO.setId(projectTaskInventoryId); - projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventory.getId()); - projectTaskInventoryEO.setStandId(projectLawsInventory.getStandId()); - projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue()); - projectTaskInventoryEOList.add(projectTaskInventoryEO); - }); -// idList.forEach(id -> { -// ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO(); -// String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", ""); -// projectTaskInventoryEO.setId(projectTaskInventoryId); -// projectTaskInventoryEO.setProjectLawsInventoryId(id); -// projectTaskInventoryEOList.add(projectTaskInventoryEO); -// }); - //项目任务清单数据初始化。 - this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(idList); - this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList); - - //初始化项目状态评估 - projectTaskInventoryEOList.forEach(taskInventory -> { - this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId()); - }); - - //删除该法规的任务明细数据 - QueryWrapper deleteTaskInventoryDetailWrapper = new QueryWrapper<>(); - deleteTaskInventoryDetailWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,idList); - this.projectTaskInventoryDetailEOService.remove(deleteTaskInventoryDetailWrapper); - - //查询反馈意见表 获取id 用于删除 反馈意见历史数据。 - QueryWrapper queryTaskInventoryFeedbackWrapper = new QueryWrapper<>(); - queryTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList); - List projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(queryTaskInventoryFeedbackWrapper); - List feedbackIdList = projectTaskInventoryFeedbackEOList.stream().map(ProjectTaskInventoryFeedbackEO::getId).distinct().collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(feedbackIdList)){ - QueryWrapper deleteFeedbackHistoryWrapper = new QueryWrapper<>(); - deleteFeedbackHistoryWrapper.lambda().in(FeedbackHistory::getFeedbackId,feedbackIdList); - feedbackHistoryService.remove(deleteFeedbackHistoryWrapper); - } - - //删除反馈意见数据 - QueryWrapper deleteTaskInventoryFeedbackWrapper = new QueryWrapper<>(); - deleteTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList); - this.projectTaskInventoryFeedbackEOService.remove(deleteTaskInventoryFeedbackWrapper); - - //删除当前项目状态表 - QueryWrapper deleteConditionAssessmentWrapper = new QueryWrapper<>(); - deleteConditionAssessmentWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,idList); - this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper);*/ JSONObject params = new JSONObject(); params.put("projectLawsInventoryIds", projectLawsInventoryIds); @@ -5016,7 +4950,6 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl dataList, diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 2e2925cfc..1731b1408 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -639,6 +639,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl piFlowTypeList = new ArrayList<>(); @@ -4804,14 +4815,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl taskInventoryQueryWrapper = new QueryWrapper<>(); - taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,idList); - List projectTaskInventoryList = this.projectTaskInventoryEOService.getBaseMapper().selectList(taskInventoryQueryWrapper); - - //删除流程历史 - if(CollectionUtils.isNotEmpty(projectTaskInventoryList)){ - List actiProcInstIdList = new ArrayList<>(); - List verifyPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getVerifyPId).distinct().collect(Collectors.toList()); - List prehomoPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getPrehomoPId).distinct().collect(Collectors.toList()); - List designPIdList = projectTaskInventoryList.stream().map(ProjectTaskInventoryEO::getDesignPId).distinct().collect(Collectors.toList()); - - actiProcInstIdList.addAll(verifyPIdList); - actiProcInstIdList.addAll(prehomoPIdList); - actiProcInstIdList.addAll(designPIdList); - - actiProcInstIdList = actiProcInstIdList.stream().distinct().collect(Collectors.toList());; - if(CollectionUtils.isNotEmpty(actiProcInstIdList)){ - QueryWrapper processHistoryDeleteWrapper = new QueryWrapper<>(); - processHistoryDeleteWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId,actiProcInstIdList); - processHistoryEOService.remove(processHistoryDeleteWrapper); - } - pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(",")); - } - - QueryWrapper queryLawsInventoryWrapper = new QueryWrapper<>(); - queryLawsInventoryWrapper.lambda().in(ProjectLawsInventoryEO::getId,idList); - - List projectTaskInventoryEOList = new ArrayList<>(); - List projectLawsInventoryEOList = this.baseMapper.selectList(queryLawsInventoryWrapper); - projectLawsInventoryEOList.forEach(projectLawsInventory -> { - ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO(); - String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", ""); - projectTaskInventoryEO.setId(projectTaskInventoryId); - projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventory.getId()); - projectTaskInventoryEO.setStandId(projectLawsInventory.getStandId()); - projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue()); - projectTaskInventoryEOList.add(projectTaskInventoryEO); - }); -// idList.forEach(id -> { -// ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO(); -// String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", ""); -// projectTaskInventoryEO.setId(projectTaskInventoryId); -// projectTaskInventoryEO.setProjectLawsInventoryId(id); -// projectTaskInventoryEOList.add(projectTaskInventoryEO); -// }); - //项目任务清单数据初始化。 - this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(idList); - this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList); - - //初始化项目状态评估 - projectTaskInventoryEOList.forEach(taskInventory -> { - this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId()); - }); - - //删除该法规的任务明细数据 - QueryWrapper deleteTaskInventoryDetailWrapper = new QueryWrapper<>(); - deleteTaskInventoryDetailWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,idList); - this.projectTaskInventoryDetailEOService.remove(deleteTaskInventoryDetailWrapper); - - //查询反馈意见表 获取id 用于删除 反馈意见历史数据。 - QueryWrapper queryTaskInventoryFeedbackWrapper = new QueryWrapper<>(); - queryTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList); - List projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(queryTaskInventoryFeedbackWrapper); - List feedbackIdList = projectTaskInventoryFeedbackEOList.stream().map(ProjectTaskInventoryFeedbackEO::getId).distinct().collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(feedbackIdList)){ - QueryWrapper deleteFeedbackHistoryWrapper = new QueryWrapper<>(); - deleteFeedbackHistoryWrapper.lambda().in(FeedbackHistory::getFeedbackId,feedbackIdList); - feedbackHistoryService.remove(deleteFeedbackHistoryWrapper); - } - - //删除反馈意见数据 - QueryWrapper deleteTaskInventoryFeedbackWrapper = new QueryWrapper<>(); - deleteTaskInventoryFeedbackWrapper.lambda().in(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,idList); - this.projectTaskInventoryFeedbackEOService.remove(deleteTaskInventoryFeedbackWrapper); - - //删除当前项目状态表 - QueryWrapper deleteConditionAssessmentWrapper = new QueryWrapper<>(); - deleteConditionAssessmentWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,idList); - this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper);*/ - JSONObject params = new JSONObject(); params.put("projectLawsInventoryIds", projectLawsInventoryIds); params.put("pIds", pIds); @@ -4969,7 +4897,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.in(LawsInventoryPlatformEO::getLawsInventoryId,Arrays.asList(ids.split(","))); lawsInventoryPlatformEOService.remove(wrapper); - return Result.OK("变更成功！"); } private void importDatas(List dataList,