From 1a027c46e493a1e567a0180cb459f6384a7bad95 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Tue, 30 Jul 2024 17:20: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 --- .../dto/caseScore/CaseScoreDetailBuilder.java | 1 + .../dto/caseScore/CaseScoreDetailDTO.java | 3 +++ src/main/resources/template/case_detail.docx | Bin 12122 -> 12094 bytes 3 files changed, 4 insertions(+) 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 1a55ed7..5b1f914 100644 --- a/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java +++ b/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java @@ -158,6 +158,7 @@ public class CaseScoreDetailBuilder { caseScoreDetailDTO.setCommonScore(this.getCommonScore()); Integer crimeScore = this.getCrimeScore(); Integer crimeOutScore = this.getCrimeOutScore(); + caseScoreDetailDTO.setSpecificCrime(crimeScore < crimeOutScore ? "出罪证据指标" : "入罪证据指标"); caseScoreDetailDTO.setSpecificCrimeScore(crimeScore < crimeOutScore? crimeOutScore:crimeScore); int sumScore = caseScoreDetailDTO.getCommonScore() + caseScoreDetailDTO.getSpecificCrimeScore(); diff --git a/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailDTO.java b/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailDTO.java index c767e47..f52382a 100644 --- a/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailDTO.java +++ b/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailDTO.java @@ -24,6 +24,9 @@ public class CaseScoreDetailDTO { @Schema(description = "共性指标分数") private Integer commonScore; + @Schema(description = "特定指标名 入罪指标/出罪指标") + private String specificCrime; + @Schema(description = "入罪/出罪指标分数") private Integer specificCrimeScore; diff --git a/src/main/resources/template/case_detail.docx b/src/main/resources/template/case_detail.docx index dd259a6aed26f96f8d012ddc48b76735a9ef7f81..f407a33d6913b9f83528a27291c075af459b929d 100644 GIT binary patch delta 4360 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 O9Gp*(8_SsYANoI1{~VzJ delta 4411 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