From 77d54b1ae06c2953a4b3c0a388d17f5247f01321 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 16 May 2022 14:32:43 +0800 Subject: [PATCH] =?UTF-8?q?studio=E8=A7=86=E8=A7=92=E4=B8=8B=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConditionAssessmentEOServiceImpl.java | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java index b4ffecf4e..d317339b3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.*; +import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -174,25 +175,28 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl getProjectStatusAssessList(List projectLawsInventoryIdList) { - List result = null; - + List result = new ArrayList<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryIdList); - List projectTaskInventoryConditionAssessmentEOList = this.baseMapper.selectList(queryWrapper); - if(CollectionUtils.isNotEmpty(projectTaskInventoryConditionAssessmentEOList)){ - if(projectTaskInventoryConditionAssessmentEOList.size()>1){ - // 匿名比较器排序 - Collections.sort(projectTaskInventoryConditionAssessmentEOList, new Comparator() { - @Override - public int compare(ConditionAssessmentEO p1, ConditionAssessmentEO p2) { - return p1.getConditionAssessment().compareTo(p2.getConditionAssessment()); - } - }); - } - ConditionAssessmentEO conditionAssessmentEO = projectTaskInventoryConditionAssessmentEOList.get(0); - result.add(conditionAssessmentEO); + for (String projectLawsInventoryId : projectLawsInventoryIdList) { + List collect = projectTaskInventoryConditionAssessmentEOList.stream() + .filter(e -> projectLawsInventoryId.equals(e.getProjectLawsInventoryId())).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(collect)){ + if(collect.size()>1){ + // 匿名比较器排序 + Collections.sort(collect, new Comparator() { + @Override + public int compare(ConditionAssessmentEO p1, ConditionAssessmentEO p2) { + return p1.getConditionAssessment().compareTo(p2.getConditionAssessment()); + } + }); + } + ConditionAssessmentEO conditionAssessmentEO = collect.get(0); + result.add(conditionAssessmentEO); + } } return result; }