修改总分计算

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());