From cb8ea4248828ca608031f41bd6003dc6765587e8 Mon Sep 17 00:00:00 2001 From: zhizhijie <zhizhijie@users.noreply.gitee.com> Date: 星期三, 16 九月 2026 14:51:38 +0800 Subject: [PATCH] docs(比对): 汇总大表 vs 8月定稿逐表比对报告；工作日结补记 2024 年重导与比对 --- docs/工作日结/工作日结_2026-09-16.md | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) 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-16.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-16.md" index 368ea97..be3f2e7 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-16.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-16.md" @@ -43,3 +43,159 @@ 2. 鎻愪氦 `0d2a5fc`锛歚fix(cors): 鏀捐鍐呯綉缃戞鏉ユ簮锛屼慨澶嶅眬鍩熺綉 IP 璁块棶鏃剁櫥褰� 403`锛� 3. 鎺ㄤ釜浜轰粨搴� `origin`锛歚git push origin main:master` 鎴愬姛锛坄82100d6..0d2a5fc`锛夛紱 4. 鎺ㄥ叕鍙� `gitea`锛歚git fetch gitea`銆乣git push gitea main:main` 鍧囧洜 HTTP 鏃犲搷搴旇�屾寕璧凤紝鏈帹閫佹垚鍔燂紙璇﹁閬楃暀闂 5锛夛紱鏈涓哄揩杩涙帹閫侊紝涓嶆秹鍙婂己鎺ㄣ�� + +--- + +## 鍏�佷笅鍗堣拷鍔狅紙涓ゆ潯鐢ㄦ埛闇�姹傦紝2026-09-16锛� + +### 1. 鎶� 8 鏈堝鍏ョ殑銆岃揣杩愰噺鍛ㄨ浆閲忚〃銆嶄腑鐨� 21鈥�26 骞存暟鎹叏閮ㄨ鍏ユ暟鎹簱 +- **鑳屾櫙**锛氱敤鎴� 8 鏈堝鍏ョ殑 `瀹氱-婀栧寳鐪佸悇甯傚窞杩愯緭閲忔暟鎹紙2026骞�1-8鏈堬級.xlsx` 涓�涓伐浣滅翱鍐呭惈 5 涓勾搴� Sheet锛坄2026骞� / 2025骞� / 2024骞� / 2022骞� / 2021骞碻锛屾簮鏂囦欢鏃� 2023 骞达級锛岃�岃�侀�昏緫鍙绗� 1 涓� Sheet 骞舵寜銆屽乏鍗婁粖骞� 1鈥揘 鏈� / 鍙冲崐鍘诲勾 1鈥�12 鏈堛�嶇殑鏈堝害妯℃澘瑙ｆ瀽锛屽叾浣欏勾搴︽暟鎹涓㈠純銆� +- **鏀瑰姩锛堝悗绔� 1 鏂囦欢锛�+153/鈭�19锛�**锛歚DataImportService.java` 涓� `importFreightTurnover` 鏀逛负鍒嗘祦鍏ュ彛锛涘師閫昏緫鎶戒负 `importFreightTurnoverByMonth`锛堥�愯涓嶅彉锛夛紱鏂板 `detectYearSheets`锛堣瘑鍒骞村害宸ヤ綔绨匡級銆乣importFreightTurnoverByYear`锛堟寜骞村叆搴� + 涓婂勾鍚屾湡鍙栬嚜涓婁竴骞村害 Sheet锛夈�乣parseWholeYearSheet`锛堟暣骞� Sheet 鐨勮揣杩愰噺鍧�/鍛ㄨ浆閲忓潡瑙ｆ瀽锛夈�乣persistFreightTurnover`锛堟寜鎶ヨ〃鏈熷厛鍒犲悗鎻掑苟璁版壒娆★級銆� +- **缁撴灉**锛氭簮鏂囦欢 5 涓勾搴﹀叏閮ㄥ叆搴擄紝杩斿洖銆屽叡 90 鏉¤褰曘�嶏紝鎶ヨ〃鏈熶负 `2021-12 / 2022-12 / 2024-12 / 2025-12 / 2026-08`锛屾瘡鏈� 18 琛岋紱涓庢簮鏂囦欢閫愰」姣斿 **1080 涓崟鍏冩牸闆跺樊寮�**锛涢噸澶嶅鍏ュ箓绛夛紙鍏ㄨ〃 216 琛� md5 鍓嶅悗涓�鑷达級锛涢潪澶氬勾搴︽枃浠惰嚜鍔ㄥ洖閫�鍘熸湀搴﹁矾寰勩�� +- 璇﹁銆婂姛鑳芥祴璇曟姤鍛奯璐ц繍閲忓懆杞噺澶氬勾搴﹀鍏2026-09-16.md銆嬨�� + +### 2. 鎶ヨ〃鐢熸垚-姹囨�诲ぇ琛ㄩ瑙堬細鍒犳帀銆屼腑鍙ｅ緞銆嶄箣鍚庣殑琛ㄦ牸 +- **鏀瑰姩锛堝墠绔� 1 鏂囦欢锛屽崟琛岋級**锛歚ReportExport.vue` 绗� 133 琛岀敱 `v-else-if="it.summary && it.summary.length"` 鏀逛负 `v-if="it.key !== 'summaryWorkbook' && it.summary && it.summary.length"`銆傛牴鍥犳槸涓婇潰鐨勬眹鎬昏〃鐢� `v-if`銆佺浜屽紶琛ㄧ敤 `v-else-if`锛屽 `summaryWorkbook` 涔熺収鏍锋覆鏌撱�� +- **楠岃瘉锛堟帹缈讳笂涓�杞殑鏃犳晥鍙栬瘉锛�**锛氭棭鏈熸埅鍥炬病鎷嶅埌寮圭獥銆丄X 鏍戣鍒扮殑鏄紦瀛橈紝鍧囦负鏃犳晥璇佹嵁锛涙湰杞敼鐢� `tab.playwright.evaluate` 鐩存帴璇� DOM 鈥斺�� 寮圭獥鍐呮湁涓斾粎鏈� 1 寮犺〃锛坄preview-summary wb-table`锛�12 琛屾寚鏍囷級锛岃〃鏍间笅鏂瑰彧鏈変袱鏉″悓姣旂己澶辨彁绀轰笌銆屽叧闂�嶆寜閽紝**绗簩寮犺〃宸插交搴曟秷澶�**銆傛湁鏁堟埅鍥撅細`_qa_out/preview_summaryWorkbook_2026-08_verified_20260916.png`锛堟湰杞鏍搁噸鎷� `..._verified2_20260916.png`锛屽潎 54006 瀛楄妭锛夈�� +- 璇﹁銆婂姛鑳芥祴璇曟姤鍛奯姹囨�诲ぇ琛ㄩ瑙堝垹闄や腑鍙ｅ緞鍚庢槑缁嗚〃_2026-09-16.md銆嬨�� + +## 涓冦�佹祴璇曠粨鏋滄憳瑕侊紙涓嬪崍杩藉姞閮ㄥ垎锛� +- 澶氬勾搴﹀鍏ワ細12 鏉＄敤渚嬪叏閫氳繃鈥斺�旀鍚戯紙澶氬勾搴﹀叆搴撱��1080 鍗曞厓鏍奸�愰」鎶芥煡闆跺樊寮傘�佹姤琛ㄦ湡璇箟銆佷笂骞村悓鏈熴�佹壒娆¤褰曪級銆佽礋鍚戯紙鍗� Sheet 鏈堝害妯℃澘鍥為��銆侀潪骞村害鍛藉悕鍙� Sheet 鍥為��銆佹贩鍚堝懡鍚嶅洖閫�銆侀潪 Excel 鏂囦欢鎶ラ敊锛夈�佸箓绛夛紙閲嶅瀵煎叆鍏ㄨ〃 md5 涓�鑷达級銆佸洖褰掞紙娴嬭瘯鏈熸竻鐞嗗共鍑�銆佺湡瀹炴湀浠� 216 琛� / 12 鏈熷彛寰勪笉鍙橈級銆� +- 棰勮寮圭獥锛�7 鏉＄敤渚嬪叏閫氳繃鈥斺�擠OM 瀹炴祴寮圭獥鍐� `table` 鏁伴噺涓� 1銆佺被鍚嶄笌琛屾暟姝ｇ‘銆�12 琛屾暟鍊间笌鍚屾瘮瀹屾暣銆佽〃鏍间笅鏂规棤绗簩寮犺〃銆乣git diff` 浠� 1 琛屾敼鍔ㄤ笉鍥炲綊銆� +- 娴嬭瘯鏈熸竻鐞嗭細`2099-01` ~ `2099-04` 鍏ㄩ儴鐢� `POST /api/import/clear?period=鈥 娓呯┖锛堝悇 dataRows=18銆乥atchRows=1锛夛紝褰撳墠搴� **0 鏉� 2099 娈嬬暀**銆乣freight_turnover_import` 216 琛� / 12 涓姤琛ㄦ湡銆� + +## 鍏�侀仐鐣欓棶棰樹笌寰呭姙锛堟洿鏂帮級 +1. **`2021-12` 绛夋姤琛ㄦ湡鏄�屾暣骞淬�嶈涔�**锛氳繖浜涙湡鎵胯浇璇ュ勾 1鈥�12 鏈堝叏骞存暟鎹紝鑰岄潪 12 鏈堝崟鏈堬紱鍚庣画鎶ヨ〃/瀹℃牳鑻ユ寜鍗曟湀鍙ｅ緞鍙栨暟闇�鐢ㄦ埛纭鍙ｅ緞锛屽繀瑕佹椂鍐嶆敼閫犮�� +2. **婧愭枃浠剁己 2023 骞� Sheet**锛氬鑷翠笉鐢熸垚 `2023-12`锛宍2024-12` 鏃犱笂骞村悓鏈熴�傚睘婧愭暟鎹己鍙ｃ�� +3. **`2026-01` ~ `2026-07` 鐨� `last_*` 涓虹┖**锛氱粡姣斿鏀瑰姩鍓嶅浠斤紙`2026-04` 鐨� INSERT锛夌‘璁よ繖鍑犳湡鏀瑰姩鍓嶅嵆涓虹┖锛屼笖鏈瀵煎叆鏈Е纰拌繖浜涙姤琛ㄦ湡锛堟壒娆″彧瑕嗙洊 5 涓湡锛夛紝**闈炴湰娆℃敼鍔ㄥ紩鍏�**锛涘闇�琛ヤ笂骞村悓鏈熼渶閲嶆柊瀵煎叆瀵瑰簲骞村害鏁版嵁銆� +4. **鏀瑰姩鍓嶇殑澶囦唤涓嶅畬鏁�**锛歚_backup_freight_turnover_before_multiyear_20260916.sql` 浠� 59642 瀛楄妭銆佸彧瑙ｆ瀽鍑� `2026-04` 涓�澶� INSERT锛�**涓嶈兘浣滀负瀹屾暣鍥炴粴渚濇嵁**銆� +5. 寮圭獥鍐呫�屽叡 0 琛屻�嶄笌銆屾湀搴﹁鐩栵細1~8鏈堝潎鏈夋暟鎹�嶅彛寰勪笉鍚岋紙鍓嶈�呮槸鏄庣粏琛屾暟锛夛紝鏄撹瑙ｏ紝鍙�冭檻鏀规枃妗堬紙鏈仛锛岀瓑鐢ㄦ埛纭锛夈�� +6. 涓婂崍閬楃暀缁х画鎸傝处锛氬煙鍚�/鍏綉璁块棶鐨勭櫧鍚嶅崟琛ュ厖銆乣Login.vue` 閿欒鎻愮ず缁嗗垎銆丄I 澶栧彂鑴辨晱琛ラ綈銆�4 寮犳槑缁嗘姤琛ㄦā鏉挎墿鍒椼�佸鏍告瘮瀵瑰熀鍑嗙己澶变繚鎶ゃ�乣sys_role` 鏉冮檺钀藉湴銆�3D 楠岃瘉鐮佺敓浜у紑鍚�乣backend.log` 鍘嗗彶鏄庢枃娓呯悊銆佷粨搴撴牴鐩綍涓存椂鏂囦欢娓呯悊銆� +7. **鍏徃 gitea 浠嶅緟琛ユ帹**锛堢綉缁滈棶棰橈紝闈炲嚟鎹級锛岃ˉ鎺ㄥ墠鍏� `git fetch gitea` 涓庤繙绔� `main` 瀵规瘮鍚堝苟锛岀寮烘帹銆� + +## 涔濄�佹槑澶╄鍒� +1. 涓庣敤鎴风‘璁� `2021-12` / `2022-12` 绛夈�屾暣骞存姤琛ㄦ湡銆嶇殑涓氬姟鍙ｅ緞锛屼互鍙婃槸鍚﹂渶瑕佹妸骞村害鏁版嵁鎷嗘垚閫愭湀鎶ヨ〃鏈熴�� +2. 纭鏄惁闇�瑕佽ˉ 2023 骞存暟鎹�佷互鍙� `2026-01`~`2026-07` 鐨勪笂骞村悓鏈熸槸鍚﹂渶瑕佽ˉ榻愩�� +3. 瑙嗙敤鎴锋剰瑙佸鐞嗛瑙堝脊绐椼�屽叡 0 琛屻�嶆枃妗堛�� +4. 缃戠粶鎭㈠鍚庤ˉ鎺ㄥ叕鍙� gitea銆� +--- + +## 鍗併�佸倣鏅氳拷鍔狅紙绗� 3 杞敤鎴峰弽棣� 6 鏉★紝2026-09-16锛� + +鐢ㄦ埛鏈疆鎻愬嚭 6 鏉″弽棣堬紝閫愭潯澶勭悊缁撴灉濡備笅锛� + +| # | 鐢ㄦ埛鍙嶉 | 澶勭悊缁撴灉 | +|---|----------|----------| +| 1 | 21鈥�26 骞磋揣杩愰噺鍛ㄨ浆閲忚〃鏁版嵁鍏ュ簱 | 涓婅疆宸插畬鎴愶紙`0cfd6e0`锛夛紝鏈疆琛ラ綈 2023 骞达紙瑙� #2锛� | +| 2 | 鐢ㄦ埛鏍稿疄銆�23 骞存湁 12 鏈堢殑鏁版嵁銆� | **灞炲疄**銆�8 鏈堟簮鏂囦欢纭疄娌℃湁 2023 骞� Sheet锛屼絾 7 鏈堟枃浠� `D:\05_鏁版嵁鍒嗙被\璐ц繍\7鏈圽瀹氱-婀栧寳鐪佸悇甯傚窞杩愯緭閲忔暟鎹紙2026骞�1-7鏈堬級.xlsx` 閲屾湁涓�涓悕涓� `2023` 鐨� Sheet銆傚凡鍙﹀瓨 `_2023_import_tmp.xlsx`锛坄2023` + `2022骞碻 涓や釜 Sheet锛夊鍏ワ紝鐢熸垚 `2023-12`锛�18 琛岋級锛�**432 椤归�愭牸姣斿闆跺樊寮�** | +| 3 | 瑕佷竴浠姐�屾墍鏈夎娉ㄦ剰鐨勭偣銆嶇殑姹囨�绘枃妗� | 鏂板缓 `docs/闂姹囨��/闂涓庢敞鎰忎簨椤规眹鎬籣2026-09-16.md`锛�11 绔� + 閫熸煡琛紝鍚惎鍔�/杩涚▼銆佹棩蹇楅獙璇併�佹暟鎹簱銆佸鍏ヨ矾寰勪笌鏈熸绾﹀畾銆佹姤琛ㄣ�侀獙璇佺爜銆佹枃浠剁紪鐮併�佹祻瑙堝櫒鍙栬瘉銆乬it 鍙屼粨搴撱�侀仐鐣欓棶棰橈級 | +| 4 | 鎹� WiFi 鍚庣櫥褰曢〉鍑虹幇楠岃瘉鐮佺櫧妗� + 銆岄獙璇佺爜鍔犺浇澶辫触銆� | 宸蹭慨澶嶏紙鍓嶇榛樿鍊� + fail-safe锛夛紝鏈疆娴忚鍣ㄥ娴嬮�氳繃 | +| 5 | 棰勮鐐逛竴涓嬪脊銆屽鍑哄け璐ワ紝璇风‘璁ゅ鍏ユ暟鎹�� | 宸蹭慨澶嶆彁绀洪�昏緫锛堝尯鍒嗙綉缁�/鍚庣鍘熷洜锛夛紱鍙﹀涓ゅ皬椤癸紙鎸囨爣閿欎綅銆佸脊绐楁嫋鍔ㄥ渾瑙掞級鏈疆娴忚鍣ㄥ疄娴嬮�氳繃 | +| 6 | 鍏矾鏃呭 H203-1 妯℃澘琚慨鏀� | 宸查�傞厤骞堕獙璇侊細鏂板 `缁熶竴绀句細淇＄敤浠ｇ爜` / `濉姤鍗曚綅` 涓ゅ垪鍏ュ簱锛屾柊鑰佹牸寮忓弻鍚戝吋瀹� | + +### 1. 2023 骞磋揣杩愭暟鎹ˉ褰曪紙鐢ㄦ埛绗� 2 鏉★級 + +- **鎺掓煡杩囩▼**锛氬厛纭 8 鏈堟簮鏂囦欢 5 涓� Sheet 鍏ㄤ负鍙銆佹棤 2023锛涘啀鍏ㄧ洏鎼滅储 `*杩愯緭閲�*`銆乣*23骞�*`銆乣*璐ц繍閲�*` 鏂囦欢鍚嶏紱鏈�鍚庢壂鎻� `D:\05_鏁版嵁鍒嗙被` 涓� `D:\妗岄潰` 涓嬫墍鏈� `.xlsx` 鐨� **Sheet 鍚�**锛屽懡涓� 7 鏈堟枃浠剁殑 `2023` Sheet銆� +- **涓�鑷存�ч妫�**锛�7 鏈堜笌 8 鏈堟枃浠剁殑 `2021骞� / 2022骞� / 2024骞碻 涓夊勾鏁版嵁閫愭牸姣斿锛宍onlyJuly / onlyAug / differ` 鍏ㄤ负绌� 鈫� 涓夊勾**闆跺樊寮�**锛屽彲瀹夊叏鐢� 7 鏈堟枃浠惰ˉ 2022锛堜綔涓� 2023 鐨勪笂骞村悓鏈熸潵婧愶級銆� +- **瀵煎叆**锛歚POST /api/import/freightTurnover?period=2023-12`锛岃繑鍥炪�屽叡 36 鏉¤褰曘�嶃�� +- **楠岃瘉**锛歚2023-12` 18 琛岋紱璐ц繍閲� + 鍛ㄨ浆閲忓叡 432 椤逛笌 Excel 閫愭牸姣斿 **mismatches=0**锛沗last_*` 涓� `2022-12` 閫愬�肩浉鍚岋紱鍏ㄩ儴鎶ヨ〃鏈� 2021-12 鈫� 2026-08 鍏� 13 鏈熴�佹瘡鏈� 18 琛屻�� +- 璇﹁銆婂姛鑳芥祴璇曟姤鍛奯璐ц繍閲忓懆杞噺2023骞存暟鎹ˉ褰昣2026-09-16.md銆嬨�� + +### 2. H203-1 妯℃澘鏂板鍒楅�傞厤锛堢敤鎴风 6 鏉★級 + +- **妯℃澘 diff 缁撹**锛歋heet1 鐢� 773脳50 鈫� 816脳52锛涘湪銆屼紒涓氬悕绉般�嶅悗鎻掑叆 `缁熶竴绀句細淇＄敤浠ｇ爜`銆乣濉姤鍗曚綅` 涓ゅ垪锛屽叾浣� 48 鍒楁暣浣撳彸绉汇�� +- **鏀瑰姩 6 澶�**锛氬簱 DDL銆乣docs/init.sql`銆乣docs/database.md`銆乣PassengerEnterpriseMonthly.java`銆乣DataImportService.java`銆乣DataViewController.java`锛堟暟鎹煡鐪嬮〉鍒楋級銆� +- **楠岃瘉**锛氭柊妯℃澘瀵煎叆 814 鏉� 0 澶辫触锛屽洓椤规眹鎬伙紙瀹㈣繍杞﹁締 24584 / 鏍稿畾杞藉浣� 711018 / 瀹㈣繍閲� 16371625 / 鍛ㄨ浆閲� 1023386179锛変笌婧愭枃浠跺叏绛夛紱鑰佹牸寮� `.xls` 瀵煎叆 767 鏉� 0 澶辫触涓旀柊鍒楁湁鍊硷紙**鑰佹枃浠跺叾瀹炰篃甯﹁繖涓ゅ垪**锛夛紝鏁板�间笌鏃㈡湁 2026-08 瀹屽叏涓�鑷达紱璐熷悜鐢ㄤ緥锛堥�夐敊绫诲瀷锛夋姤閿欐竻鏅般�� +- **杩囩▼涓殑澶辫**锛歚docs/database.md` 閲� `| enterprise_name | varchar(200) | 浼佷笟鍚嶇О |` 鍑虹幇 4 娆★紝棣栨鎵归噺鏇挎崲璇敼 3 寮犺〃锛屽凡 `git checkout` 鍥為��鍚庢敼涓恒�屾埅鍙栫珷鑺傚啀鏇挎崲銆嶃�� +- 璇﹁銆婂姛鑳芥祴璇曟姤鍛奯H2031妯℃澘鏂板鍒楅�傞厤_2026-09-16.md銆嬨�� + +### 3. 鐧诲綍楠岃瘉鐮佸閿� + 鎶ヨ〃棰勮鏁存敼锛堢敤鎴风 4銆�5 鏉★級 + +- **楠岃瘉鐮�**锛歚Login.vue` 榛樿 `captchaRequired=false`锛屾敼涓� fail-safe锛堜粎鍚庣鏄庣‘杩斿洖 `required===true` 鎵嶆樉绀猴級锛涙崲 WiFi/鍚庣涓嶅彲杈炬椂涓嶅啀娈嬬暀楠岃瘉鐮佺櫧妗嗐�� +- **澶辫触鎻愮ず**锛歚failWith(err, action)` + `errReason(raw)` 閲嶅啓锛屽尯鍒嗐�岃繛涓嶄笂鏈嶅姟鍣ㄣ�嶄笌銆屽悗绔湡瀹炲師鍥犮�嶏紱棰勮璋冪敤甯� `action='棰勮'`锛汢lob 閿欒鍏� `text()` 鍐嶈В鏋愩�� +- **鎸囨爣閿欎綅**锛氶瑙堣〃澶寸敱 3 鍒楄ˉ涓� 4 鍒楋紙鍒嗙被/鎸囨爣/鏁版嵁/鍚屾瘮锛夛紝瀹炴祴 x 鍧愭爣 35 / 118 / 394 / 587锛宍16888.76` 钀藉湪銆屾暟鎹�嶅垪銆� +- **寮圭獥鎷栧姩 + 鍦嗚**锛氭柊澧� `dialogDrag.js` 鎸囦护锛圗lement UI 2.15.14 鏃� `draggable`锛夛紝`border-radius:10px`锛涘疄娴嬫嫋鍔� `(0,40) 鈫� (120,200)`锛宍transform=matrix(1,0,0,1,120,160)`锛屽叧闂悗澶嶄綅 `none`銆� +- 銆屼腑鍙ｅ緞涔嬪悗涓嶅啀娓叉煋琛ㄦ牸銆嶄笂杞凡淇紝鏈疆澶嶆牳寮圭獥鍐�**鏈変笖浠呮湁涓�寮犺〃**銆� +- 璇﹁銆婂姛鑳芥祴璇曟姤鍛奯鐧诲綍楠岃瘉鐮佸閿欎笌鎶ヨ〃棰勮鏁存敼_2026-09-16.md銆嬨�� + +### 4. 娉ㄦ剰浜嬮」姹囨�绘枃妗ｏ紙鐢ㄦ埛绗� 3 鏉★級 + +鏂板缓 `docs/闂姹囨��/闂涓庢敞鎰忎簨椤规眹鎬籣2026-09-16.md`锛屽叡 11 绔狅細 +閫熸煡琛紙10 鏉★級銆佸惎鍔ㄤ笌杩涚▼绠＄悊銆佹湇鍔＄姸鎬侀獙璇併�佹暟鎹簱銆佹暟鎹鍏ワ紙璺緞 + 鏈熸绾﹀畾 + 澶氬勾搴﹀伐浣滅翱璇嗗埆瑙勫垯锛夈�佹姤琛ㄧ敓鎴愩�佺櫥褰曚笌楠岃瘉鐮併�佹枃浠跺啓鍏ヤ笌鏂囨湰澶勭悊鐨勫潙銆佹祻瑙堝櫒鑷姩鍖栧彇璇佺殑鍧戙�丟it 鍙屼粨搴撳伐浣滄祦銆佸綋鍓嶅凡鐭ラ仐鐣欓棶棰樸�� + +## 鍗佷竴銆佹祴璇曠粨鏋滄憳瑕侊紙鍌嶆櫄杩藉姞閮ㄥ垎锛� + +- **2023 琛ュ綍**锛�5 鏉＄敤渚嬶級锛氭鍚戝叆搴撱��432 椤归�愭牸姣斿闆跺樊寮傘�佷笂骞村悓鏈熷彇鑷� 2022銆佹姤琛ㄦ湡娓呭崟鏃犻噸澶�/鏃犳畫鐣欍��2022-12 閲嶅啓鍚庨�愬�间笉鍙� 鈥斺�� 鍏ㄩ儴閫氳繃銆� +- **H203-1 鏂板鍒�**锛�9 鏉＄敤渚嬶級锛氭柊妯℃澘 814 鏉� 0 澶辫触銆佷袱鍒� 814/814 鏈夊�笺�侀琛屼笌姹囨�诲洓椤逛笌婧愭枃浠跺叏绛夈�佽�佹牸寮� 767 鏉� 0 澶辫触涓旀暟鍊间笌 2026-08 鍏ㄧ瓑銆丒xcel COM 鎶芥煡棣栬涓�鑷淬�佽礋鍚戦�夐敊绫诲瀷鎶ラ敊娓呮櫚銆佸垪鍙崇Щ涓嶅奖鍝嶆棫瀛楁 鈥斺�� 鍏ㄩ儴閫氳繃銆� +- **鐧诲綍楠岃瘉鐮� + 棰勮鏁存敼**锛�10 鏉＄敤渚嬶級锛氭棤楠岃瘉鐮佺櫧妗嗐�佹帴鍙� `required=false`銆佽〃澶� 4 鍒椾笖 x 鍧愭爣瀵归綈銆佸渾瑙� 10px銆佹嫋鍔ㄤ綅绉� 120/160銆佸叧闂浣嶃�佸脊绐楀唴浠� 1 寮犺〃銆佸け璐ユ彁绀哄凡缁嗗垎銆佸鍑烘垚鍔� 鈥斺�� 鍏ㄩ儴閫氳繃銆� +- **娴嬭瘯鏁版嵁娓呯悊**锛欻203-1 瀵煎叆楠岃瘉浜х敓鐨� `2099-06 / 2099-07 / 2099-09` 涓変釜娴嬭瘯鏈燂紙鍏� 2395 琛岋級鍙婂叾 `import_batch` 璁板綍宸插垹闄わ紝`h2031_enterprise_monthly` 鎭㈠涓� 2026-01 ~ 2026-08 鍏� 8 鏈燂紱`freight_turnover_import` 涓� 13 鏈� 脳 18 琛屻�� + +## 鍗佷簩銆侀仐鐣欓棶棰樹笌寰呭姙锛堝倣鏅氭洿鏂帮級 + +| # | 闂 | 鐘舵�� | +|---|------|------| +| 1 | 8 鏈堟簮鏂囦欢缂� 2023 骞� Sheet | **宸茶В鍐�**锛堢敤 7 鏈堟枃浠惰ˉ褰� `2023-12`锛� | +| 2 | `2026-01` ~ `2026-07` 鐨� `last_*` 涓虹┖ | 寰呯敤鎴风‘璁ゆ槸鍚﹁ˉ | +| 3 | `2026-01` ~ `2026-08` 鐨� H203-1 `unified_credit_code` / `report_unit` 涓虹┖锛堟鍓嶄唬鐮佹湭璇昏繖涓ゅ垪锛� | **寰呯敤鎴风‘璁ゆ槸鍚﹂噸瀵煎巻鍙叉枃浠跺洖濉�** | +| 4 | `2024-12` 鐨勪笂骞村悓鏈熸湭鍥炲～锛堥渶閲嶅 2024 骞存暟鎹級 | 寰呯敤鎴风‘璁� | +| 5 | 棰勮寮圭獥銆屽叡 0 琛屻�嶄笌銆屾湀搴﹁鐩栵細1~8鏈堝潎鏈夋暟鎹�嶅彛寰勬枃妗堜笉鍚� | 寰呯敤鎴风‘璁ゆ敼鏂囨 | +| 6 | `2021-12` 绛夈�屾暣骞存姤琛ㄦ湡銆嶇殑涓氬姟鍙ｅ緞 | 寰呯敤鎴风‘璁� | +| 7 | 鍏徃 gitea 鎺ㄩ�侊紙缃戠粶鏃犲搷搴旓級 | 寰呰ˉ鎺紝**绂佸己鎺�** | +| 8 | 浠撳簱鏍圭洰褰曞ぇ閲� `_*.*` 涓存椂鏂囦欢 | 缁忕敤鎴峰悓鎰忓悗鍐嶆竻鐞� | + +## 鍗佷笁銆佷笅涓�姝ヨ鍒掞紙鍌嶆櫄鏇存柊锛� + +1. 绛夌敤鎴风‘璁� 3 浠朵簨锛氭槸鍚﹂噸瀵� 2026 骞村巻鍙� H203-1 鏂囦欢鍥炲～涓ゅ垪銆佹槸鍚﹁ˉ `last_*` / `2024-12` 涓婂勾鍚屾湡銆侀瑙堝脊绐楁枃妗堟槸鍚﹁皟鏁淬�� +2. 缃戠粶鎭㈠鍚庤ˉ鎺ㄥ叕鍙� gitea锛堝厛 fetch 鍚堝苟锛岀寮烘帹锛夈�� +3. 瑙嗙敤鎴锋剰瑙佹竻鐞嗕粨搴撴牴鐩綍 `_*.*` 涓存椂鏂囦欢銆� + +## 鍗佸洓銆乬it 瀹為檯缁撴灉锛堝倣鏅氳ˉ璁帮級 + +1. `git fetch origin`锛堜釜浜� gitee锛宍master`锛夛細杩滅涓庢湰鍦颁竴鑷达紙`HEAD...origin/master = 0 0`锛夛紝**鏃犲悓浜�/鐢ㄦ埛鏂版彁浜�**锛屾棤闇�鍚堝苟銆� +2. 鎻愪氦 `24b4c28`锛歚feat(h2031): 閫傞厤妯℃澘鏂板銆岀粺涓�绀句細淇＄敤浠ｇ爜/濉姤鍗曚綅銆嶄袱鍒楀苟鍏ュ簱锛沠ix(import): 琛ュ綍 2023 骞磋揣杩愰噺鍛ㄨ浆閲忥紱fix(login/report): 楠岃瘉鐮佸閿欍�侀瑙堟寚鏍囧榻愩�佸脊绐楀彲鎷栧姩鍦嗚銆佸け璐ユ彁绀虹粏鍒嗭紱docs: 鏂板闂涓庢敞鎰忎簨椤规眹鎬籤锛�10 涓敼鍔� + 4 涓柊澧烇紝鍏� 14 涓枃浠讹級銆� +3. 鎺ㄤ釜浜轰粨搴� `origin`锛歚git push origin main:master` 鎴愬姛锛坄0cfd6e0..24b4c28`锛夈�� +4. 鎺ㄥ叕鍙� `gitea`锛歚git fetch gitea` 鎶� `Operation too slow. Less than 1000 bytes/sec transferred the last 15 seconds`锛沗curl --max-time 20 http://61.183.254.94:3000/` 杩斿洖 `http_code=000 time=20.01`锛岀‘璁�**鍏徃鍐呯綉涓嶅彲杈�**锛堢綉缁滈棶棰橈紝闈炲嚟鎹級锛屾湰娆℃湭鎺ㄩ�佹垚鍔燂紝宸插垪涓洪仐鐣欓棶棰橈紱琛ユ帹鍓嶅厛 `git fetch gitea` 涓庤繙绔� `main` 鍚堝苟锛�**绂佸己鎺�**銆� + +## 鍗佷簲銆佺敤鎴� 4 鏉＄‘璁ょ殑钀藉疄锛�2026-09-16 鏀跺熬锛� + +| 鐢ㄦ埛鍙嶉 | 缁撹涓庡缃� | +|---|---| +| 1-2銆屾垜瀵煎叆鐨勮揣杩愰噺鍛ㄨ浆閲忚〃閲屾湁 23 骞存暟鎹�� | 宸查�愭牸澶嶆牳锛�8 鏈堟簮鏂囦欢鍙湁 `2026骞� / 2025骞� / 2024骞� / 2022骞� / 2021骞碻 浜斾釜 Sheet锛屽唴鏂囨棤浠讳綍 2023 鏍囪瘑锛堝懡涓」鍧囦负娴偣鏁伴噷鐨勬暟瀛楀阀鍚堬級锛沗2023` Sheet 鍑虹幇鍦�**7 鏈�**鏂囦欢閲屻�傚凡鐢� 7 鏈堟枃浠剁殑 `2023` Sheet 琛ュ綍 `2023-12`锛屾棤闇�鍐嶅銆� | +| 1銆岃浠栫┖鐫�鍚с�� | 2026-01~08 鐨� H203-1 `unified_credit_code` / `report_unit` 淇濇寔绌猴紝**涓嶉噸瀵�**鍘嗗彶鏂囦欢銆� | +| 2銆屾槸涓嶆槸鎶� 23 骞翠篃瀵艰繘鍘汇�� | 鏄紝宸插鍏� `2023-12`锛�18 琛岋級銆傝嫢瑕佸洖濉� `2024-12` 鐨勪笂骞村悓鏈熷�硷紝闇�鍐嶉噸瀵间竴娆� 2024 骞存暟鎹紙寰呯敤鎴风‘璁わ級銆� | +| 3銆屽彲浠ャ�� | 棰勮寮圭獥鏂囨宸叉寜纭淇敼锛堟眹鎬诲ぇ琛ㄣ�屾寚鏍� N 椤广�嶏紡鍏跺畠鎶ヨ〃銆屽叡 N 琛屾槑缁嗐�嶏級锛屽苟宸插湪娴忚鍣ㄥ疄娴嬨�� | +| 4銆屼粈涔堟椂鍊欏紑濮嬭繛涓嶄笂鐨勩�� | 鍏徃 gitea **鑷� 2026-09-15 璧蜂笉鍙敤**锛�09-15 涓哄嚟鎹脊绐楁湭鎺ㄦ垚鍔燂紱09-16 璧峰彉涓� TCP 3000 鍙繛浣� HTTP 鏃犲搷搴斻�備粖鏃ュ娴� `Test-NetConnection` 涓� True銆乣curl` 25s 瓒呮椂 `code=000`銆� | + +## 鍗佸叚銆乬it 瀹為檯缁撴灉锛堟敹灏捐ˉ璁帮級 + +- `git fetch origin`锛堜釜浜� gitee锛夛細`HEAD...origin/master = 0 0`锛屾棤鏂版彁浜わ紝鏃犻渶鍚堝苟銆� +- 鎻愪氦 `e7cddc4`锛歚fix(report): 棰勮寮圭獥琛屾暟鏂囨鎸夋姤琛ㄧ被鍨嬪尯鍒哷锛�4 涓枃浠讹紝+25/-1锛夈�� +- 鎺ㄤ釜浜轰粨搴� `origin`锛歚git push origin main:master` 鎴愬姛锛坄b0c8b4f..e7cddc4`锛夈�� +- 鎺ㄥ叕鍙� `gitea`锛歚git fetch gitea` 浠嶅け璐ワ紝鎶� `fatal: unable to access ... Recv failure: Connection was reset`锛坄fetch_exit=128`锛夛紝鏈**鏈帹閫佹垚鍔�**锛岀户缁垪涓洪仐鐣欓棶棰橈紱琛ユ帹鍓嶅厛 `git fetch gitea` 涓庤繙绔� `main` 鍚堝苟锛�**绂佸己鎺�**銆� + +## 鍗佷竷銆佺敤鎴风 5 鏉★細姹囨�诲ぇ琛ㄤ笌 8 鏈堝畾绋块�愯〃姣斿 + +**姣斿瀵硅薄**锛歚D:\妗岄潰\鐢熸垚_閬撹矾杩愯緭閲忔眹鎬昏〃.xlsx`锛堢敤鎴� 14:39 瀵煎嚭锛� vs `D:\05_鏁版嵁鍒嗙被\姹囨�昏〃\8鏈堟眹鎬诲畾绋縗2026骞�8鏈堝杩愰噺銆佽揣杩愰噺瀹氱.xlsx`銆傞噸鏂板鍑轰竴娆★紙`GET /api/report/export/summaryWorkbook?period=2026-08&mode=month`锛夊緱鍒扮殑鏂囦欢涓庢闈㈤偅浠�**瀛楄妭鏁板畬鍏ㄤ竴鑷达紙950,186锛�**锛屾帓闄も�滄枃浠惰繃鏈熲�濄�� + +**韪╃殑鍧戯紙閲嶈锛�**锛� +1. 涓よ竟**琛屽潡楂樺害涓嶅悓**锛堝鍑烘瘡甯傚窞 6 琛屻�佸畾绋� 4 琛岋紱瀵煎嚭 118 琛� vs 瀹氱 84 琛岋級锛岀洿鎺ユ寜鍗曞厓鏍煎潗鏍囨瘮浼氬緱鍑� 4.6 涓囦釜鈥滃樊寮傗�濓紝鍏ㄦ槸閿欎綅鍣０ 鈫� 鏀圭敤銆屽湴鍖�+鎸囨爣+鍒楁爣棰樸��**璇箟閿�**瀵归綈銆� +2. 瀵煎嚭绔湁 **39,939 涓叕寮忔牸**锛坄=C7+C9`銆乣=C5/V5-1`銆乣RANK(...)`锛夛紝`openpyxl(data_only=True)` 璇诲嚭鏉ュ叏鏄� None 鈫� 璇垽鎴愨�滄暣琛ㄦ病鏁版嵁鈥濄�侲xcel COM 鎵撲笉寮�锛堢敤鎴峰凡寮�鐫� Excel锛屼笉鑳戒贡鍔級锛屾渶鍚�**鑷繁鍐欏叕寮忔眰鍊煎櫒**锛圫UM/RANK/ROUND+鍥涘垯+璺ㄨ〃寮曠敤锛夌畻鍑� 61,972 涓暟鍊兼牸鍐嶆瘮銆� + +**缁撹**锛氳涔夐敭涓�鑷� 28,567 涓紝涓嶄竴鑷� 4,742 涓�� +* ` 璐ц繍` 琛細瀵煎嚭姣忓競宸炴瘮瀹氱**澶氫袱琛�**锛堛�岃涓�+瑙勪笅璐ц繍閲忋�嶃�岃涓嬭揣杩愰噺銆嶏級锛屽悓鎸囨爣鏁板��**闆跺樊寮�**锛涘畾绋胯繕鏈夈�岃涓�+瑙勪笅鍛ㄨ浆閲忋�嶈鑰屽鍑鸿琛屼负绌恒�� +* **鏈�澶у樊寮傛潵婧�**锛歚city_bus_monthly / city_taxi_monthly / wyc_order_monthly / wyc_total_monthly` **鍙湁 2026-01~08锛屾病鏈� 2025 骞�** 鈫� 鍏氦/鍑虹/缃戠害杞�/涓彛寰勫嚑寮犺〃鐨勩�屼笌鍘诲勾鍚屾瘮銆嶈绠楁垚 `0`/`-1`銆�2025 骞寸疮璁″亸灏忋�� +* `h2031_enterprise_monthly` 缂� `2025-01`锛堟簮鏂囦欢鏈韩娌℃湁 1 鏈堬級銆� +* 瀵煎嚭绔�屼腑鍙ｅ緞鍒嗘瀽銆嶅涓�娈靛綋鏈堝潡銆佺己 4 琛屸�滃崰姣斺�濄�� +璇﹁銆婂姛鑳芥祴璇曟姤鍛�/姹囨�诲ぇ琛ㄤ笌瀹氱姣斿_2026-09-16.md銆嬨�� + +## 鍗佸叓銆佺敤鎴风 2 鏉★細2024 骞存暟鎹噸瀵硷紙鍥炲～涓婂勾鍚屾湡锛� + +**鑳屾櫙**锛歚last_*`锛堜笂骞村悓鏈燂級鍙粠**鍚屼竴涓伐浣滅翱鐨勪笂涓�骞� Sheet** 鍙栵紝8 鏈堟枃浠舵病鏈� `2023` Sheet锛屾墍浠� `2024-12` 鐨� `last_*` 涓�鐩存槸 NULL銆� + +**杩囩▼**锛氬厛鐢� 7 鏈堟枃浠讹紙鍚� `2023` Sheet锛夊彟瀛樺彧鐣� 4 涓勾搴� Sheet 鐨勪复鏃舵枃浠跺鍏� 鈫� `2024-12` 鐨� `last_*` 濉笂浜嗭紝浣� **`2021-12` 鐨勩�屾箹鍖楃渷銆嶈 1 鏈堝�间粠 14945.34 鍙樻垚浜� 0**銆傛帓鏌ュ彂鐜般�屾箹鍖楃渷銆嶈鏄� `=SUM()` **鍏紡**锛宱penpyxl 鍙﹀瓨浼�**涓㈡帀鍏紡鐨勭紦瀛樺��**锛孭OI 璇诲埌绌哄叕寮忓氨鍐� 0銆� + +**淇**锛氭敼鐢�**鍘熷 7 鏈堟枃浠�**鏁翠唤閲嶅锛坄POST /api/import/freightTurnover?period=2026-07`锛岃繑鍥炪�屽叡 108 鏉¤褰曘��= 6 鏈� 脳 18 琛岋級銆� + +**澶嶆牳**锛�7 鏈�/8 鏈堜袱涓枃浠剁殑 11 涓勾搴� Sheet 涓庡簱閫愭牸姣斿 **4,752 鏍煎叏閮� 0 涓嶄竴鑷�**锛涗笂骞村悓鏈熼摼鏉� 2022鈫�2021銆�2023鈫�2022銆�2024鈫�2023銆�2025鈫�2024銆�2026-07/08鈫�2025 **鍏ㄩ儴 0 涓嶄竴鑷�**銆� + +**鏁欒**锛氫互鍚庝笉鑳界敤 openpyxl 鍙﹀瓨 Excel 鍐嶅杺缁欏悗绔紝鍏紡缂撳瓨浼氫涪锛涜涔堢敤鍘熷鏂囦欢锛岃涔堢敤 Excel COM 鍙﹀瓨銆� -- Gitblit v1.9.1