From 0cfd6e093e08566b4199836a54d827067580007e Mon Sep 17 00:00:00 2001 From: zhizhijie <zhizhijie@users.noreply.gitee.com> Date: 星期三, 16 九月 2026 11:58:23 +0800 Subject: [PATCH] feat(import): 货运量周转量支持多年度工作簿（21-26年）一次性入库；fix(report): 汇总大表预览删除中口径之后的明细表 --- docs/工作日结/工作日结_2026-09-16.md | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 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..c214d53 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,38 @@ 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銆� \ No newline at end of file -- Gitblit v1.9.1