From 4dbecfc85c689a2ca2801f2f220a4e11f4fc5201 Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期一, 28 九月 2026 16:50:02 +0800
Subject: [PATCH] fix(汇总表母版): 班线包车 EO36/FN36/FO36 改静态值（防生成时重算覆盖），连带静态化 35 个共享公式孤儿子格；生成验证生成件/母版/定稿三边一致；HANDOFF 记录收尾与剩余 16 条
---
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