From fbacc121df810f01e5b6ed43e6431dea6df270fd Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 十月 2026 10:04:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
traffic-audit-server/src/main/java/com/trafficaudit/reportexport/calc/FreightCalc.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/calc/FreightCalc.java b/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/calc/FreightCalc.java
index 267ccf6..2af0d58 100644
--- a/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/calc/FreightCalc.java
+++ b/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/calc/FreightCalc.java
@@ -147,14 +147,15 @@
Double aboveFreight = null;
Map<Integer, Double> h2032Buckets = h2032TonByCityMonth.get(city);
if (h2032Buckets != null) {
- double ton;
if (cumulative) {
- ton = 0.0;
+ double ton = 0.0;
for (int m = 1; m <= month; m++) ton += h2032Buckets.getOrDefault(m, 0.0);
+ aboveFreight = ton / 10000.0;
} else {
- ton = h2032Buckets.getOrDefault(month, 0.0);
+ // 褰撴湀鏃犺涓婅褰� -> 鐣欑┖锛堜笉鍐嶅啓 0锛夛紱鏈夎褰曪紙鍚湡瀹� 0 鍊硷級鎵嶅啓鏁�
+ Double ton = h2032Buckets.get(month);
+ aboveFreight = ton == null ? null : ton / 10000.0;
}
- aboveFreight = ton / 10000.0;
}
FreightTurnoverImport ft = ftMap.get(city);
--
Gitblit v1.9.1