From 60c6298e8b226a0b74960a8b8e11cf58d52f7d11 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Sat, 7 May 2022 17:30:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=85=A5--=E9=AA=8C=E8=AF=81=E6=A0=87=E5=87=86=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryInfoEOServiceImpl.java | 94 ++++++++++--------- 1 file changed, 51 insertions(+), 43 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index c8be7b764..085a6e85a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -839,7 +839,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl bussDocumentLibraryEOList = verifySerialNumber(dataList,dummyInventoryInfoEOTemp); + verifySerialNumber(dataList,dummyInventoryInfoEOTemp); for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) { i++; String errorMsg = ""; @@ -1018,52 +1018,60 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl verifySerialNumber(List dataList,DummyInventoryInfoEO dummyInventoryInfoEOTemp) { + private void verifySerialNumber(List dataList,DummyInventoryInfoEO dummyInventoryInfoEOTemp) { //文档库数据 List serialNumberList = dataList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberList); - List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper); - //文档库中可能存在重复的标准号 - List serialNumberListTemp = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList()); - - //虚拟清单数据 - LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); - wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberList).in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryInfoEOTemp.getDummyInventoryBaseId()); - List dummyInventoryInfoEOList = this.list(wrapperTemp); - List serialNumberTempList = dummyInventoryInfoEOList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); - if(serialNumberList.size() != serialNumberListTemp.size()){ - //存在文档库没有的数据 - List collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); - List serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList()); - if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ - throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加"); - }else{ - throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the document library and cannot be added"); + List serialNumberS = new ArrayList<>(); + if(serialNumberList.size() != 0){ + for (String s : serialNumberList) { + if(StringUtils.isNotBlank(s)){ + serialNumberS.add(s); + } } } - if(dummyInventoryInfoEOList.size() > 0){ - if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ - throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加"); - }else{ - throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again"); + if(serialNumberS.size() != 0){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberS); + List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper); + //文档库中可能存在重复的标准号 + List serialNumberListTemp = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList()); + + //虚拟清单数据 + LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); + wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberS).in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryInfoEOTemp.getDummyInventoryBaseId()); + List dummyInventoryInfoEOList = this.list(wrapperTemp); + List serialNumberTempList = dummyInventoryInfoEOList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); + if(serialNumberS.size() != serialNumberListTemp.size()){ + //存在文档库没有的数据 + List collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); + List serialNumbers = serialNumberS.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList()); + if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ + throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加"); + }else{ + throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the document library and cannot be added"); + } + } + if(dummyInventoryInfoEOList.size() > 0){ + if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ + throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加"); + }else{ + throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again"); + } + } + //通过编号将导入的数据与文档库进行关联 + for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) { + List collect = bussDocumentLibraryEOList.stream() + .filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList()); + dummyInventoryInfoEO.setTitle(collect.get(0).getTitle()); + dummyInventoryInfoEO.setState(collect.get(0).getState()); + dummyInventoryInfoEO.setCorrespondingStandard(collect.get(0).getCorrespondingStandard()); + dummyInventoryInfoEO.setTechnologyTerritory(collect.get(0).getTechnologyTerritory()); + dummyInventoryInfoEO.setRegion(collect.get(0).getRegion()); + dummyInventoryInfoEO.setShi4Yong4Fan4Wei2(collect.get(0).getShi4Yong4Fan4Wei2()); + dummyInventoryInfoEO.setImplementTime(collect.get(0).getImplementTime()); + dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1()); } } - //通过编号将导入的数据与文档库进行关联 - for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) { - List collect = bussDocumentLibraryEOList.stream() - .filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList()); - dummyInventoryInfoEO.setTitle(collect.get(0).getTitle()); - dummyInventoryInfoEO.setState(collect.get(0).getState()); - dummyInventoryInfoEO.setCorrespondingStandard(collect.get(0).getCorrespondingStandard()); - dummyInventoryInfoEO.setTechnologyTerritory(collect.get(0).getTechnologyTerritory()); - dummyInventoryInfoEO.setRegion(collect.get(0).getRegion()); - dummyInventoryInfoEO.setShi4Yong4Fan4Wei2(collect.get(0).getShi4Yong4Fan4Wei2()); - dummyInventoryInfoEO.setImplementTime(collect.get(0).getImplementTime()); - dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1()); - } - - return bussDocumentLibraryEOList; } private String template(String zipEntryName, DummyInventoryInfoEO dummyInventoryInfoEO, @@ -1206,9 +1214,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl