From 16d80d927ec4eabaab1cc19571ed0d1ae9c39aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 8 Oct 2024 18:29:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=97=AE=E9=A2=98=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DocumentSplitServiceImpl.java | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index bca59fe4..bc9032ec 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -1706,11 +1706,31 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { @Override public String checkStandardSplitInfo(List list) { if(CollectionUtils.isEmpty(list)){ - + return null; } - StringBuilder mgs = new StringBuilder(); - for (LawsSplitByStandardNumber lawsSplitByStandardNumber : list) { + StringBuilder msg = new StringBuilder(); + List listStandardIds = list.stream().map(LawsSplitByStandardNumber::getStandardId).collect(Collectors.toList()); + List listLawsDomesticStandard = lawsDomesticStandardService.listByIds(listStandardIds.stream().distinct().collect(Collectors.toList())); + List listIds = list.stream().map(LawsSplitByStandardNumber::getId).collect(Collectors.toList()); + List listLawsDocumentSplit = documentSplitMapper.selectBatchIds(listIds); + for (LawsSplitByStandardNumber obj : list) { + if(!CollectionUtils.isEmpty(listLawsDomesticStandard)){ + long l = listLawsDomesticStandard.stream().filter(o->Objects.equals(o.getId(),obj.getStandardId())).count(); + if(l == 0){ + msg.append(obj.getName()).append(","); + continue; + } + } + if(!CollectionUtils.isEmpty(listLawsDocumentSplit)){ + long l = listLawsDocumentSplit.stream().filter(o->Objects.equals(o.getId(),obj.getId())).count(); + if(l == 0){ + msg.append(obj.getName()).append(","); + } + } + } + if(!StringUtils.isEmpty(msg.toString())){ + return msg.toString().substring(0,msg.toString().length() - 1); } return null; }