feature 代码提交

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum13.java

@@ -108,11 +108,10 @@ public class ScoreCalculationServiceNum13 implements ScoreCalculationService {
         } else if (rate.compareTo(BigDecimal.valueOf(60)) <= 0) {
             finalScore = BigDecimal.ZERO.subtract(FOUR_SOURCE);
         } else {
-            finalScore=finalScore.subtract(CALCULATE_Y3(BigDecimal.valueOf(100),BigDecimal.valueOf(3),BigDecimal.valueOf(60),BigDecimal.ZERO,rate));
+            finalScore = finalScore.subtract(CALCULATE_Y3(BigDecimal.valueOf(100), BigDecimal.valueOf(3), BigDecimal.valueOf(60), BigDecimal.ZERO, rate));
         }
         return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
     }
-
     /**
      * 计算审查审定率
      * @param denominator

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum3.java

@@ -17,6 +17,7 @@ import java.util.stream.Collectors;
 
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.THREE_SOURCE;
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.TWO_SOURCE;
+import static com.rongwei.bscommon.sys.utils.JXKHUtils.CALCULATE_Y3;
 
 /**
  * ScoreCalculationServiceNum1 class
@@ -98,7 +99,7 @@ public class ScoreCalculationServiceNum3 implements ScoreCalculationService {
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         } else {
             // 90- 60之前计算线性得分
-            finalScore = finalScore.subtract(approvalRate.subtract(BigDecimal.valueOf(60))).divide(BigDecimal.valueOf(90).subtract(BigDecimal.valueOf(60))).multiply(BigDecimal.valueOf(2)).add(BigDecimal.valueOf(1));
+            finalScore = finalScore.subtract(CALCULATE_Y3(BigDecimal.valueOf(90), BigDecimal.valueOf(3), BigDecimal.valueOf(60), BigDecimal.ZERO, approvalRate));
             if (finalScore.compareTo(BigDecimal.ZERO) <= 0) {
                 finalScore = BigDecimal.ZERO;
                 return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum4.java

@@ -17,6 +17,7 @@ import java.util.stream.Collectors;
 
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.THREE_SOURCE;
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.TWO_SOURCE;
+import static com.rongwei.bscommon.sys.utils.JXKHUtils.CALCULATE_Y3;
 
 /**
  * ScoreCalculationServiceNum1 class
@@ -96,7 +97,7 @@ public class ScoreCalculationServiceNum4 implements ScoreCalculationService {
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         } else {
             // 90- 60之前计算线性得分
-            finalScore = finalScore.subtract(approvalRate.subtract(BigDecimal.valueOf(60))).divide(BigDecimal.valueOf(90).subtract(BigDecimal.valueOf(60))).multiply(BigDecimal.valueOf(2)).add(BigDecimal.valueOf(1));
+            finalScore = finalScore.subtract(CALCULATE_Y3(BigDecimal.valueOf(90), BigDecimal.valueOf(3), BigDecimal.valueOf(60), BigDecimal.ZERO, approvalRate));
             if (finalScore.compareTo(BigDecimal.ZERO) <= 0) {
                 finalScore = BigDecimal.ZERO;
                 return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum5.java

@@ -17,6 +17,7 @@ import java.util.stream.Collectors;
 
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.THREE_SOURCE;
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.TWO_SOURCE;
+import static com.rongwei.bscommon.sys.utils.JXKHUtils.CALCULATE_Y3;
 
 /**
  * ScoreCalculationServiceNum1 class
@@ -95,7 +96,7 @@ public class ScoreCalculationServiceNum5 implements ScoreCalculationService {
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         } else {
             // 90- 60之前计算线性得分
-            finalScore = finalScore.subtract(approvalRate.subtract(BigDecimal.valueOf(60))).divide(BigDecimal.valueOf(90).subtract(BigDecimal.valueOf(60))).multiply(BigDecimal.valueOf(2)).add(BigDecimal.valueOf(1));
+            finalScore = finalScore.subtract(CALCULATE_Y3(BigDecimal.valueOf(90), BigDecimal.valueOf(3), BigDecimal.valueOf(60), BigDecimal.ZERO, approvalRate));
             if (finalScore.compareTo(BigDecimal.ZERO) <= 0) {
                 finalScore = BigDecimal.ZERO;
                 return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum9.java

@@ -15,6 +15,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.FOUR_SOURCE;
+import static com.rongwei.bscommon.sys.utils.JXKHUtils.CALCULATE_Y3;
 
 /**
  * ScoreCalculationServiceNum1 class
@@ -112,7 +113,7 @@ public class ScoreCalculationServiceNum9 implements ScoreCalculationService {
         } else if (rate.compareTo(BigDecimal.valueOf(60)) <= 0) {
             finalScore = finalScore.subtract(FOUR_SOURCE);
         } else {
-            finalScore = finalScore.subtract(BigDecimal.valueOf(0.1).multiply(rate.subtract(BigDecimal.valueOf(60))).setScale(3, BigDecimal.ROUND_HALF_UP));
+            finalScore = finalScore.subtract(CALCULATE_Y3(BigDecimal.valueOf(100), BigDecimal.valueOf(4), BigDecimal.valueOf(60), BigDecimal.ZERO, rate));
         }
         return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
     }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/utils/JXKHUtils.java

@@ -66,7 +66,7 @@ public class JXKHUtils {
             throw new IllegalArgumentException("x1 和 x2 不能相等，因为这将导致除以零的错误。");
         }
         // 使用两点式方程计算y3值
-        return y1.add(y2.subtract(y1)).multiply(x3.subtract(x1)).divide(x2.subtract(x1)).setScale(3, BigDecimal.ROUND_HALF_UP);
+        return y1.add(y2.subtract(y1).multiply(x3.subtract(x1)).divide(x2.subtract(x1))).setScale(3, BigDecimal.ROUND_HALF_UP);
 
     }