From f09f0f4b1c94e299bb57d480a743e78f2c1184d0 Mon Sep 17 00:00:00 2001 From: lishuai Date: Thu, 6 Mar 2025 16:35:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E6=94=B6=E7=9B=8A=202025=E5=B9=B43?= =?UTF-8?q?=E6=9C=886=E6=97=A516:35:39?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/thing/qingyuan/screen/StationSummary.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); }