From 0c35924ccde0cd3aca3d812c13a2abd8b0b1bd22 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Mon, 26 Aug 2024 17:10:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=A1=88=E4=BB=B6=E5=BE=97=E5=88=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/dto/caseScore/CaseScoreDetailBuilder.java | 2 +- .../com/supervision/police/dto/caseScore/IndexResult.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java b/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java index 975bd53..4eb1f82 100644 --- a/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java +++ b/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java @@ -202,7 +202,7 @@ public class CaseScoreDetailBuilder { .flatMap(indexResult -> indexResult.getAtomicResults().stream()).filter(atomicResult -> { JudgeResultEnum instance = JudgeResultEnum.getInstance(atomicResult.getJudgeResult()); return instance == null || !instance.flagIsTrue(); - }).filter(distinctPredicate(AtomicResult::getAtomicId)).count() + }).filter(result->StrUtil.isNotEmpty(result.getAtomicId())).filter(distinctPredicate(AtomicResult::getAtomicId)).count() ); return caseScoreDetailDTO; } diff --git a/src/main/java/com/supervision/police/dto/caseScore/IndexResult.java b/src/main/java/com/supervision/police/dto/caseScore/IndexResult.java index 2967cfd..ab5f3fd 100644 --- a/src/main/java/com/supervision/police/dto/caseScore/IndexResult.java +++ b/src/main/java/com/supervision/police/dto/caseScore/IndexResult.java @@ -73,8 +73,9 @@ public class IndexResult { } // 注意不要有重复值 Map atomicIndexMap = atomicIndexList.stream().collect(Collectors.toMap(ModelAtomicIndex::getId, k -> k, (k1, k2) -> k1)); - this.atomicResults = atomicResultListFilter.stream().map(atomicResult -> new AtomicResult(indexId, - atomicIndexMap.get(atomicResult.getAtomicId()), atomicResult)).toList(); + this.atomicResults = atomicResultListFilter.stream() + .filter(atomicResult -> null != atomicIndexMap.get(atomicResult.getAtomicId())) + .map(atomicResult -> new AtomicResult(indexId, atomicIndexMap.get(atomicResult.getAtomicId()), atomicResult)).toList(); }