From 763b8a0a163f59b05650e362e1bf8d98fbf9a51c Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Thu, 1 Aug 2024 11:50:22 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/supervision/constant/ScoreEnum.java | 4 ++-- .../police/dto/caseScore/CaseScoreDetailBuilder.java | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/supervision/constant/ScoreEnum.java b/src/main/java/com/supervision/constant/ScoreEnum.java index eb50424..d0a91f8 100644 --- a/src/main/java/com/supervision/constant/ScoreEnum.java +++ b/src/main/java/com/supervision/constant/ScoreEnum.java @@ -5,8 +5,8 @@ import lombok.Getter; import java.util.Objects; @Getter public enum ScoreEnum { - EVIDENCE_NOT_FULL("1","证据不足", "司法籍贯会作出绝对不起诉或存疑不起诉的决定"), - EVIDENCE_LACK("2","事实不清", "司法籍贯认定意见不一致的概率比较大"), + EVIDENCE_NOT_FULL("1","证据不足", "司法机关会作出绝对不起诉或存疑不起诉的决定"), + EVIDENCE_LACK("2","事实不清", "司法机关认定意见不一致的概率比较大"), EVIDENCE_FULL("3","证据充分", "司法机关对案件形成一致认定意见的概率比较大"); private final String code; 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 2224787..6ca6cea 100644 --- a/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java +++ b/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java @@ -199,7 +199,7 @@ public class CaseScoreDetailBuilder { this.indexResultList.stream().filter(indexResult -> indexResult.getActualScore() == 0) .flatMap(indexResult -> indexResult.getAtomicResults().stream()).filter(atomicResult -> { JudgeResultEnum instance = JudgeResultEnum.getInstance(atomicResult.getJudgeResult()); - return instance != null && instance.flagIsTrue(); + return instance == null || !instance.flagIsTrue(); }).count() ); return caseScoreDetailDTO; @@ -277,14 +277,16 @@ public class CaseScoreDetailBuilder { // 3 设置指标结果信息 // 3.1 获取指标信息 - List modelIndices = modelIndexMapper.selectList(new LambdaQueryWrapper().eq(ModelIndex::getCaseType, modelCase.getCaseType())); + List modelIndices = modelIndexMapper.selectList(new LambdaQueryWrapper().eq(ModelIndex::getCaseType, modelCase.getCaseType()).eq(ModelIndex::getDataStatus, "1")); // 3.2 获取指标结果信息 后面需要根据行人人id进行过滤 List modelIndexResults = modelIndexResultMapper.selectList( new LambdaQueryWrapper().eq(ModelIndexResult::getCaseId, caseId)); // 3.3 获取原子指标信息 - List modelAtomicIndices = modelAtomicIndexMapper.selectList(new LambdaQueryWrapper().eq(ModelAtomicIndex::getCaseType, modelCase.getCaseType())); + List modelAtomicIndices = modelAtomicIndexMapper.selectList( + new LambdaQueryWrapper().eq(ModelAtomicIndex::getCaseType, modelCase.getCaseType()) + .eq(ModelAtomicIndex::getDataStatus, "1")); // 3.4 获取原子指标结果 List modelAtomicResults = modelAtomicResultMapper.selectList(