From 9c00d2823f39154144b5cf59105028427ec32b4e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 19 八月 2024 15:36:41 +0800
Subject: [PATCH] 车辆指标计算测试+修改

---
 ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
index aa66e08..24d8cdc 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -118,9 +118,9 @@
         BigDecimal delayCount2 = new BigDecimal((Integer) param.get("delayCount2"));
         BigDecimal delayCount3 = new BigDecimal((Integer) param.get("delayCount3"));
 
-        BigDecimal result = delayCount1.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(BigDecimal.ONE)
+        BigDecimal result = BigDecimal.ONE.subtract(delayCount1.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(BigDecimal.ONE)
                 .add(delayCount2.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.8")))
-                .add(delayCount3.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.6")));
+                .add(delayCount3.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.6"))));
         return result.setScale(4, RoundingMode.HALF_UP);
     }
 
@@ -131,7 +131,7 @@
         BigDecimal integritySites = new BigDecimal((Integer) param.get("integritySites"));
         BigDecimal importantIntegritySites = new BigDecimal((Integer) param.get("importantIntegritySites"));
         BigDecimal result = integritySites.divide(totalSites, 10, RoundingMode.HALF_UP)
-                .add(importantIntegritySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP));
+                .multiply(importantIntegritySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP));
         return result.setScale(4, RoundingMode.HALF_UP);
     }
 

--
Gitblit v1.8.0