From b63a6f6847c88d32c8f380ab5d456bca39185197 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Tue, 10 Dec 2024 17:13:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=80=BB=E5=88=86=E8=AE=A1?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/RiskScoreRuleServiceImpl.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java index ed0bbb7..02dffb3 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java @@ -94,10 +94,15 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService { if(temp == null) { continue; } - Integer ruleScore = temp.stream().mapToInt(RiskModelTaskClue::getScore).sum(); - BigDecimal n2 = new BigDecimal(Double.toString(Math.min(ruleScore.doubleValue(), riskScoreRule.getScore()))); - BigDecimal weight = new BigDecimal(Double.toString(riskScoreRule.getWeight())); - n2 = n2.multiply(weight).divide(new BigDecimal("100"), 2, RoundingMode.UP); + + //二次改造 +// Integer ruleScore = temp.stream().mapToInt(RiskModelTaskClue::getScore).sum(); +// BigDecimal n2 = new BigDecimal(Double.toString(Math.min(ruleScore.doubleValue(), riskScoreRule.getScore()))); +// +// BigDecimal weight = new BigDecimal(Double.toString(riskScoreRule.getWeight())); +// n2 = n2.multiply(weight).divide(new BigDecimal("100"), 2, RoundingMode.UP); + Double ruleScore = temp.stream().mapToDouble(RiskModelTaskClue::getScoreCalc).sum(); + BigDecimal n2 = new BigDecimal(Double.toString(Math.min(ruleScore, riskScoreRule.getScore()))); score=score.add(n2); } // BigDecimal ruleScore = new BigDecimal(Double.toString(rule.getScore())); @@ -105,7 +110,8 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService { // score = score.multiply(weight).divide(ruleScore, 2, RoundingMode.UP); total = total.add(score); } - total = total.multiply(new BigDecimal("20")); + //二次改造 +// total = total.multiply(new BigDecimal("20")); if(person.getRickScore().compareTo(total.doubleValue()) != 0) { update = new RiskPersonal(); update.setId(person.getId());