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 | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 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 36fde62..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" @@ -165,3 +165,37 @@ | 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