From 3bccdf9c8bca4cc868d3976e247a162746716bf0 Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期一, 28 九月 2026 15:07:31 +0800
Subject: [PATCH] fix(货运页): 当月无规上记录不再写 0(缺数留空);回补母版《班线包车》WPS 保存丢失的 2019/2020 块 420 格,并清 2021/2022 历史 0 值 78 格
---
HANDOFF.md | 11 +++++++++++
traffic-audit-server/src/main/java/com/trafficaudit/reportexport/calc/FreightCalc.java | 9 +++++----
docs/生成汇总大表/2026年8月道路运输量汇总表.xlsx | 0
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/HANDOFF.md b/HANDOFF.md
index 2da0b05..8f771a2 100644
--- a/HANDOFF.md
+++ b/HANDOFF.md
@@ -4,6 +4,17 @@
> **姣忓ぉ缁撴潫鏃�**锛氭妸褰撳ぉ杩涘睍銆佽俯杩囩殑鍧戙�佹柊闇�姹傘�佹湭瀹屾垚浜嬮」鏇存柊鍒版湰鏂囦欢锛岀劧鍚庡彲浠ユ斁蹇冨紑鏂板璇濄��
> **鍗忎綔绾﹀畾锛�2026-08-31锛�**锛氳銆屾彁浜ゃ��= 鏈湴 commit + 鎺ㄩ�佸埌杩滅 git锛坥rigin main锛孏itblit锛夛紝涓嶅啀鍙仛鏈湴 commit銆�
+## 鏈�鏂帮紙2026-09-28锛�
+
+- **鐢ㄦ埛鐢� WPS 缂栬緫姣嶇増**锛氭敼銆婄彮绾垮寘杞︺�嬭竟妗嗐�併�婇亾璺繍杈撳懆杞噺銆嬪瓧鍙凤紝骞跺垹闄ゃ�婁腑鍙e緞鏄庣粏銆媊AW` 鍒楋紙鎵嬪伐瀹氱鍚屽垹锛夈�傚凡楠岃瘉鐢熸垚绔甯革細涓彛寰勬槑缁� 2024 鍙婃洿鏃╁潡鏁翠綋宸︾Щ锛堣法椤�/鍚岄〉鍏紡鑷姩鏀瑰紩鐢紝`#REF!` 2鈫�0锛夈�佷腑鍙e緞鎺掑悕鍧� J..R 鈫� A..I 鍧囨纭甫鍏ヤ骇鐗┿��
+- **鈿狅笍 WPS 淇濆瓨鐨勮繛甯︽崯鍧忥紙寰呭洖琛ワ級**锛氥�婄彮绾垮寘杞︺��2019/2020 鍧楃害 **590 鏍�**鍐呭涓㈠け锛坄FN/FO/FM`銆乣FP:FT`銆乣GE` 鍙樼┖锛沗EO/EQ/ES/EU/EW/EY/DT/DW...EM` 鍏� **144 鏍�**鍙� `#DIV/0!`锛夈�傜敓鎴愪欢宸插甫鍑猴紙璇ラ〉 `#DIV/0!` 228鈫�372锛夈��**寰呯敤鎴风‘璁ゅ悗鎸夊浠�/瀹氱鍥炶ˉ锛堝彧琛ュ�间笌鍏紡锛屼繚鐣欏叾杈规涓庡瓧鍙凤級銆�**
+- **鍙e緞钀藉湴銆岀己鏁扮暀绌恒��**锛氭瘝鐗堛�� 璐ц繍銆嬭 90/93锛堜粰妗� 瑙勪笂涓よ锛夈��108/111锛堟灄鍖猴級鍦� 2021銆�2022 骞村潡鐨� 78 涓� `0` 鍊煎凡娓呯┖锛堜笌鎵嬪伐瀹氱鎸夎〃澶村榻愰�愭牸鏍稿锛氭瘝鐗�=0 涓斿畾绋�=绌� 78 鏍笺�佸啿绐� 0 鏍硷級锛涗唬鐮� `FreightCalc.buildMetrics` 褰撴湀鍒嗘敮鏀逛负銆岃鏈堟棤瑙勪笂璁板綍 鈫� 鐣欑┖銆嶏紝涓嶅啀鍐� 0锛堢疮璁″垎鏀笉鍙橈級銆�
+- **绾犳涓�鏉¢敊鍒�**锛氭鍓嶃�岀▼搴忓皯涓�鍒� 11 鏈堢幆姣斻�嶄笉鎴愮珛鈥斺�旂敓鎴愪欢涓庢墜宸ュ畾绋跨殑鐜瘮鏈熼棿闆嗗悎瀹屽叏涓�鑷达紙12鏈堚��1鏈� 鍏� 12 鍒楋級锛涘樊寮傛牴鍥犳槸鎵嬪伐瀹氱銆� 璐ц繍銆嬪湪 2025 骞村潡澶氫竴鍒�**鏃犺〃澶磋緟鍔╁垪**锛坄U`锛�74 鏍硷級锛岃嚜璇ュ垪璧锋墜宸ユ暣浣撳彸绉� 1 鍒椼��**姣斿蹇呴』鎸夎〃澶存湡闂村榻愶紝涓嶈兘鎸夊垪浣嶇疆姣斻��**
+- **楠岃瘉**锛氱敓鎴愪袱娆★紙绾� 15 绉�/娆★級锛岀浜屾鐩稿绗竴娆�**浠� 78 鏍� 0鈫掔┖**锛岄敊璇�兼暟閲忎笉鍙橈紱`鍏氦!S5=98460.97` 绛夌紦瀛樺�兼娊鏌ヤ繚鐣欍��
+- **杩愯鐘舵��**锛氬悗绔凡鎸� `start-dev.ps1` 閲嶅惎锛堟柊 PID锛�8090/8080 鍦ㄨ窇锛夛紱鏈満搴撲粛涓� `localhost:3308/traffic_audit`銆�
+- **鉁� 鐝嚎鍖呰溅鍥炶ˉ瀹屾垚锛�09-28 涓嬪崍锛�**锛氱敤鎴风‘璁ゅ悗鎸� 09-27 姣嶇増澶囦唤锛坄_bak_202608姣嶇増鏂囨湰鏁板瓧杞暟鍊煎墠_20260927.xlsx`锛塜ML 绮惧噯鍥炶ˉ銆婄彮绾垮寘杞︺��2019/2020 鍧� 鈥斺�� **璇ラ〉涓� 09-27 姣嶇増閫愭牸涓�鑷达紙0 宸紓锛�**锛岄敊璇�煎洖鍒� `#REF!` 8 / `#DIV/0!` 228锛涙瘝鐗堝叾瀹冮〉鏈彈褰卞搷銆傞獙鏀剁敓鎴愶細涓� 09-27 鐢熸垚浠� (6) 姣斿閿欒鍊奸�愰〉涓�鑷达紝宸紓浠呭墿鏃㈠畾鏀瑰姩锛坄 璐ц繍` 78 鏍兼竻 0銆佷腑鍙e緞鏄庣粏 4915 鏍煎垹鍒椾綅绉汇�佷腑鍙e緞鎺掑悕 672 鏍煎潡浣嶇Щ銆佺彮绾垮寘杞� 82 鏍兼诞鐐瑰熬宸�/0-绌猴級銆�
+- **寰呭姙**锛氣憼 鎺掑悕椤电粨鏋勶紙鍧楅『搴忋�佹爣棰樻帾杈炪�佸競宸炲悕鐭悕/鍏ㄥ悕銆佸懆杞噺鎺掑悕澶� 7 琛岋級锛涒憽 鎺掑悕椤电粨鏋勶紙鍧楅『搴忋�佹爣棰樻帾杈炪�佸競宸炲悕鐭悕/鍏ㄥ悕銆佸懆杞噺鎺掑悕澶� 7 琛岋級锛涒憿 缂� 2026-09 姣嶇増銆佸鍑哄墠鍩烘暟浣撴锛圥0-3锛夈��
+
## 鏈�鏂帮紙2026-09-27锛�
- **鎻愪氦瑙勮寖鏀逛负鍚屼簨鏂瑰紡锛堢敤鎴� 09-27 鍐冲畾锛屽凡鍐欏叆 AGENTS.md锛�**锛�
diff --git "a/docs/\347\224\237\346\210\220\346\261\207\346\200\273\345\244\247\350\241\250/2026\345\271\2648\346\234\210\351\201\223\350\267\257\350\277\220\350\276\223\351\207\217\346\261\207\346\200\273\350\241\250.xlsx" "b/docs/\347\224\237\346\210\220\346\261\207\346\200\273\345\244\247\350\241\250/2026\345\271\2648\346\234\210\351\201\223\350\267\257\350\277\220\350\276\223\351\207\217\346\261\207\346\200\273\350\241\250.xlsx"
index 11d6152..76f6837 100644
--- "a/docs/\347\224\237\346\210\220\346\261\207\346\200\273\345\244\247\350\241\250/2026\345\271\2648\346\234\210\351\201\223\350\267\257\350\277\220\350\276\223\351\207\217\346\261\207\346\200\273\350\241\250.xlsx"
+++ "b/docs/\347\224\237\346\210\220\346\261\207\346\200\273\345\244\247\350\241\250/2026\345\271\2648\346\234\210\351\201\223\350\267\257\350\277\220\350\276\223\351\207\217\346\261\207\346\200\273\350\241\250.xlsx"
Binary files differ
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