From b14fec1599277629e10b2bc686f02fd0c2e0bec1 Mon Sep 17 00:00:00 2001 From: zhizhijie <zhizhijie@users.noreply.gitee.com> Date: 星期五, 18 九月 2026 16:46:30 +0800 Subject: [PATCH] fix(货运月报): 订正持续在规企业累计运距同比基期口径(v2) --- docs/问题汇总/汇总表三条主线修复方案_2026-09-18.md | 66 +++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git "a/docs/\351\227\256\351\242\230\346\261\207\346\200\273/\346\261\207\346\200\273\350\241\250\344\270\211\346\235\241\344\270\273\347\272\277\344\277\256\345\244\215\346\226\271\346\241\210_2026-09-18.md" "b/docs/\351\227\256\351\242\230\346\261\207\346\200\273/\346\261\207\346\200\273\350\241\250\344\270\211\346\235\241\344\270\273\347\272\277\344\277\256\345\244\215\346\226\271\346\241\210_2026-09-18.md" new file mode 100644 index 0000000..4ea074a --- /dev/null +++ "b/docs/\351\227\256\351\242\230\346\261\207\346\200\273/\346\261\207\346\200\273\350\241\250\344\270\211\346\235\241\344\270\273\347\272\277\344\277\256\345\244\215\346\226\271\346\241\210_2026-09-18.md" @@ -0,0 +1,66 @@ +# 姹囨�昏〃涓夋潯涓荤嚎淇鏂规 + 鎶曡祫銆屾寜椤圭洰鍚嶇О鏇存柊銆嶇幇鐘讹紙2026-09-18锛� + +> 缁撹鍏堣锛氫笁鏉′富绾夸笉鏄笁涓嫭绔� bug锛岃�屾槸 **涓�涓粺涓�鏍瑰洜锛堝叕寮忎笉閲嶇畻锛�+ 涓�澶勯〉鑼冨洿婕忛」 + 涓�澶勫彛寰勭己鍙�**銆� +> 璇佹嵁鏂囦欢锛歚_tmp\_qa_out\鐢熸垚_閬撹矾杩愯緭閲忔眹鎬昏〃_2026-08.xlsx`銆乣_tmp\_qa_out\gencols.txt`銆乣_tmp\_qa_out\genrows.txt`銆� + +## 涓�銆佷笁鏉′富绾跨殑鏍瑰洜 + +### 璇佹嵁锛堝垰澶嶆牳锛� + +| 椤� | 8鏈堝綋鏈堝�煎垪锛圦锛� | 8鏈堝悓姣斿垪锛圧锛� | 璇存槑 | +|---|---|---|---| +| 鍏氦 / 鍑虹 / 缃戠害杞� / 鐝嚎鍖呰溅 / 杞ㄩ亾銆佽疆娓� | **鏈夊叕寮�**锛坄=Q9+Q13+鈥锛夛紝**鏃犵紦瀛樺��**锛坈ached=None锛� | 鏈夊叕寮� | 鍏紡鍐欎簡浣嗘病绠楋紝璇诲�煎伐鍏峰彧鐪嬪埌绌�/鏃у�� | +| 鍩庡競瀹㈣繍 / 涓彛寰勬槑缁� | **杩炲叕寮忛兘娌℃湁**锛圦5=None銆丵9=None锛� | **鏈夊叕寮�**锛坄=Q5/AJ5-1`锛� | 鍚屾瘮鍐欏湪銆佸綋鏈堝�兼病鍐� 鈫� 鍏稿瀷"椤佃寖鍥翠笉涓�鑷�" | +| 涓彛寰勬帓鍚� | `K3='=SUM(K4:K20)'`銆乣O3='=SUM(O4:O20)'`锛堟棤缂撳瓨鍊硷級 | `M3=0.7424`銆乣Q3=0.2317` **鏄啓姝荤殑鏁�** | SUM 娌¢噸绠� + 鍏ㄧ渷鍚屾瘮鍐欐鎴愬簱鍐呭叏鐪佸彛寰� | + +### 鍏抽敭浜嬪疄 + +1. **姣嶇増鏈韩灏辨槸鍏紡椹卞姩鐨�**锛堜笉闇�瑕佷汉宸ュ啀鍋氭ā鏉匡級锛� + - 鍏ㄧ渷琛� = 危17 甯傚窞锛歚鍏氦!C5 = =C9+C13+鈥�+C73`銆乣涓彛寰勬槑缁�!C5 = =C6+C7+C8+C9`锛� + - 鍩庡競瀹㈣繍 / 涓彛寰勬槑缁嗙殑甯傚窞琛� = 璺ㄨ〃寮曠敤锛歚鍩庡競瀹㈣繍!C9 = =鍏氦!C16+鍑虹!C16+缃戠害杞�!C16+'杞ㄩ亾銆佽疆娓�'!C9`銆乣涓彛寰勬槑缁�!C11 = =鐝嚎鍖呰溅!C8`銆� + - 鎵�浠ヨ繖涓ら〉**鏍规湰涓嶉渶瑕佸崟鐙啓鏁版嵁**锛屽彧瑕�"鎸夋湀鍙崇Щ鍏紡"琛ラ綈 + 閲嶇畻锛屾暣椤佃嚜鍔ㄥ氨瀵广�� +2. **涓や釜"琛ュ叕寮�"鍑芥暟鐨勯〉鑼冨洿涓嶄竴鑷�**锛坄SummaryWorkbookFiller.java`锛夛細 + - `ensureMonthYoyFormulas()` 鐢� `isMonthLedgerSheet()` 鈫� 鍚� 鍩庡競瀹㈣繍 / 涓彛寰勬槑缁� / 鍏矾鎬诲杩愶紱 + - `ensureMonthFormulas()` 鐢� `isFilledLedgerSheet()` 鈫� 鍙湁 6 涓彴璐﹂〉锛堣揣杩�/鐝嚎鍖呰溅/鍏氦/鍑虹/缃戠害杞�/杞ㄩ亾杞浮锛夆啇 **婕忛」灏卞湪杩欓噷**銆� +3. **鐢熸垚浠堕噷鐨勫叕寮忔病鏈夌紦瀛樺��**锛歅OI 鍐欐枃浠舵椂涓嶉噸绠楋紝姣嶇増閲� 7 鏈堢殑缂撳瓨鍊艰鍘熸牱鐣欎笅锛屾墍浠�"鍏ㄧ渷琛�/绱/鎺掑悕鍋滃湪涓婁竴鏈�"銆侲xcel 鎵撳紑闈� `fullCalcOnLoad` 浼氱畻锛屼絾**绯荤粺棰勮銆佷簩娆″鐞嗐�侀儴鍒� WPS 閮界湅涓嶅埌鏂板��**銆� + +### 褰掔撼 + +| 涓荤嚎 | 鐜拌薄 | 鏍瑰洜 | +|---|---|---| +| 1 | 鍩庡競瀹㈣繍 / 涓彛寰勬槑缁� 8鏈堟暣鍒楃┖鐧姐�佺疮璁�=1~7鏈� | `ensureMonthFormulas()` 椤佃寖鍥存紡浜嗚繖涓ら〉 | +| 2 | 鍏氦/鍑虹/缃戠害杞�/鍩庡競鍒嗗競宸炵殑**鍏ㄧ渷琛�**鍋滃湪 7 鏈� | 鍏紡鏃犵紦瀛樺�硷紙鏈噸绠楋級 | +| 3 | 涓彛寰勬帓鍚嶆暟鎹笉瀵� | 鍚屼富绾� 2锛涘彟鍔�"鍏ㄧ渷鍚屾瘮"鍐欐鎴愬簱鍐呭叏鐪佸彛寰勶紙1-8鏈� 27524.49锛変笌 危17甯傚窞锛�24481.74锛夋墦鏋� | + +## 浜屻�佷慨澶嶆柟妗堬紙4 姝ワ級 + +1. **琛ュ叕寮忛〉鑼冨洿**锛歚SummaryWorkbookFiller.ensureMonthFormulas()` 鐨勯〉鍒ゆ柇鏀圭敤 `isMonthLedgerSheet`锛堝惈 鍩庡競瀹㈣繍 / 涓彛寰勬槑缁� / 鍏矾鎬诲杩愶級銆� + 鍙︼細涓彛寰勬槑缁嗛噷鏈� 4 涓�**鏁板�艰**锛堝競宸�"鍩庨檯鍩庝埂宸℃父鍑虹/缃戠害杞�"鏄‖缂栫爜鏁帮紝涓嶆槸鍏紡锛夛紝闇�瑕佹寜搴撻噷婧愭暟鎹洖濉紝涓嶈兘鍙潬鍏紡鍙崇Щ銆� +2. **鐢熸垚鏀跺熬鍋氬叕寮忛噸绠�**锛氬湪鍐欐枃浠跺墠鐢� `XSSFFormulaEvaluator.evaluateAll()` 鎶婃暣鏈畻涓�閬嶅苟鍐欏叆缂撳瓨鍊硷紙閫愰〉 try-catch锛涘け璐ュ垯淇濈暀 `fullCalcOnLoad=true` 闄嶇骇锛夈�� + 濂藉锛氬叏鐪佽銆佺疮璁″垪銆佹帓鍚� SUM銆佸煄甯傚杩�/涓彛寰勬槑缁嗚法琛ㄥ紩鐢�**涓�娆℃�у叏閮ㄨ嚜鍔ㄥ嚭鍊�**锛屼笉鐢ㄥ啀璁ㄨ"鍏ㄧ渷鎸夊摢涓彛寰�"鈥斺�旀瘝鐗堝彛寰勫氨鏄� 危17 甯傚窞銆� +3. **缁熶竴涓彛寰勫彛寰�**锛� + - `exportPassengerMidRank()` 鍏ㄧ渷琛屽悓姣斾笉鍐嶅啓姝诲簱鍐呭叏鐪佸�硷紝鏀规垚涓� 危甯傚窞 鍚屾簮锛� + - `loadMidClassMap()` 琛� dim3 宸℃父鍑虹 + dim4 缃戠害杞︼紙鐜板湪鍙浜嗙彮绾� + 鍏氦涓ょ淮锛屾墍浠ョ嫭绔嬨�婄敓鎴恄鍏矾鏃呭涓彛寰勬槑缁嗐��1鏈堝叏鐪佸皯 535.83+333.39锛夈�� +4. **寤哄洖褰掓瘮瀵硅剼鏈�**锛氭瘡娆$敓鎴愬悗閫愰〉閫愭牸涓�"姣嶇増鍏紡 + 搴撴簮鏁版嵁閲嶇畻"姣斿锛屼綔涓洪獙鏀跺熀绾匡紙鍙鐢� `_tmp\_qa_out` 閲屽凡鏈夌殑瀵规瘮鑴氭湰锛夈�� + +### 闇�瑕佷笟鍔$‘璁わ紙涓嶉樆濉炰慨澶嶏級 + +- 搴撻噷 h2031銆屽叏鐪併�嶈 1-8 鏈� = 27524.49锛屾瘮 危17 甯傚窞澶� **3042.75**銆備慨澶嶄竴寰嬫寜姣嶇増鍙e緞锛埼e競宸烇級璧帮紱杩欎釜宸紓鎰忓懗鐫�浼佷笟涓婃姤鐨�"鍏ㄧ渷"鍚競宸炴槑缁嗕箣澶栫殑鏁版嵁锛堟垨鏌愬競宸炴紡鎶ワ級锛屽缓璁笟鍔′晶鏍镐竴娆°�� + +## 涓夈�佹姇璧勶細鎸夐」鐩悕绉版洿鏂� / 鏂板椤圭洰褰掑埌瀵瑰簲妯″潡 + +### 鐜扮姸锛堝凡鏍稿疄锛岀▼搴忕‘瀹炴槸鎸夐」鐩悕绉拌蛋鐨勶級 + +- **瀵煎叆渚�**锛歚DataImportService.saveInvestProjectRow()` / 鍏ㄧ渷姹囨�诲ぇ琛ㄨ矾寰勶紝浠ャ��**椤圭洰鍚嶇О + 绫诲埆**銆嶄负涓氬姟涓婚敭 upsert 鈥斺�� 鍛戒腑鍒欐洿鏂板瓧娈� + 鍐欏綋鏈熸湀搴︼紝鏈懡涓垯**鏂板**骞跺甫涓婅鏂囦欢鐨勫競宸炰笌绫诲埆锛堝杩愮珯鍦� / 鐗╂祦鍥尯锛夈�� + 搴撳唴鎶芥煡锛氬杩愮珯鍦� 49 鏉� / 49 涓悕绉帮紝鐗╂祦鍥尯 135 鏉� / 135 涓悕绉帮紝**鏃犻噸澶嶈**銆� +- **鐢熸垚渚�**锛歚ReportExportService.matchInvest()` 鏄寜鍚嶇О锛堝綊涓�鍖� + 甯傚窞 + 绫诲埆杩囨护锛夊幓鍖归厤妯℃澘琛岋紝涓嶆槸鎸夊垪浣�/琛屽彿鍙栨暟銆� +- **鍚屽悕淇濇姢**锛氬凡瀹炵幇"甯傚窞涓�鑷存�ф牎楠�"锛堝簱涓綊灞炲競宸炰笌鏈瑙f瀽涓嶄竴鑷� 鈫� 璺宠繃璇ヨ骞跺湪椤甸潰寮圭獥鎻愮ず锛夈�� +- **涓嶆ā绯婂尮閰�**锛歚normInvestName()` 鍙仛鎷彿/杩炴帴绗�/鐪佸競鍘垮墠缂�褰掍竴锛屼笉鍋氳繎浼煎悎骞� 鈫� 绗﹀悎"鍚嶇О鏈夊樊寮傚氨鏄袱涓」鐩�"銆� + +### 缂哄彛锛堝氨鏄綘璇寸殑"鏂板椤圭洰瑕佸綊鍒板搴旀ā鍧椾笅闈�"锛� + +1. 妯℃澘閲�**娌℃湁鐨勬柊椤圭洰鐩墠涓嶄細鑷姩鎻掕**锛歚investPlan`锛堝叏鐪侀瀹夋帓锛夌瓑鐢熸垚鍣ㄥ彧鐢� `matchInvest` 鍖归厤宸叉湁妯℃澘琛岋紝**鍖归厤涓嶅埌鐨勬柊椤圭洰浼氳涓㈡帀**锛屼笉浼氭寜甯傚窞/鏉垮潡鎻掑埌瀵瑰簲浣嶇疆銆� + 鈫� 闇�鍔�"鎻掕"閫昏緫锛氭寜 甯傚窞 + 绫诲埆锛�+璧勯噾娓犻亾鍒嗙粍锛夊畾浣嶅潡鍖洪棿锛屽湪鍧楁湯灏炬彃琛屻�佸鍒剁浉閭昏鏍煎紡涓庡叕寮忋�佸啓椤圭洰鍚嶄笌鏂版暟鎹紝骞舵洿鏂板悎璁¤鑼冨洿銆� +2. **"妯″潡"鏈�缁嗕竴灞傜幇鍦ㄥ叆涓嶄簡搴�**锛氫袱寮犳槑缁嗚〃鐨�"涓�銆佷娇鐢ㄤ氦閫氶儴杞﹁喘绋庤祫閲� / 浜屻�佺渷鐕冩补绋� / 涓夈�佸啘鏉戠患鍚堣繍杈撴湇鍔$珯 / 鍥涖�佸�欒溅浜�"鍒嗙粍琛岋紝鍦ㄥ鍏ユ椂琚� `^[涓�浜屼笁鍥涗簲鍏竷鍏節鍗乚+銆�.*` 瑙勫垯**涓诲姩璺宠繃**锛屾墍浠ラ」鐩惤涓嶅埌鍏蜂綋娓犻亾鍧椼�� + 鈫� 闇�缁� `investment_project` 鍔� `fund_channel` 瀛楁锛屽鍏ユ椂璁板綍"褰撳墠鍒嗙粍"鍐欏埌鍏跺悗椤圭洰涓婏紝鍐嶉噸瀵� 7/8 鏈堛�� +3. 鍚屽悕涓嶅悓椤圭洰鐩墠**涓嶅脊绐�**锛堝彧鏈夊競宸為敊浣嶅脊绐楋級銆� \ No newline at end of file -- Gitblit v1.9.1