From 208c8fc859fcde5fc42ed2802c0483aea5bbdc80 Mon Sep 17 00:00:00 2001 From: zhizhijie <zhizhijie@users.noreply.gitee.com> Date: 星期一, 12 十月 2026 09:04:39 +0800 Subject: [PATCH] fix(汇总大表): 扩列时按母版期次重写 7 个标题页标题，并修正 8 月母版标题（待验收） --- HANDOFF.md | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/HANDOFF.md b/HANDOFF.md index 7a2d9f3..8cdec2f 100644 --- a/HANDOFF.md +++ b/HANDOFF.md @@ -4,6 +4,40 @@ > **姣忓ぉ缁撴潫鏃�**锛氭妸褰撳ぉ杩涘睍銆佽俯杩囩殑鍧戙�佹柊闇�姹傘�佹湭瀹屾垚浜嬮」鏇存柊鍒版湰鏂囦欢锛岀劧鍚庡彲浠ユ斁蹇冨紑鏂板璇濄�� > **鍗忎綔绾﹀畾锛�2026-08-31锛�**锛氳銆屾彁浜ゃ��= 鏈湴 commit + 鎺ㄩ�佸埌杩滅 git锛坥rigin main锛孏itblit锛夛紝涓嶅啀鍙仛鏈湴 commit銆� +## 鏈�鏂帮紙2026-10-12锛寊yj 绾匡級 + +### 10-12锛氭墿鍒楀櫒琛ャ�屾爣棰樻寜姣嶇増鏈熸閲嶅啓銆�+ 淇 8 鏈堟瘝鐗堟爣棰樸�愬緟楠屾敹銆� + +- **鐢ㄦ埛鍙嶉**锛�9 鏈堢増寮忎欢涓� 8 鏈堟瘝鐗堥噷锛�7 涓〉绛剧殑鏍囬浠嶆槸 `1-7鏈� / 7鏈坄锛堣揣杩愰噺鎺掑悕銆佽揣杩愬懆杞噺鎺掑悕銆佸煄甯傛眹鎬汇�佸煄甯傚垎甯傚窞銆佷腑鍙ｅ緞鎺掑悕銆佷腑鍙ｅ緞鍒嗘瀽銆侀亾璺繍杈撳懆杞噺锛夈�� +- **鏍瑰洜锛堜袱鏉★級**锛氣憼 鎸夊凡纭鍙ｅ緞杩� 7 椤垫槸 C 绫婚〉鈥斺��**鏍囬鐢辩敓鎴愮▼搴忓湪鍑鸿〃鏃剁幇鍐�**锛坄ReportExportService :969 / :1011 / :2707 / :2891 / :4446 / :4498 / :4499 / :4604` 鍧囨寜 period 鍐欙級锛屾瘝鐗堥噷鐨勬枃瀛椾笉鍙備笌鍑鸿〃锛屾墍浠ユ墿鍒楀櫒鍘熸湰娌″姩瀹冧滑锛涒憽 **鎴戠殑瀹炵幇纭疄婕忎簡"鏍囬 +1"杩欎竴姝�**鈥斺�斻�婃墿鍒楅厤缃锋牳瀵圭増銆嬪姩浣� 7 鍐欎簡"鏍囬锛氶〉闈㈡爣棰樻湀浠�+1锛堥�愰〉鏍稿锛�"锛屾垜鍙仛浜� 8 涓彴璐﹂〉鐨勮〃澶村厠闅嗐�� +- **淇**锛氭墿鍒楀櫒鏂板 `applyTitles(...)`鈥斺�旀寜**姣嶇増鏈熸**閲嶅啓鏍囬锛堢疮璁�=`1-M鏈坄銆佸綋鏈�=`M鏈坄锛夛紝鍙鐞� 7 涓爣棰橀〉銆�**鍛戒腑鏍囬鏍囪鎵嶆敼**锛堥伩鍏嶈浼� ` 璐ц繍!A1` 杩欑被澶囨敞锛夛紝4 浣嶅勾浠戒竴骞舵寜鐩爣骞撮噸鍐欙紱鏂板鍙鎺ュ彛鍙傛暟 `?titlesOnly=true`锛堝彧鏀规爣棰樹笉鎵╁垪锛夈�� +- **8 鏈堟瘝鐗堝凡淇**锛�7 椤垫爣棰� `1-7鏈�/7鏈坄 鈫� **`1-8鏈�/8鏈坄**锛堜慨姝ｅ墠澶囦唤 `docs/鐢熸垚姹囨�诲ぇ琛�/_bak_2026骞�8鏈堟瘝鐗坃鏍囬淇鍓峗20261012.xlsx`锛夛紱19 椤电涓庡叕寮忔娊鏌ユ棤鎹燂紙`涓彛寰勬槑缁�!C5`銆乣鍏氦!C5` 鍏ㄧ渷琛屽叕寮忋�乣 璐ц繍!A1` 澶囨敞鍧囨甯革級銆� +- **9 鏈堢増寮忛噸璺�**锛�7 椤垫爣棰� 鈫� **`1-9鏈�/9鏈坄**锛涗骇鍑� `docs/鐢熸垚姹囨�诲ぇ琛�/杈撳嚭/_鎵╁垪_2026骞�9鏈坃寰呯‘璁v2.xlsx`锛�1,037,071 B锛夈�� +- **涓庢墜宸� 9 鏈堟瘝鐗堝姣�**锛�851 鏉″樊寮� = 8 涓彴璐﹂〉 836 鏉★紙娌跨敤 10-10 鍒嗙被锛氱疮璁�/鍒嗘瘝鏄惁鎵╁埌 9 鏈� 548銆佸垎闅旂 153銆佽〃鍚嶅紩鍙� 130銆佹诞鐐瑰熬宸� 1锛夛紜 **鏍囬椤� 15 鏉�**锛堟墜宸ヤ欢鏍囬涓烘粸鍚庣殑 `1-8鏈�/7鏈坄锛夈�� +- **韪╁潙**锛氶噸璺戞椂鐩爣鏂囦欢琚� Excel/WPS 鍗犵敤锛坄being used by another process`锛夆啋 鍏堣惤 `_v2` 鍛藉悕锛涚敤鎴峰叧闂悗鍙敤鍘熷悕閲嶅啓銆� +- **鎶ュ憡锛堟湰鍦般�佷笉鍏ュ簱锛�**锛歚docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_姹囨�诲ぇ琛ㄦ墿鍒楀櫒鏍囬淇_2026-10-12.md`锛涙棩缁� `docs/宸ヤ綔鏃ョ粨/宸ヤ綔鏃ョ粨_2026-10-12.md`銆� +- **寰呯敤鎴烽獙鏀�/纭**锛氣憼 鏍囬鍙ｅ緞鎸�"**鏍囬鏈熸=姣嶇増鏈熸**"锛�8鏈堚啋1-8鏈�/8鏈堛��9鏈堚啋1-9鏈�/9鏈堬級鏄惁姝ｇ‘锛涒憽 `_鎵╁垪_2026骞�9鏈坃寰呯‘璁v2.xlsx` 鏄惁鏀瑰悕涓烘寮忓悕锛堝師鍚嶉偅浠芥槸鏃у唴瀹广�佽 WPS 瀛樿繃锛屾湭缁忓悓鎰忎笉鍔級锛涒憿 绱/绱鍚屾瘮"鏄惁鎵╁埌 9 鏈�"锛堜骇鍑�=宸叉墿銆佹墜宸ョ増鏈墿锛夈�� +- **鐘舵��**锛�**銆愬緟楠屾敹銆�**銆� +## 鏈�鏂帮紙2026-10-10锛寊yj 绾匡級 + +### 10-10锛歋tep 1 鎵╁垪鍣ㄨ惤鍦� + 8鈫�9 鏈堢増寮忛杞骇鍑恒�愬緟楠屾敹銆� + +- **鏂板鎵╁垪鍣�**锛歚traffic-audit-server/.../reportexport/layout/SummaryLayoutExpander.java`锛涙柊澧炲彧璇绘帴鍙� `GET /api/report/export/summaryWorkbook/expand?period=YYYY-MM`锛堣繑鍥炲瓧鑺傘��**涓嶈惤鐩�**锛夛紱`ReportExportService.expandSummaryWorkbook(period)` 璐熻矗鍙栧綋鏈熸瘝鐗堝苟璋冪敤銆傝鍒欎緷鎹� `docs/姹囨�诲ぇ琛ㄦ瘝鐗堟墿鍒楅厤缃甠鏍稿鐗坃2026-10-09.md`锛�8 涓彲瑙佸彴璐﹂〉锛�4 涓殣钘忛〉涓嶆墿鍒椾絾鍚屾骞崇Щ鍏惰法椤靛紩鐢級銆� +- **浜у嚭锛堝緟纭浠讹紝鏈惤鐩樹负姣嶇増锛�**锛歚docs/鐢熸垚姹囨�诲ぇ琛�/杈撳嚭/_鎵╁垪_2026骞�9鏈坃寰呯‘璁�.xlsx`锛�1,036,939 B锛�2026-10-10 09:30:07锛夈�傚彧鍋氱増寮忥紝9 鏈堟暟鎹垪鐣欑┖銆� +- **涓庢墜宸� 9 鏈堟瘝鐗堥�愭牸姣斿**锛�**` 璐ц繍` 宸紓 = 0**锛堣鍒欐纭殑鏈�寮鸿瘉鎹級锛涘叾浣� 7 椤靛叡 836 鏉″樊寮傦紝**鍏ㄩ儴闈炴暟鍊煎垎姝�**锛屽垎涓哄洓绫伙細 + 1. **548 鏉�**锛氫骇鍑烘妸銆岀疮璁�/绱鍚屾瘮鍒嗘瘝銆嶆墿鍒� 9 鏈堬紝鎵嬪伐鐗堟湭鎵┾�斺�旀鏄� 09-29銆婃墿鍒楄繘搴︺�嬭瀹氱殑寰呬慨椤� 鈶⑩懀锛�"绱鍒楀彧绠楀埌 8 鏈�""鍘诲勾鍩烘暟鍙埌 8 鏈�"锛夛紝鍗�**鎵嬪伐 9 鏈堟瘝鐗堣繖 7 椤靛皻鏈慨瀹�**锛� + 2. 153 鏉★細鍒嗘瘝鏂板椤瑰垎闅旂鍐欐硶锛坄SUM(a+b+鈥�,c)` vs `SUM(a+b+鈥�+c)`锛岀瓑浠峰悓鍊硷級锛� + 3. 130 鏉★細琛ㄥ悕寮曞彿鍐欐硶锛坄杞ㄩ亾銆佽疆娓�!C6` vs `'杞ㄩ亾銆佽疆娓�'!C6`锛孍xcel 瑙勮寖鍖栨墍鑷达紝鍚屽�硷級锛� + 4. 1 鏉★細娴偣灏惧樊銆� +- **8 鏈堝強浠ュ墠鍒�**锛氫粎 28 鏉″樊寮備笖鍏ㄩ儴灞炵 3 绫诲紩鍙峰啓娉曪紙闆嗕腑鍦� `鍩庡競瀹㈣繍`锛夛紝鏈姩鏁板��/鍒楀彿銆� +- **杩囩▼涓慨鎺夌殑涓や釜瀹炵幇缂洪櫡**锛堥噸瑕侊紝閬垮厤澶嶇幇锛夛細 + 1. POI 5.2.5 鐨勫悎骞跺尯 API 鏄� `addMergedRegion(CellRangeRangeAddress)`銆乣removeMergedRegion(int)`锛堟棤 CellRangeAddress 閲嶈浇锛夆�斺�旀寜涓嬫爣鎽橀櫎銆佹寜瀵硅薄娣诲姞锛� + 2. 寮曠敤姝ｅ垯鏈�鍒濆彧璁� ASCII 琛ㄥ悕锛�**婕忔帀姣嶇増閲� 5,574 澶�"鏈甫寮曞彿鐨勪腑鏂囪〃鍚�"寮曠敤**锛堝 `杞ㄩ亾銆佽疆娓�!C6`锛夆啋 宸叉妸琛ㄥ悕瀛楃绫绘墿鍒� CJK锛屼慨姝ｅ悗鍒楀彿涓庢墜宸ョ湡鍊间竴鑷淬�� + 3. 鍐欎欢鐢� **POI**锛堜笌鐢熸垚閾捐矾鍚屾簮锛夛紝涓嶇敤 openpyxl锛堟湰椤圭洰鍘嗗彶涓婃湁 openpyxl 鍐欏嚭瀵艰嚧 Excel 鎷掔粷鎵撳紑鐨勬渚嬶級銆� +- **鎶ュ憡锛堟湰鍦般�佷笉鍏ュ簱锛�**锛歚docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_姹囨�诲ぇ琛ㄦ墿鍒楀櫒8鏈堝埌9鏈堢増寮廮2026-10-10.md`锛涙棩缁� `docs/宸ヤ綔鏃ョ粨/宸ヤ綔鏃ョ粨_2026-10-10.md`銆� +- **寰呯敤鎴烽獙鏀�/纭**锛氣憼 绱鍒椾笌绱鍚屾瘮鍒嗘瘝**鏄惁搴旀墿鍒� 9 鏈�**锛堜骇鍑�=宸叉墿锛涙寜 09-29 寰呬慨娓呭崟锛屾柟鍚戜笌褰撴椂璁ゅ畾涓�鑷达級锛涒憽 纭鍚庢槸鍚︽妸浜у嚭钀界洏涓烘寮� 9 鏈堟瘝鐗堬紙鎸夊凡纭鍙ｅ緞锛氫汉宸ョ‘璁ゅ悗钀界洏锛夈�� +- **鐘舵��**锛�**銆愬緟楠屾敹銆�**锛堢増寮忕被鏀瑰姩锛夈�傛湭瀵煎叆浠讳綍涓氬姟鏁版嵁銆佹湭鏀瑰姩鐢熸垚涓婚摼銆� +- **涓嬩竴姝�**锛氭寜纭缁撹寰皟锛堝闇�锛夆啋 澶嶈窇 8鈫�9 鈫� 鎺ュ叆涓婚摼锛坄resolveSummaryMother` 鎵句笉鍒扮洰鏍囨湀姣嶇増鏃惰嚜鍔ㄦ墿鍒楋級+ 褰掓。鐩綍涓庣増寮忓弬鐓т欢鎸� C4 鏀跺熬銆� ## 鏈�鏂帮紙2026-10-09锛寊yj 绾匡級 ### 10-09锛�2025 鏁版嵁鐜扮姸鏍搁獙锛堢粨璁猴細宸插湪搴擄紝鏃犻渶琛ュ綍锛�+ M0 瑙勬牸琛ョ鍗佷簩鑺� @@ -47,6 +81,8 @@ - **鏂囨。鏇存柊**锛歚docs/姹囨�诲ぇ琛∕0鐗堝紡閲嶅缓鍣ㄨ鏍糭2026-10-06.md` 绗崄鍥涜妭宸插畾椤规浛鎹�"鏈喅椤�"锛涜鏍艰〃涓庨厤缃垵绋垮悇杩藉姞鍙ｅ緞琛ュ厖銆� - **鐘舵��**锛氥�愬緟楠屾敹銆戯紱鏈敼鍔ㄤ唬鐮併�佹湭瀵煎叆鏁版嵁銆� +- **锛堝悓鏃ュ凡纭锛岄潪寰呯‘璁ら」锛夎惤鐩樹笌鏂囦欢绠＄悊**锛氭墿鍒椾骇鐗�**鍏堣惤 `docs/鐢熸垚姹囨�诲ぇ琛�/杈撳嚭/`**锛坄_鎵╁垪_YYYY骞碝鏈坃寰呯‘璁�.xlsx`锛夛紝**浜哄伐纭鍚�**鎵嶉噸鍛藉悕钀界洏涓哄綋鏈熸瘝鐗堬紱鐩綍鍙暀**褰撴湡涓�鏈�**姣嶇増锛屽巻鍙叉湡绉诲叆 `docs/鐢熸垚姹囨�诲ぇ琛�/褰掓。/`锛宍2026骞�8鏈堚�鐗堝紡鍘熷瀷.xlsx` 涓�骞跺綊妗ｏ紱鐗堝紡鍙傜収浠� `鐢熸垚_閬撹矾杩愯緭閲忔眹鎬昏〃.xlsx` 鍦ㄦ墿鍒楀櫒璺戦�氬悗褰掓。锛堝綊妗ｅ墠鍋� C4 涓ゆ锛氬垪瀹�/闅愯棌涓�娆℃�у浐鍖栬繘姣嶇増 + `applySummaryReferenceLayout` 鏀规寜琛ㄥご鏂囧瓧鍖归厤鍒楋級銆� +- **瀹炴柦瑕佺偣锛堝疄娴嬬粏鑺傦紝闈炲喅绛栭」锛�**锛氭瘝鐗� vs 鍙傜収浠跺疄娴� **鍒楀 320 澶勩�侀殣钘忔爣璁� 31 澶�**涓嶅悓锛坄 璐ц繍` 77+8銆佺彮绾垮寘杞� 109銆佷腑鍙ｅ緞鏄庣粏 32+14銆佷腑鍙ｅ緞鎺掑悕 17+9 绛夛級锛沗copyColumnWidth`锛坄ReportExportService.java:1186`锛�**鍙鍒跺搴︺�佷笉澶嶅埗 hidden**锛屾墿鍒楀櫒鍏嬮殕鏈堜唤鍒楁椂椤昏ˉ hidden銆� ### 10-09锛�5锛夛細Step 0 钀藉湴鈥斺�斿洓寮犺法椤靛悎鎴愰〉鍙栨暟鏀逛负**鎸夎〃澶村姩鎬佸畾浣�**鏈堜唤鍒椼�愬緟楠屾敹銆� - **鏀瑰姩**锛歚ReportExportService` 涓� `SM_CUR_COL0 = 2`锛�2026骞�1鏈�=C锛�/ `SM_LAST_COL0 = 21`锛�2025骞�1鏈�=V锛�**搴熷純**锛屾敼鐢辨柊澧炵殑 `smMonthCols(sheet, year)` + `smYearMonthOf(cell)` 鎸夎〃澶村畾浣嶏紱`smSumMonths` 鏀瑰悆銆屾湀浠解啋鍒楀彿銆嶆槧灏勩��**鍙崲鍙栨暟鏂瑰紡锛屼笉鏀圭増寮忎笌鏁板�煎彛寰勩�佷笉鍋氭墿鍒�**銆� -- Gitblit v1.9.1