From 3a41fcfb3af3d80ba3b60b658d62c38e84a9a7d8 Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期六, 19 九月 2026 12:23:35 +0800
Subject: [PATCH] refactor(货运): 汇总类查询小数位统一为4位(等于全精度) + 适用范围验证
---
docs/工作日结/工作日结_2026-09-19.md | 3 +
docs/生成汇总大表/同名企业_1-8月累计对比_2026-09-19.sql | 44 +++++++++++----------
docs/功能测试报告/功能测试报告_同名企业1-8月累计货运量与周转量SQL_2026-09-19.md | 35 ++++++++++++++++-
3 files changed, 59 insertions(+), 23 deletions(-)
diff --git "a/docs/\345\212\237\350\203\275\346\265\213\350\257\225\346\212\245\345\221\212/\345\212\237\350\203\275\346\265\213\350\257\225\346\212\245\345\221\212_\345\220\214\345\220\215\344\274\201\344\270\2321-8\346\234\210\347\264\257\350\256\241\350\264\247\350\277\220\351\207\217\344\270\216\345\221\250\350\275\254\351\207\217SQL_2026-09-19.md" "b/docs/\345\212\237\350\203\275\346\265\213\350\257\225\346\212\245\345\221\212/\345\212\237\350\203\275\346\265\213\350\257\225\346\212\245\345\221\212_\345\220\214\345\220\215\344\274\201\344\270\2321-8\346\234\210\347\264\257\350\256\241\350\264\247\350\277\220\351\207\217\344\270\216\345\221\250\350\275\254\351\207\217SQL_2026-09-19.md"
index 1d8dbd2..e13ec4e 100644
--- "a/docs/\345\212\237\350\203\275\346\265\213\350\257\225\346\212\245\345\221\212/\345\212\237\350\203\275\346\265\213\350\257\225\346\212\245\345\221\212_\345\220\214\345\220\215\344\274\201\344\270\2321-8\346\234\210\347\264\257\350\256\241\350\264\247\350\277\220\351\207\217\344\270\216\345\221\250\350\275\254\351\207\217SQL_2026-09-19.md"
+++ "b/docs/\345\212\237\350\203\275\346\265\213\350\257\225\346\212\245\345\221\212/\345\212\237\350\203\275\346\265\213\350\257\225\346\212\245\345\221\212_\345\220\214\345\220\215\344\274\201\344\270\2321-8\346\234\210\347\264\257\350\256\241\350\264\247\350\277\220\351\207\217\344\270\216\345\221\250\350\275\254\351\207\217SQL_2026-09-19.md"
@@ -160,9 +160,40 @@
**瀹炶返鍚箟**锛氭煡璇� 7 = 鏌ヨ 2 + 鏀瑰悕浼佷笟锛堜俊鐢ㄤ唬鐮佸彛寰勬槸鍚嶇О鍙e緞鐨勮秴闆嗭級锛屼袱鑰呭叡鍚岄儴鍒嗘暟鍊煎畬鍏ㄧ浉鍚屻��
瑕佽窡 545 瀹朵氦浠樹欢瀵硅处鐢ㄦ煡璇� 2锛涜闃插皢鏉ュ啀鍑虹幇鏀瑰悕浼佷笟锛岀敤鏌ヨ 7 鏇寸ǔ銆�
-## 涔濄�佺粨璁�
+## 涔濄�佽ˉ鍏咃細姹囨�荤被鏌ヨ鍚屾鏀逛负 4 浣嶅皬鏁帮紙2026-09-19 杩藉姞锛�
-8 鏉℃煡璇㈡暣鑴氭湰鎵ц閫氳繃锛�26 鏉$敤渚嬶紙17 姝e悜 / 2 璐熷悜 / 7 杈圭晫锛夊叏閮ㄩ�氳繃銆�
+**鑳屾櫙**锛氱‘璁ゃ��4 浣嶅皬鏁般�嶅鍝簺鍒楃瓑浜庡叏绮惧害鍚庯紝鍐冲畾鎶婃眹鎬荤被鏌ヨ涔熺粺涓�涓� 4 浣嶃��
+
+**鍏堝帢娓�"4 浣� = 鍏ㄧ簿搴�"鐨勯�傜敤鑼冨洿**锛堝疄娴� 754 涓紒涓�/淇$敤浠g爜锛夛細
+
+| 鍒� | `ROUND(v,4) <> v` 鐨勫鏁� | 缁撹 |
+| --- | --- | --- |
+| 璐ц繍閲� 2025 / 2026 | **0 瀹�** | 4 浣嶅嵆鍏ㄧ簿搴︼紙鏁村惃 梅 10000锛屾渶澶� 4 浣嶅皬鏁帮級 |
+| 鍛ㄨ浆閲� 2025 / 2026 | **0 瀹�** | 鍚屼笂 |
+| 骞冲潎杩愯窛 | 628 / 631 瀹� | **涓嶇瓑浜�**鍏ㄧ簿搴︼紝鏄櫎鍑烘潵鐨勫晢锛岄渶鍗曠嫭瀹氫綅鏁� |
+| 鍚屾瘮鐧惧垎姣� | 541 / 754 瀹� | **涓嶇瓑浜�**鍏ㄧ簿搴︼紝鍚屼笂 |
+
+**澶勭疆**锛�
+
+- 鏄庣粏绫伙紙鏌ヨ 2銆�7锛夊凡涓嶅 ROUND = 鍏ㄧ簿搴︼紝鏃犻渶鏀瑰姩锛�
+- 姹囨�荤被锛堟煡璇� 1銆�3銆�5銆�8锛夌殑 14 澶� `/ 10000, 2)` 鍏ㄩ儴鏀逛负 4 浣嶏紱
+- 椤堕儴銆屸槄 灏忔暟浣嶇害瀹氥�嶅悓姝ユ洿鏂颁负"姹囨�荤被鍚屾牱淇濈暀 4 浣�"锛�
+- 椤堕儴涓庢煡璇� 8 娉ㄩ噴閲岀殑瀹炴祴鍊间竴骞舵洿鏂颁负 4 浣嶃��
+
+**鍥炲綊楠岃瘉**锛�
+
+| 缂栧彿 | 绫诲瀷 | 鐢ㄤ緥 | 棰勬湡 | 瀹為檯 | 缁撹 |
+| --- | --- | --- | --- | --- | --- |
+| T27 | 姝e悜 | 鏁磋剼鏈噸璺� | 鏃犳姤閿欍�佽鏁颁笉鍙� | 1352 琛岃緭鍑猴紝鏃� ERROR | 閫氳繃 |
+| T28 | 姝e悜 | 鏌ヨ 1 姹囨�伙紙545 瀹讹級 | 4 浣嶅皬鏁� | 30153.1392 / 27752.6820 / 4635340.4627 / 4389882.0468 | 閫氳繃 |
+| T29 | 姝e悜 | 鏌ヨ 8 鍚堣锛�546 瀹讹級 | 4 浣嶅皬鏁� | 30162.9872 / 27764.8812 / 4637038.5803 / 4392984.8116 | 閫氳繃 |
+| T30 | 姝e悜 | 鏌ヨ 5 鍒嗗競宸炰笌浜や粯浠跺榻� | 涓庝氦浠樹欢甯傚窞姹囨�讳竴鑷� | 姝︽眽 9405.2643 / 1501661.4035銆佸疁鏄� 5247.5232 / 449997.1831锛屼笌浜や粯浠跺畬鍏ㄤ竴鑷� | 閫氳繃 |
+
+**鍓綔鐢ㄤ负闆�**锛氬璐ц繍閲�/鍛ㄨ浆閲忚�岃█ 4 浣嶅氨鏄叏绮惧害锛屽洜姝よ繖娆℃敼鍔ㄦ病鏈変涪澶变换浣曟暟鎹紱
+浣嗚剼鏈緭鍑虹幇鍦ㄤ笌 545 瀹朵氦浠樹欢鐨勫競宸炴眹鎬�**閫愬垪瀵归綈**锛屼袱涓彛寰勪箣闂村彲浠ヤ簰鐩搁獙璇併��
+## 鍗併�佺粨璁�
+
+8 鏉℃煡璇㈡暣鑴氭湰鎵ц閫氳繃锛�30 鏉$敤渚嬶紙21 姝e悜 / 2 璐熷悜 / 7 杈圭晫锛夊叏閮ㄩ�氳繃銆�
**鍚屽悕浼佷笟鍙e緞锛�545 瀹讹級1-8 鏈堢疮璁$粨鏋滐細**
diff --git "a/docs/\345\267\245\344\275\234\346\227\245\347\273\223/\345\267\245\344\275\234\346\227\245\347\273\223_2026-09-19.md" "b/docs/\345\267\245\344\275\234\346\227\245\347\273\223/\345\267\245\344\275\234\346\227\245\347\273\223_2026-09-19.md"
index 9b45777..bf700b3 100644
--- "a/docs/\345\267\245\344\275\234\346\227\245\347\273\223/\345\267\245\344\275\234\346\227\245\347\273\223_2026-09-19.md"
+++ "b/docs/\345\267\245\344\275\234\346\227\245\347\273\223/\345\267\245\344\275\234\346\227\245\347\273\223_2026-09-19.md"
@@ -79,6 +79,9 @@
- 杩藉姞楠岃瘉锛氭煡璇� 2锛�545 瀹跺悕绉板彛寰勶級涓庢煡璇� 7锛�546 瀹朵唬鐮佸彛寰勶級**鍓旈櫎鏀瑰悕浼佷笟鍚庨�愭瘮鐗瑰畬鍏ㄧ浉绛�**
锛�545 琛屼紒涓氬悕鍗曚竴鑷达紝8 涓暟鍊煎垪 + 鍦板尯浠g爜鏈�澶у樊鍧囦负 0锛夈�傚師鍥犳槸鍖归厤閿竴涓�瀵瑰簲 + 鏁存暟姹傚拰绮剧‘銆�
宸茶涓烘祴璇曟姤鍛� T26锛堢疮璁� 26 鏉$敤渚嬶級銆�
+- 杩藉姞锛氱‘璁ゃ��4 浣嶅皬鏁般�嶇殑閫傜敤鑼冨洿锛堣揣杩愰噺/鍛ㄨ浆閲� 4 浣嶅嵆鍏ㄧ簿搴︼紝754 涓璞� 0 渚嬪锛�
+ 杩愯窛銆佸悓姣斾笉绛変簬鍏ㄧ簿搴︼級锛屾嵁姝ゆ妸姹囨�荤被鏌ヨ锛�1/3/5/8锛夌殑 14 澶勫皬鏁颁綅缁熶竴涓� 4 浣嶃��
+ 鏀瑰悗鑴氭湰杈撳嚭涓� 545 瀹朵氦浠樹欢甯傚窞姹囨�婚�愬垪瀵归綈锛圱27~T30锛岀疮璁� 30 鏉$敤渚嬶級銆�
## 浜屻�佹祴璇曠粨鏋滄憳瑕�
瑙併�婂姛鑳芥祴璇曟姤鍛奯鎸佺画鍦ㄨ浼佷笟545瀹跺垎甯傚窞绱杩愯窛鍚屾瘮_2026-09-19.md銆嬶細11 鏉$敤渚嬶紙7 姝e悜 / 3 杈圭晫 / 1 璐熷悜锛夊叏閮ㄩ�氳繃銆�
diff --git "a/docs/\347\224\237\346\210\220\346\261\207\346\200\273\345\244\247\350\241\250/\345\220\214\345\220\215\344\274\201\344\270\232_1-8\346\234\210\347\264\257\350\256\241\345\257\271\346\257\224_2026-09-19.sql" "b/docs/\347\224\237\346\210\220\346\261\207\346\200\273\345\244\247\350\241\250/\345\220\214\345\220\215\344\274\201\344\270\232_1-8\346\234\210\347\264\257\350\256\241\345\257\271\346\257\224_2026-09-19.sql"
index 777d8a7..be8d051 100644
--- "a/docs/\347\224\237\346\210\220\346\261\207\346\200\273\345\244\247\350\241\250/\345\220\214\345\220\215\344\274\201\344\270\232_1-8\346\234\210\347\264\257\350\256\241\345\257\271\346\257\224_2026-09-19.sql"
+++ "b/docs/\347\224\237\346\210\220\346\261\207\346\200\273\345\244\247\350\241\250/\345\220\214\345\220\215\344\274\201\344\270\232_1-8\346\234\210\347\264\257\350\256\241\345\257\271\346\257\224_2026-09-19.sql"
@@ -16,10 +16,11 @@
-- 2025 骞� 1-8 鏈堟湁 664 瀹朵紒涓氥��2026 骞� 1-8 鏈堝彧鏈� 636 瀹讹紝
-- 鐩存帴鎷夸袱骞存�绘暟鐩稿噺锛屽樊棰濋噷娣风潃銆屼紒涓氭暟閲忓彉浜嗐�嶇殑褰卞搷锛屼笉鏄湡瀹炲鍑忋��
-- 鎶婁袱骞撮兘鎶ラ�佽繃鐨勪紒涓氬悕绉板彇浜ら泦锛堝疄娴� 545 瀹讹級锛屼袱骞寸殑浼佷笟鑼冨洿鎵嶄竴鑷淬��
--- 瀹炴祴缁撴灉锛堝悓鍚嶄紒涓氬彛寰� 545 瀹讹級锛�
--- 2025 骞� 1-8 鏈堬細璐ц繍閲� 30153.14 涓囧惃锛屽懆杞噺 4635340.46 涓囧惃鍏噷
--- 2026 骞� 1-8 鏈堬細璐ц繍閲� 27752.68 涓囧惃锛屽懆杞噺 4389882.05 涓囧惃鍏噷
--- 鍚屾瘮锛氳揣杩愰噺 -7.96%锛屽懆杞噺 -5.30%
+-- 瀹炴祴缁撴灉锛堝悓鍚嶄紒涓氬彛寰� 545 瀹讹紝4 浣嶅皬鏁帮級锛�
+-- 2025 骞� 1-8 鏈堬細璐ц繍閲� 30153.1392 涓囧惃锛屽懆杞噺 4635340.4627 涓囧惃鍏噷
+-- 2026 骞� 1-8 鏈堬細璐ц繍閲� 27752.6820 涓囧惃锛屽懆杞噺 4389882.0468 涓囧惃鍏噷
+-- 鍚屾瘮锛氳揣杩愰噺 -7.9609%锛屽懆杞噺 -5.2954%
+-- 锛�2026 骞磋繖涓や釜鏁颁笌銆婃寔缁湪瑙勪紒涓�545瀹禵鍒嗗競宸�1-8鏈堢疮璁¤繍璺濆強鍚屾瘮銆嬩氦浠樹欢鐨勫叏鐪佽瀹屽叏涓�鑷达級
-- ============================================================
@@ -38,7 +39,8 @@
-- 路 鏄庣粏绫绘煡璇紙鏌ヨ 2銆佹煡璇� 7锛夆啋 瀹屽叏涓嶅 ROUND锛屽鍑哄嵆鍘熷鍊�
-- 锛堣揣杩愰噺/鍛ㄨ浆閲忕殑鍘熷鍊兼渶澶� 4 浣嶅皬鏁帮紝灏辨槸鍏ㄧ簿搴︼紱鍚屾瘮鍒楀皬鏁颁綅杈冮暱锛�
-- 瀚岄暱鍙嚜琛屽湪澶栭潰濂� ROUND(...,2)锛夛紱
--- 路 姹囨�诲睍绀虹被锛堟煡璇� 1銆�3銆�5銆�8锛夆啋 淇濈暀 2 浣嶅皬鏁帮紙缁欎汉鐪嬬殑锛屽鐢ㄤ笖濂界湅锛夛紱
+-- 路 姹囨�荤被锛堟煡璇� 1銆�3銆�5銆�8锛夆啋 鍚屾牱淇濈暀 4 浣嶅皬鏁帮紙瀵规湰琛ㄦ暟鎹潵璇� 4 浣嶅氨鏄叏绮惧害锛�
+-- 淇濈暀 2 浣嶆病鏈変换浣曞ソ澶勶紝鍙嶈�屼細璁╀汉璇互涓烘暟鎹氨鍙湁 2 浣嶇簿搴︼級锛�
-- 路 濡傛灉浣犺鑷繁绠楄繍璺�/鍚屾瘮锛屽缓璁洿鎺ョ敤鏌ヨ 7锛屾垨鎶� /10000 閭d竴灞傚幓鎺夛紝
-- 鍏堝湪 Excel 閲屾寜銆屽惃銆嶇畻瀹屽啀闄ゃ��
-- ============================================================
@@ -48,16 +50,16 @@
-- =====================================================================
SELECT COUNT(DISTINCT e.enterprise_name) AS 浼佷笟鏁�,
ROUND(SUM(CASE WHEN e.report_period <= '2025-08'
- THEN e.freight_total ELSE 0 END) / 10000, 2) AS 璐ц繍閲�2025_涓囧惃,
+ THEN e.freight_total ELSE 0 END) / 10000, 4) AS 璐ц繍閲�2025_涓囧惃,
ROUND(SUM(CASE WHEN e.report_period >= '2026-01'
- THEN e.freight_total ELSE 0 END) / 10000, 2) AS 璐ц繍閲�2026_涓囧惃,
+ THEN e.freight_total ELSE 0 END) / 10000, 4) AS 璐ц繍閲�2026_涓囧惃,
ROUND((SUM(CASE WHEN e.report_period >= '2026-01' THEN e.freight_total ELSE 0 END)
/ NULLIF(SUM(CASE WHEN e.report_period <= '2025-08' THEN e.freight_total ELSE 0 END), 0) - 1) * 100, 2)
AS 璐ц繍閲忓悓姣擾鐧惧垎姣�,
ROUND(SUM(CASE WHEN e.report_period <= '2025-08'
- THEN e.turnover_total ELSE 0 END) / 10000, 2) AS 鍛ㄨ浆閲�2025_涓囧惃鍏噷,
+ THEN e.turnover_total ELSE 0 END) / 10000, 4) AS 鍛ㄨ浆閲�2025_涓囧惃鍏噷,
ROUND(SUM(CASE WHEN e.report_period >= '2026-01'
- THEN e.turnover_total ELSE 0 END) / 10000, 2) AS 鍛ㄨ浆閲�2026_涓囧惃鍏噷,
+ THEN e.turnover_total ELSE 0 END) / 10000, 4) AS 鍛ㄨ浆閲�2026_涓囧惃鍏噷,
ROUND((SUM(CASE WHEN e.report_period >= '2026-01' THEN e.turnover_total ELSE 0 END)
/ NULLIF(SUM(CASE WHEN e.report_period <= '2025-08' THEN e.turnover_total ELSE 0 END), 0) - 1) * 100, 2)
AS 鍛ㄨ浆閲忓悓姣擾鐧惧垎姣�
@@ -109,8 +111,8 @@
-- =====================================================================
SELECT t.scope_type AS 鍙e緞,
COUNT(DISTINCT t.enterprise_name) AS 浼佷笟鏁�,
- ROUND(SUM(t.freight_total) / 10000, 2) AS 璐ц繍閲廮涓囧惃,
- ROUND(SUM(t.turnover_total) / 10000, 2) AS 鍛ㄨ浆閲廮涓囧惃鍏噷
+ ROUND(SUM(t.freight_total) / 10000, 4) AS 璐ц繍閲廮涓囧惃,
+ ROUND(SUM(t.turnover_total) / 10000, 4) AS 鍛ㄨ浆閲廮涓囧惃鍏噷
FROM (
SELECT 'ALL_2025' AS scope_type, enterprise_name, freight_total, turnover_total
FROM h2032_enterprise_monthly WHERE report_period BETWEEN '2025-01' AND '2025-08'
@@ -180,10 +182,10 @@
WHEN region_code LIKE '429005%' THEN '娼滄睙' WHEN region_code LIKE '429006%' THEN '澶╅棬'
WHEN region_code LIKE '429021%' THEN '鏋楀尯' ELSE '鍏朵粬' END AS 甯傚窞,
COUNT(DISTINCT d.enterprise_name) AS 鍚屽悕浼佷笟鏁�,
- ROUND(SUM(d.freight_2025) / 10000, 2) AS 璐ц繍閲�2025_涓囧惃,
- ROUND(SUM(d.freight_2026) / 10000, 2) AS 璐ц繍閲�2026_涓囧惃,
- ROUND(SUM(d.turnover_2025) / 10000, 2) AS 鍛ㄨ浆閲�2025_涓囧惃鍏噷,
- ROUND(SUM(d.turnover_2026) / 10000, 2) AS 鍛ㄨ浆閲�2026_涓囧惃鍏噷
+ ROUND(SUM(d.freight_2025) / 10000, 4) AS 璐ц繍閲�2025_涓囧惃,
+ ROUND(SUM(d.freight_2026) / 10000, 4) AS 璐ц繍閲�2026_涓囧惃,
+ ROUND(SUM(d.turnover_2025) / 10000, 4) AS 鍛ㄨ浆閲�2025_涓囧惃鍏噷,
+ ROUND(SUM(d.turnover_2026) / 10000, 4) AS 鍛ㄨ浆閲�2026_涓囧惃鍏噷
FROM (
SELECT e.enterprise_name,
MAX(CASE WHEN e.report_period >= '2026-01' THEN e.region_code END) AS region_code,
@@ -276,14 +278,14 @@
-- =====================================================================
-- 鏌ヨ 8锛氭煡璇� 7 鐨勫悎璁¤锛堝鍑烘槑缁嗗悗鐢ㄦ潵瀵规�绘暟锛�546 瀹跺彛寰勶級
--- 2025 骞� 1-8 鏈堬細璐ц繍閲� 30162.99 涓囧惃銆佸懆杞噺 4637038.58 涓囧惃鍏噷
--- 2026 骞� 1-8 鏈堬細璐ц繍閲� 27764.88 涓囧惃銆佸懆杞噺 4392984.81 涓囧惃鍏噷
+-- 2025 骞� 1-8 鏈堬細璐ц繍閲� 30162.9872 涓囧惃銆佸懆杞噺 4637038.5803 涓囧惃鍏噷
+-- 2026 骞� 1-8 鏈堬細璐ц繍閲� 27764.8812 涓囧惃銆佸懆杞噺 4392984.8116 涓囧惃鍏噷
-- =====================================================================
SELECT COUNT(DISTINCT e.unified_credit_code) AS 浼佷笟鏁�,
- ROUND(SUM(CASE WHEN e.report_period <= '2025-08' THEN e.freight_total ELSE 0 END) / 10000, 2) AS 璐ц繍閲�2025_涓囧惃,
- ROUND(SUM(CASE WHEN e.report_period >= '2026-01' THEN e.freight_total ELSE 0 END) / 10000, 2) AS 璐ц繍閲�2026_涓囧惃,
- ROUND(SUM(CASE WHEN e.report_period <= '2025-08' THEN e.turnover_total ELSE 0 END) / 10000, 2) AS 鍛ㄨ浆閲�2025_涓囧惃鍏噷,
- ROUND(SUM(CASE WHEN e.report_period >= '2026-01' THEN e.turnover_total ELSE 0 END) / 10000, 2) AS 鍛ㄨ浆閲�2026_涓囧惃鍏噷
+ ROUND(SUM(CASE WHEN e.report_period <= '2025-08' THEN e.freight_total ELSE 0 END) / 10000, 4) AS 璐ц繍閲�2025_涓囧惃,
+ ROUND(SUM(CASE WHEN e.report_period >= '2026-01' THEN e.freight_total ELSE 0 END) / 10000, 4) AS 璐ц繍閲�2026_涓囧惃,
+ ROUND(SUM(CASE WHEN e.report_period <= '2025-08' THEN e.turnover_total ELSE 0 END) / 10000, 4) AS 鍛ㄨ浆閲�2025_涓囧惃鍏噷,
+ ROUND(SUM(CASE WHEN e.report_period >= '2026-01' THEN e.turnover_total ELSE 0 END) / 10000, 4) AS 鍛ㄨ浆閲�2026_涓囧惃鍏噷
FROM h2032_enterprise_monthly e
JOIN (SELECT DISTINCT unified_credit_code c FROM h2032_enterprise_monthly
WHERE report_period BETWEEN '2025-01' AND '2025-08') a ON a.c = e.unified_credit_code
--
Gitblit v1.9.1