From 3ea2acd84bf6e73d4022c63a5a863de85db19254 Mon Sep 17 00:00:00 2001 From: gaosong Date: Fri, 27 Oct 2023 10:04:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E8=B0=83=E5=8F=96=E9=80=BB=E8=BE=91=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E6=A0=A1=E9=AA=8C=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 92 +++++++++---------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 21e198a8d..d88420ee8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -4475,34 +4475,34 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl prpEoList = this.projectRelatedPersonnelService.list(prpQueryWrap); - QueryWrapper lawsInventoryEOQueryWrap = new QueryWrapper<>(); - lawsInventoryEOQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); - List projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryEOQueryWrap); +// QueryWrapper lawsInventoryEOQueryWrap = new QueryWrapper<>(); +// lawsInventoryEOQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); +// List projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryEOQueryWrap); List projectCertificationInventoryEOList = new ArrayList<>(); List noSerialNumberList = new ArrayList<>(); for (AuthDummyInventoryInfoEO authDummyInventoryInfoEO : authDummyInventoryInfoEOList) { - if(CollectionUtils.isEmpty(projectLawsInventoryEOList)){ - break; - } +// if(CollectionUtils.isEmpty(projectLawsInventoryEOList)){ +// break; +// } // 根据选择调取的数据法规编号，跟当前项目中 法规清单数据法规编号对比，如果有，则加入，如果没有，则不加入。 - List lawsInventoryEOListTemp = projectLawsInventoryEOList.stream().filter(lawsInventoryEO -> { - boolean flag = false; - String adiSn = authDummyInventoryInfoEO.getSerialNumber(); - BussDocumentLibraryEO bl = iBussDocumentLibraryEOService.getBySerialNumber(adiSn); - if(ObjectUtils.isNotEmpty(bl)){ - if (StringUtils.equals(bl.getId(), lawsInventoryEO.getStandId())) { - flag = true; - } - } +// List lawsInventoryEOListTemp = projectLawsInventoryEOList.stream().filter(lawsInventoryEO -> { +// boolean flag = false; +// String adiSn = authDummyInventoryInfoEO.getSerialNumber(); +// BussDocumentLibraryEO bl = iBussDocumentLibraryEOService.getBySerialNumber(adiSn); +// if(ObjectUtils.isNotEmpty(bl)){ +// if (StringUtils.equals(bl.getId(), lawsInventoryEO.getStandId())) { +// flag = true; +// } +// } +// +// return flag; +// }).collect(Collectors.toList()); - return flag; - }).collect(Collectors.toList()); - - if(CollectionUtils.isNotEmpty(lawsInventoryEOListTemp)){ +// if(CollectionUtils.isNotEmpty(lawsInventoryEOListTemp)){ ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = new ProjectCertificationInventoryEO(); BeanUtils.copyProperties(authDummyInventoryInfoEO,projectCertificationInventoryEOTemp); @@ -4549,20 +4549,20 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList, cut, result, projectLibraryId); @@ -5457,22 +5457,22 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl lwrapper = new LambdaQueryWrapper<>(); - lwrapper.in(ProjectLawsInventoryEO::getSerialNumber,serialNumberList); - List projectLawsInventoryEOList = projectLawsInventoryEOService.list(lwrapper); - List LawSerialNumberListTemp = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.toList()); - if(serialNumberList.size() != LawSerialNumberListTemp.size()){ - //存在法规清单中没有的数据 - List collect = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList()); - List serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList()); - if(serialNumbers.size() > 0){ - if(CutEnum.CN.getValue().equals(datas.get(0).getCut())){ - throw new JeroBootException(StringUtils.join(serialNumbers,",")+"法规清单中不存在,不能添加"); - }else{ - throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the project laws and cannot be added"); - } - } - } +// LambdaQueryWrapper lwrapper = new LambdaQueryWrapper<>(); +// lwrapper.in(ProjectLawsInventoryEO::getSerialNumber,serialNumberList); +// List projectLawsInventoryEOList = projectLawsInventoryEOService.list(lwrapper); +// List LawSerialNumberListTemp = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.toList()); +// if(serialNumberList.size() != LawSerialNumberListTemp.size()){ +// //存在法规清单中没有的数据 +// List collect = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList()); +// List serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList()); +// if(serialNumbers.size() > 0){ +// if(CutEnum.CN.getValue().equals(datas.get(0).getCut())){ +// throw new JeroBootException(StringUtils.join(serialNumbers,",")+"法规清单中不存在,不能添加"); +// }else{ +// throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the project laws and cannot be added"); +// } +// } +// } // else{ // for (ProjectCertificationInventoryEO projectCertificationInventoryEO : datas) { // List collect = bussDocumentLibraryEOList.stream()