diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationSummary.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationSummary.java index 5c18533..1ff5d93 100644 --- a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationSummary.java +++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationSummary.java @@ -54,7 +54,8 @@ public class StationSummary { BigDecimal::add))); // 单位换算 BigDecimal yearPower = kv.get("A29yy").multiply(new BigDecimal(2)).divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP); - BigDecimal yearCount = kv.get("A202yy").multiply(new BigDecimal(2)).divide(BigDecimal.valueOf(1000), 4, RoundingMode.HALF_UP); + // BigDecimal yearCount = kv.get("A202yy").multiply(new BigDecimal(2)).divide(BigDecimal.valueOf(1000), 4, RoundingMode.HALF_UP); + BigDecimal yearCount = yearPower.multiply(BigDecimal.valueOf(1.2)).divide(BigDecimal.valueOf(1000), 4, RoundingMode.HALF_UP); return setYearEnergy(yearPower).setYearChargeCount(yearCount); }