From 9dd4d7d43b4401deac97c204fb9fda81e6b8e704 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 24 May 2022 19:04:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BDword=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E3=80=81=E5=8F=98=E6=9B=B4=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 157 +++++++++++------- .../impl/ProjectLibraryBaseServiceImpl.java | 52 ++++-- 2 files changed, 136 insertions(+), 73 deletions(-) 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 544f0ea0a..c92412abc 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 @@ -89,6 +89,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; @@ -183,6 +184,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl change(Map parmas) { List idList = Arrays.asList(parmas.get("ids").toString().split(",")); if(CollectionUtils.isNotEmpty(idList)){ @@ -2411,7 +2416,29 @@ 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); + } + } + List projectTaskInventoryEOList = new ArrayList<>(); idList.forEach(id -> { ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO(); @@ -2420,6 +2447,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deleteConditionAssessmentWrapper = new QueryWrapper<>(); + deleteConditionAssessmentWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,idList); + this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper); } return Result.OK("变更成功！"); } @@ -4273,7 +4305,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> dataList = new ArrayList<>(); // 设置数据 - if(tableIndex == 1){ - QueryWrapper taskFeedbackQueryWrapper = new QueryWrapper<>(); - taskFeedbackQueryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getActiProcInstId,pId); - List projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(taskFeedbackQueryWrapper); - if(CollectionUtils.isNotEmpty(projectTaskInventoryFeedbackEOList)){ - List fileIdList = projectTaskInventoryFeedbackEOList.stream().map(ProjectTaskInventoryFeedbackEO::getFileId).distinct().collect(Collectors.toList()); - String fileId = StringUtils.join(fileIdList,","); - List fileList = iOSSFileService.getFileInfos(fileId); - if(CollectionUtils.isNotEmpty(fileList)){ - fileList.forEach(file -> { - Map fileMap = new HashMap<>(); - fileMap.put("item.fileName", StringUtils.isNotEmpty(file.getFileName()) ? file.getFileName() : ""); - fileMap.put("item.filePath", StringUtils.isNotEmpty(file.getUrl()) ? file.getUrl() : ""); - dataList.add(fileMap); + if(StringUtils.isNotEmpty(pId)){ + if(tableIndex == 1){ + QueryWrapper taskFeedbackQueryWrapper = new QueryWrapper<>(); + taskFeedbackQueryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getActiProcInstId,pId); + List projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(taskFeedbackQueryWrapper); + if(CollectionUtils.isNotEmpty(projectTaskInventoryFeedbackEOList)){ + List fileIdList = projectTaskInventoryFeedbackEOList.stream().map(ProjectTaskInventoryFeedbackEO::getFileId).distinct().collect(Collectors.toList()); + String fileId = StringUtils.join(fileIdList,","); + List fileList = iOSSFileService.getFileInfos(fileId); + if(CollectionUtils.isNotEmpty(fileList)){ + fileList.forEach(file -> { + Map fileMap = new HashMap<>(); + fileMap.put("item.fileName", StringUtils.isNotEmpty(file.getFileName()) ? file.getFileName() : ""); + fileMap.put("item.filePath", StringUtils.isNotEmpty(file.getUrl()) ? file.getUrl() : ""); + /*fileMap.put("item.fileName", file.getFileName()); + fileMap.put("item.filePath", file.getUrl());*/ + dataList.add(fileMap); + }); + } + } + }else if(tableIndex == 3){ + params.put("actiProcInstId",pId); + List processHistoryEOList = processHistoryEOService.queryList(params); + if(CollectionUtils.isNotEmpty(processHistoryEOList)){ + processHistoryEOList.forEach(processHistory -> { + String createTime = sdf.format(processHistory.getCreateTime()); + + Map designMap = new HashMap<>(); + designMap.put("design.result", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : ""); + designMap.put("design.opinion", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : ""); + designMap.put("design.node", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : ""); + designMap.put("design.operator", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() :""); + designMap.put("design.dateTime", StringUtils.isNotEmpty(createTime) ? createTime : ""); + + /*designMap.put("design.result", processHistory.getReviewResult()); + designMap.put("design.opinion", processHistory.getApprovalOpinion()); + designMap.put("design.node", processHistory.getName()); + designMap.put("design.operator", processHistory.getAssignee()); + designMap.put("design.dateTime", createTime);*/ + dataList.add(designMap); }); } - } - }else if(tableIndex == 3){ - params.put("actiProcInstId",pId); - List processHistoryEOList = processHistoryEOService.queryList(params); - if(CollectionUtils.isNotEmpty(processHistoryEOList)){ - processHistoryEOList.forEach(processHistory -> { - String createTime = sdf.format(processHistory.getCreateTime()); + }else if(tableIndex == 4){ + params.put("actiProcInstId",pId); + List processHistoryEOList = processHistoryEOService.queryList(params); + if(CollectionUtils.isNotEmpty(processHistoryEOList)){ + processHistoryEOList.forEach(processHistory -> { + String createTime = sdf.format(processHistory.getCreateTime()); - Map designMap = new HashMap<>(); - designMap.put("design.result", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : ""); - designMap.put("design.opinion", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : ""); - designMap.put("design.node", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : ""); - designMap.put("design.operator", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() :""); - designMap.put("design.dateTime", StringUtils.isNotEmpty(createTime) ? createTime : ""); - dataList.add(designMap); - }); - } - }else if(tableIndex == 4){ - params.put("actiProcInstId",pId); - List processHistoryEOList = processHistoryEOService.queryList(params); - if(CollectionUtils.isNotEmpty(processHistoryEOList)){ - processHistoryEOList.forEach(processHistory -> { - String createTime = sdf.format(processHistory.getCreateTime()); + Map verifyMap = new HashMap<>(); + verifyMap.put("verify.result", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : ""); + verifyMap.put("verify.opinion", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : ""); + verifyMap.put("verify.node", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : ""); + verifyMap.put("verify.operator", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() :""); + verifyMap.put("verify.dateTime", StringUtils.isNotEmpty(createTime) ? createTime : ""); - Map verifyMap = new HashMap<>(); - verifyMap.put("verify.result", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : ""); - verifyMap.put("verify.opinion", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : ""); - verifyMap.put("verify.node", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : ""); - verifyMap.put("verify.operator", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() :""); - verifyMap.put("verify.dateTime", StringUtils.isNotEmpty(createTime) ? createTime : ""); - dataList.add(verifyMap); - }); + /*verifyMap.put("verify.result", processHistory.getReviewResult()); + verifyMap.put("verify.opinion", processHistory.getApprovalOpinion()); + verifyMap.put("verify.node", processHistory.getName()); + verifyMap.put("verify.operator", processHistory.getAssignee()); + verifyMap.put("verify.dateTime", createTime);*/ + dataList.add(verifyMap); + }); + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 9a42fb136..d12776d67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -258,6 +258,16 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl certificationProgressMap = new HashMap<>(); + //清单确认统计 + List> listingToConfirmMapList = this.projectLawsInventoryEOMapper.getlistingToConfirmStatistics(id); + listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList); + result.put("listingToConfirmMap",listingToConfirmMap); + + //任务确认统计 + List> taskToConfirmMapList = this.projectLawsInventoryEOMapper.getTaskToConfirmStatistics(id); + taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList); + result.put("taskToConfirmMap",taskToConfirmMap); + QueryWrapper lawsInventoryEOQueryWrapper = new QueryWrapper<>(); lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,id); lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue()); @@ -292,16 +302,6 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> listingToConfirmMapList = this.projectLawsInventoryEOMapper.getlistingToConfirmStatistics(id); - listingToConfirmMap.put("listingToConfirmMapList",listingToConfirmMapList); - result.put("listingToConfirmMap",listingToConfirmMap); - - //任务确认统计 - List> taskToConfirmMapList = this.projectLawsInventoryEOMapper.getTaskToConfirmStatistics(id); - taskToConfirmMap.put("taskToConfirmMapList",taskToConfirmMapList); - result.put("taskToConfirmMap",taskToConfirmMap); - //设计符合性 List> designComplianceMapList = this.projectTaskInventoryEOMapper.getDesignComplianceStatistice(projectLawsInventoryIdList); designComplianceMap.put("designComplianceMapList",designComplianceMapList); @@ -523,16 +523,34 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> datas,String cut){ - List dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("duty_territory"); + List dutyTerritoryList = sysDictItemServiceImpl.selectItemsByDictCode("duty_territory"); if(CollectionUtils.isNotEmpty(datas)){ for (Map data : datas) { - List dutyTerritory = dictItemList.stream().filter(dict -> StringUtils.equals(dict.getItemValue(), data.get("dutyTerritory").toString())).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(dutyTerritory)){ - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - data.put("dutyTerritory",dutyTerritory.get(0).getItemText()); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - data.put("dutyTerritory",dutyTerritory.get(0).getEnName()); + if(data.get("dutyTerritory") != null){ + String[] dutyTerritorieArr = data.get("dutyTerritory").toString().split(","); + String dutyTerritories = ""; + for (String dutyTerritorie : dutyTerritorieArr) { + List collect = new ArrayList<>(); + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + collect = dutyTerritoryList.stream() + .filter(e -> StringUtils.equals(dutyTerritorie, e.getItemValue())) + .map(SysDictItem::getItemText) + .collect(Collectors.toList()); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + collect = dutyTerritoryList.stream() + .filter(e -> StringUtils.equals(dutyTerritorie, e.getItemValue())) + .map(SysDictItem::getEnName) + .collect(Collectors.toList()); + } + if(CollectionUtils.isNotEmpty(collect)){ + dutyTerritories += collect.get(0) + ","; + } } + + if(StringUtils.isNotEmpty(dutyTerritories)){ + dutyTerritories = dutyTerritories.substring(0,dutyTerritories.length()-1); + } + data.put("dutyTerritory",dutyTerritories); } } }