diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java index 17a03a4df..cbede0726 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java @@ -2378,10 +2378,10 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { BigDecimal dataTitle13Value = BigDecimal.ZERO; try { // 获取dataTitle9、dataTitle10、dataTitle11的值 - BigDecimal dataTitle9 = new BigDecimal(dto1.getOrDefault("dataTitle9", "0")); - BigDecimal dataTitle10 = new BigDecimal(dto1.getOrDefault("dataTitle10", "0")); - BigDecimal dataTitle11 = new BigDecimal(dto1.getOrDefault("dataTitle11", "0")); - BigDecimal dataTitle8 = new BigDecimal(dto1.getOrDefault("dataTitle8", "1")); + BigDecimal dataTitle9 = new BigDecimal(dto1.getOrDefault("dataTitle12", "0")); + BigDecimal dataTitle10 = new BigDecimal(dto1.getOrDefault("dataTitle13", "0")); + BigDecimal dataTitle11 = new BigDecimal(dto1.getOrDefault("dataTitle14", "0")); + BigDecimal dataTitle8 = new BigDecimal(dto1.getOrDefault("dataTitle11", "1")); // 计算公式:dataTitle9×1 + dataTitle10×0.65 + dataTitle11×0.35 BigDecimal weightedSum = dataTitle9.multiply(BigDecimal.ONE) @@ -2408,6 +2408,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { return dtos; } + public static void main(String[] args) { + BigDecimal dataTitle13Value = new BigDecimal(97.65) + .multiply(new BigDecimal("100")) + .divide(new BigDecimal(1), 2, BigDecimal.ROUND_HALF_UP); + System.out.println(dataTitle13Value); + } protected Map getHJRow(List> dtos,int days){ Map dto2 = new HashMap<>(); dto2.put("dataType","合计");