From fb269f6de3e6b1faa8930a36fcb89d1928a484d4 Mon Sep 17 00:00:00 2001 From: zhizhijie <zhizhijie@users.noreply.gitee.com> Date: 星期一, 12 十月 2026 12:59:24 +0800 Subject: [PATCH] fix(汇总大表): 扩列改以当期产物为底（修 9 月丢 8 月列/累计漏月）并修体检误报 待验收 --- HANDOFF.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/HANDOFF.md b/HANDOFF.md index 8cdec2f..fe53f3d 100644 --- a/HANDOFF.md +++ b/HANDOFF.md @@ -4,6 +4,19 @@ > **姣忓ぉ缁撴潫鏃�**锛氭妸褰撳ぉ杩涘睍銆佽俯杩囩殑鍧戙�佹柊闇�姹傘�佹湭瀹屾垚浜嬮」鏇存柊鍒版湰鏂囦欢锛岀劧鍚庡彲浠ユ斁蹇冨紑鏂板璇濄�� > **鍗忎綔绾﹀畾锛�2026-08-31锛�**锛氳銆屾彁浜ゃ��= 鏈湴 commit + 鎺ㄩ�佸埌杩滅 git锛坥rigin main锛孏itblit锛夛紝涓嶅啀鍙仛鏈湴 commit銆� +### 10-12锛�3锛夛細淇��9 鏈堜骇鐗╀涪 8 鏈堝垪 / 绱婕忔湀銆嶁�斺�旀墿鍒楁敼涓�**浠ュ綋鏈熶骇鐗╀负搴�**銆愬緟楠屾敹銆� + +- **鐜拌薄锛堢敤鎴锋姤鍛婏級**锛氱敓鎴愮殑 9 鏈堟眹鎬诲ぇ琛ㄩ噷 **8 鏈堝垪鍏ㄧ┖**锛岀疮璁℃紡鎺� 8 鏈堬紙瑙勪笂璐ц繍閲忕疮璁℃樉绀� 31309.58锛屾纭簲涓� 1-7鏈� 27734.46 + 8鏈� 3665.36 + 9鏈� 3575.12 = **34974.95**锛夈�� +- **鏍瑰洜锛堥�愬眰璇佸疄锛�**锛氣憼 姣嶇増**涓嶅甫"褰撴湡鍒�"鐨勫�间笌鍏紡**鈥斺�擿fillFreightSheet` 鏄庣‘"鍙洖濉洰鏍囨湡褰撴湀锛�1..鐩爣鏈�-1 浠ユ瘝鐗堜负鍑�"锛屽叏鐪佽鍏紡鐢辩敓鎴愭椂鎸夊綋鏈熻ˉ锛涒憽 8 鏈堢殑鏁版嵁鍙惤鍦�**8 鏈堜骇鐗�**閲屻�佹湭鍥炲啓姣嶇増锛涒憿 9 鏈堟瘝鐗堟槸**浠� 8 鏈堟瘝鐗堟墿鍒�**鏉ョ殑 鈫� 缁ф壙"8 鏈堝垪绌�" 鈫� 鐢熸垚鏃跺張鍙ˉ 9 鏈� 鈫� 8 鏈堟案涔呯┖缂恒�佺疮璁� `=C+E+鈥�+Q(绌�)+S` 婕忔湀銆� +- **淇**锛氭墿鍒楀櫒**浼樺厛浠ャ�屽綋鏈熶骇鐗┿�嶄负搴�**锛堜骇鐗╁惈褰撴湡鍒楃殑鍊间笌鍏紡锛夆�斺�斿彇璇ユ湡**鏈�鏂颁骇鐗�**锛堝鍑鸿惤鐩樼紦瀛� `_cache/summaryWorkbook_<period>_month__v*.xlsx`锛屽鏍圭洰褰曞畾浣嶏級锛屽彇涓嶅埌鎵嶅洖閫�姣嶇増骞舵墦 WARN锛涘彟淇綋妫�瑙勫垯璇姤锛堚憽鍏ㄥ彛寰勭己澶辨椂涓嶅啀鎶�"瑙勪笅涓鸿礋"锛屾敼鎶�"缂衡憽鍏ㄥ彛寰� 鈫� 瑙勪笅鏃犳硶璁＄畻"锛屽惁鍒� 9 鏈堝彧鏈夎涓婃椂浼氬姣忎釜甯傚窞鍒峰睆锛夈�� +- **鍏抽敭瀹炵幇鐐�**锛氫骇鐗╃紦瀛樺畾浣嶅繀椤荤敤 3 鍊欓�夋牴鐩綍锛坄summaryTemplateDir` 鈫� `user.dir/鈥 鈫� `user.dir/../鈥锛夆�斺�旈鐗堢敤鍗曠浉瀵硅矾寰勶紝鍥� `spring-boot:run` 鐨勫伐浣滅洰褰曟槸**妯″潡鐩綍**鑰屾壘涓嶅埌锛岄潤榛樺洖閫�鍒颁簡姣嶇増锛堣〃鐜颁负"鏀逛簡浣嗚繕鏄┖"锛夈�� +- **楠岃瘉**锛歚docs/鐢熸垚姹囨�诲ぇ琛�/杈撳嚭/_鎵╁垪_2026骞�9鏈坃寰呯‘璁v3.xlsx`锛堟棩蹇楃‘璁� base=**浜х墿** `summaryWorkbook_2026-08_month__v37鈥lsx`锛夛細 + - 8 鏈堝垪鏈夊�硷細璐ц繍 鍏ㄥ彛寰� **16888.7615** / 瑙勪笂 **3665.3638** / 瑙勪笅 **13223.3977**锛涘叕浜ゅ叏鐪� **12315.37**锛� + - 绱鍏紡 **鍚� 8 鏈堜笌 9 鏈�**锛歚=C5+E5+鈥�+Q5+S5`锛涚疮璁″悓姣斿垎姣� `SUM(X5,Z5,鈥�,AL5,AN5)`锛�2025-01~09锛夛紱 + - 9 鏈堝垪鐣欑┖锛堟棤 9 鏈堟簮鏁版嵁锛夛紱7 涓爣棰橀〉鏍囬 **1-9鏈� / 9鏈�** 姝ｇ‘銆� +- **鍙ｅ緞缁撹锛堝啓杩涜璁★級**锛�**鏂版瘝鐗堜竴寰嬩粠"褰撴湡浜х墿"娲剧敓**锛堜骇鐗╁甫褰撴湡鏁版嵁涓庡叕寮忥級锛屼笉鍐嶄粠鏃ф瘝鐗堟淳鐢熲�斺�斿惁鍒欐瘡鏈堥兘浼氫涪"褰撴湡鍒�"锛岀疮璁￠�愭湀婕忔暟銆� +- **閬楃暀**锛氣憼 寰呯敤鎴风‘璁ゆ槸鍚︽妸 v3 钀界洏涓烘寮� 9 鏈堟瘝鐗堬紙浼氬厛澶囦唤鎵嬪伐鐗堬級锛涒憽 鎵╁垪浜х墿涓閲嶅啓鐨勫叕寮忔殏鏃犵紦瀛樺�硷紙鍙啓鍏紡 + `fullCalcOnLoad`锛孍xcel/WPS 鎵撳紑鑷姩绠楋級鈥斺�斿缓璁ˉ"鏁存湰閲嶇畻鍐欑紦瀛�"锛涒憿 `涓彛寰勬槑缁哷 琛ㄥご琛岃瘑鍒繑鍥� `[2,4]`锛岄渶鏍告煡銆� +- **鎶ュ憡锛堟湰鍦般�佷笉鍏ュ簱锛�**锛歚docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_鎵╁垪浠ュ綋鏈熶骇鐗╀负搴昣2026-10-12.md`銆傜姸鎬侊細**銆愬緟楠屾敹銆�**銆� ## 鏈�鏂帮紙2026-10-12锛寊yj 绾匡級 ### 10-12锛氭墿鍒楀櫒琛ャ�屾爣棰樻寜姣嶇増鏈熸閲嶅啓銆�+ 淇 8 鏈堟瘝鐗堟爣棰樸�愬緟楠屾敹銆� @@ -18,6 +31,34 @@ - **鎶ュ憡锛堟湰鍦般�佷笉鍏ュ簱锛�**锛歚docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_姹囨�诲ぇ琛ㄦ墿鍒楀櫒鏍囬淇_2026-10-12.md`锛涙棩缁� `docs/宸ヤ綔鏃ョ粨/宸ヤ綔鏃ョ粨_2026-10-12.md`銆� - **寰呯敤鎴烽獙鏀�/纭**锛氣憼 鏍囬鍙ｅ緞鎸�"**鏍囬鏈熸=姣嶇増鏈熸**"锛�8鏈堚啋1-8鏈�/8鏈堛��9鏈堚啋1-9鏈�/9鏈堬級鏄惁姝ｇ‘锛涒憽 `_鎵╁垪_2026骞�9鏈坃寰呯‘璁v2.xlsx` 鏄惁鏀瑰悕涓烘寮忓悕锛堝師鍚嶉偅浠芥槸鏃у唴瀹广�佽 WPS 瀛樿繃锛屾湭缁忓悓鎰忎笉鍔級锛涒憿 绱/绱鍚屾瘮"鏄惁鎵╁埌 9 鏈�"锛堜骇鍑�=宸叉墿銆佹墜宸ョ増鏈墿锛夈�� - **鐘舵��**锛�**銆愬緟楠屾敹銆�**銆� +### 10-12锛�2锛夛細璐ц繍鍙ｅ緞銆屽鍑哄墠鍩烘暟浣撴銆嶏紙B4锛�6 鏉¤鍒欒惤鍦般�愬緟楠屾敹銆� + +- **鑳屾櫙**锛氳涓� = 鈶°�婅揣杩愰噺鍛ㄨ浆閲忚〃銆嬪叏鍙ｅ緞 鈭� 鈶燞203-2 瑙勪笂梅10000锛屾槸**鍊掑噺**鈥斺�斺憼婕忔姤浼氳瑙勪笅铏氶珮銆佹瀬绔繕浼氱畻鍑鸿礋鏁般�傜敤鎴� 2026-10-12 鍚屾剰鎶婅繖缁勮鍒欏姞杩� B4銆� +- **瀹炵幇**锛氭柊澧� `reportexport/calc/FreightReadinessCheck.java`锛堝彧璇伙級锛涙帴鍏� `exportSummaryWorkbook` 鐨勭己鏁版敹闆� `dbProblems`锛堥殢瀵煎嚭鏃ュ織杈撳嚭锛夛紱鏂板鍙鎺ュ彛 `GET /api/report/summaryWorkbook/freightCheck?period=YYYY-MM`銆� +- **瑙勫垯**锛氣憼 鏌愬競宸炶涓嬩负璐燂紱鈶� 鈶℃湁鍏ㄥ彛寰勩�佲憼鏃犺涓婅褰曪紙鐤戞紡鎶モ啋瑙勪笅=鍏ㄥ彛寰勶級锛涒憿 鈶″叏鍙ｅ緞 < 鈶犺涓婏紱鈶� 危17 甯傚窞 鈮� 鈶�"婀栧寳鐪�"琛岋紙瀹瑰樊 0.01锛夛紱鈶� **鏈湀涓庝笂鏈堝畬鍏ㄧ浉鍚�**锛堢枒閲嶅瀵煎叆锛屼袱渚� 鈮�50 涓囧惃/涓囧惃鍏噷锛夛紱鈶� **鍚屾瘮寮傚父**锛坾鍘诲勾鍚屾湀鈫掓湰鏈坾 > 50%锛屼袱渚� 鈮�50锛夛紱鈶�' 绱鍕剧ń锛堚憼鍛ㄨ浆閲� 1..M 姹傚拰 梅10000 vs 鈶㈡媶鍒嗚〃 CUMULATIVE锛夈�� +- **闃堝�间慨姝ｏ紙瀹炴祴椹卞姩锛岄噸瑕侊級**锛氶鐗堢敤"瑙勪笅鐜瘮 > 30%" 鈫� 2026-02 鍛戒腑 22 鏉°��2026-03 鍛戒腑 32 鏉★紝澶嶆牳纭**鍏ㄦ槸鏄ヨ妭瀛ｈ妭鎬�**锛堝悇甯傚窞 2 鏈� 鈭�30~鈭�40%銆�3 鏈� +30~+60%锛夛紝闈炴暟鎹敊璇� 鈫� 鏀逛负"閲嶅瀵煎叆鐗瑰緛 + 鍚屾瘮>50%"锛涘苟缁欏垽鎹姞**缁濆闂ㄦ 50 涓囧惃/涓囧惃鍏噷**锛岄伩鍏嶇鍐滄灦鏋楀尯锛�20~46 涓囧惃锛夎繖绫诲皬鍩烘暟鍣０闀挎湡鎶ヨ銆� +- **瀹炴祴**锛�2026-01~08 **鍏ㄦ湡 0 鍛戒腑**锛堟棤璇姤锛夛紱鈶¤〃 `last_freight_m08`/`last_turnover_m08` **18/18 琛屾湁鍊�** 鈫� 鍚屾瘮瑙勫垯纭疄鍙備笌璁＄畻锛堥潪绌鸿窇锛夈�� +- **鎶ュ憡锛堟湰鍦般�佷笉鍏ュ簱锛�**锛歚docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_璐ц繍鍩烘暟浣撴B4鍏潯瑙勫垯_2026-10-12.md`锛涙棩缁撳悓鏃ヤ袱鏉°�� +- **寰呯敤鎴烽獙鏀�/纭**锛氣憼 闃堝�硷紙缁濆闂ㄦ 50銆佸悓姣� 50%锛夋槸鍚﹀悎閫傦紱鈶� 鏄惁鐜板湪鍋� B4 鍓╀綑閮ㄥ垎鈥斺�斿鍑哄墠寮圭獥 + 鐢熸垚浠躲�婃暟鎹己澶辨竻鍗曘�嬮〉锛圥0-3 鍓╀綑锛夈�� +- **鐘舵��**锛�**銆愬緟楠屾敹銆�**銆傚彧璇诲姛鑳斤紝鏈敼鍔ㄤ笟鍔℃暟鎹�� +### 10-12锛�3锛夛細鐢熸垚鏁版嵁銆岄獙璇佹柟娉曘�嶆垚鏂囷紙浜旀閾炬潯 + 鍙嶅悓婧愮洸鍖猴級 + +- **鎴愭枃**锛歚docs/姹囨�诲ぇ琛ㄧ敓鎴愭暟鎹獙璇佹柟娉昣2026-10-12.md`锛堝洖绛�"濡備綍楠岃瘉绋嬪簭鐢熸垚鐨勬暟鎹槸鍚︽纭�"锛夈�� +- **鍙ｅ緞**锛氭妸闂鎷嗘垚 4 闂紙婧愭暟鎹� / 绠楁硶 / 鐗堝紡 / 涓庡畾绋夸竴鑷达級锛屾瘡娈甸厤涓�涓�**鐙珛浜庤娈电殑鍙傜収**锛涢摼鏉′簲娈� L0 婧愭枃浠垛啋搴撱�丩1 搴撯啋鍙ｅ緞鍊笺�丩2 鍙ｅ緞鍊尖啋鍗曞厓鏍笺�丩3 鍗曞厓鏍尖啋鏁存湰銆丩4 璺ㄩ〉鍚堟垚椤靛嬀绋斤紱**閫氳繃鏍囧噯 L0~L4 宸插啓姝�**锛堜换涓�灞傛湭瑕嗙洊锛岀粨璁轰笉寰楀啓"宸查獙璇�"锛夈�� +- **瀵规棦鏈�"鍥涘眰楠岃瘉娉�"锛�10-08/10-12 浼氳瘽锛夌殑涓夊琛ュ己**锛氣憼 琛� L0 婧愭暟鎹眰涓�**鍙嶅悓婧愮洸鍖�**鈥斺��"鐢熸垚浠� vs 瀹氱"鍦ㄦ瘝鐗堜笌瀹氱鍚屾簮鏃舵煡涓嶅嚭婧愭暟鎹棶棰橈紙浠婃棩 2025-11 涓ゅ鍗充緥锛夛紱鈶� **浣撴閫氳繃 鈮� 鏁版嵁榻愬叏**锛屽紓甯告竻鍗曚笌缂烘暟娓呭崟鍒嗗紑杈撳嚭锛堜粖鏃� 2026-08 浣撴 0 鍛戒腑锛屼絾 9 鏈堜欢 8 鏈堝垪浠嶇┖锛夛紱鈶� 蹇呴』涓撻棬鍋氫竴娆°�屽簱鍐呭�� vs 姣嶇増缂撳瓨銆嶅叏閲� diff锛�10-09 寰呭姙锛夆�斺��**鍑鸿〃鍙ｅ緞涓嶅垏搴�**涓�**楠岃瘉蹇呴』姣斾竴娆�**骞朵笉鐭涚浘銆� +- **浣愯瘉**锛�2026-08 vs 9/13 瀹氱锛�1020 鏉� 鈫� 11 鏉″叧娉紝绠楁硶灞傞�氳繃锛夛紱搴撳唴 2025 vs 姣嶇増 2025锛堝叕浜�/鍑虹/杞ㄩ亾杞浮 100% 涓�鑷达紝3 澶勯渶涓氬姟纭锛屾姤鍛婅 `docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_搴撳唴2025涓庢瘝鐗�2025閫愭牸鏍稿_2026-10-12.md`锛夈�� +- **鐘舵��**锛氭枃妗ｇ被锛屾棤闇�楠屾敹銆� +- **B4 鍏宠仈锛堝凡鏍革級**锛�10-12 涓婂崍鐨勮揣杩愬熀鏁颁綋妫� B4 宸茬敱鍙︿竴浼氳瘽鎻愪氦锛坄91f6583`锛屾姤鍛� `docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_璐ц繍鍩烘暟浣撴B4鍏潯瑙勫垯_2026-10-12.md`锛夛紱鏈 2026-08 鏍稿瀹為檯璋冪敤浜嗗畠鐨� `GET /api/report/summaryWorkbook/freightCheck`锛�2026-01~08 鍏ㄦ湡 0 鍛戒腑锛夈�� +### 10-12锛�4锛夛細姹囨�诲ぇ琛ㄣ�岀己鏁版竻鍗曘�嶈惤鍦帮紙鍙鎺ュ彛 + 鎺ュ叆瀵煎嚭鏃ュ織锛夈�愬緟楠屾敹銆� + +- **鍔ㄥ洜**锛氱敤鎴疯姹傛妸銆岀己鏁般�嶆樉寮忔憜鍒板彴闈笂鈥斺�斿綋鏃ヤ袱涓湡瀹為棶棰橈紙9 鏈堢敓鎴愪欢 8 鏈堝垪涓虹┖銆�9 鏈堝懆杞噺鍏� 0锛夐兘灞�"璇ユ湁鐨勬暟娌℃湁"锛岃�� `freightCheck` 浣撴褰撴椂 **0 鍛戒腑**锛屼袱鑰呭繀椤诲垎寮�銆� +- **瀹炵幇**锛氭柊澧� `reportexport/calc/SummaryMissingDataCheck.java`锛堝彧璇伙級锛涙帴鍙� `GET /api/report/summaryWorkbook/missing?period=YYYY-MM`锛涙帴鍏� `exportSummaryWorkbook` 鐨� `dbProblems`锛堥殢瀵煎嚭鏃ュ織杈撳嚭锛夈�� +- **鍙ｅ緞**锛氣憼 閫愭湀鍥炲～椤碉紙鐝嚎鍖呰溅/鍏氦/鍑虹/杞ㄩ亾杞浮锛夋煡 1..鐩爣鏈� 鏉ユ簮鏄惁鏈夋暟銆�17 甯傚窞鏄惁榻愬叏锛涒憽 璐ц繍/缃戠害杞﹀彧鍥炲～鐩爣鏈堬紝鏌ョ洰鏍囨湀鍚勯」鏉ユ簮锛堣揣杩愨憼+鈶�+鈶€�佺綉绾﹁溅璁㈠崟+鍏ㄧ渷 pin+鍑虹骞冲潎杩愯窛锛夛紱鈶� 杩欎袱椤电殑鍘嗗彶鏈堢敱姣嶇増鎵挎媴鈥斺��**姣嶇増涓庡悓鏈熷浠芥瘝鐗堬紙donor锛夐兘娌℃湁鏁�**鎵嶇畻缂哄彛锛堝惁鍒欎細璇姤 7 鏈堥偅绉�"楠ㄦ灦姣嶇増 + donor 杩樺師"锛夈�� +- **瀹炴祴**锛堢嫭绔� 8099 瀹炰緥锛屾湭鎵撴壈 8090锛屾祴瀹屽凡鍏筹紱`mvn -o compile` exit=0锛夛細2026-08 **0 鏉�**銆�2026-07 **0 鏉�**銆�2026-09 **11 鏉�**锛堢彮绾垮寘杞�/鍏氦/杞ㄩ亾杞浮/鍑虹 鏃犳簮 4 鏉� + 璐ц繍鈶♀憿 2 鏉� + 缃戠害杞� 3 鏉� + 姣嶇増 8 鏈堝垪绌� 2 鏉★級鈥斺�斿懡涓殑姝ｆ槸褰撴棩涓や釜鐪熷疄闂銆� +- **淇**锛氶鐗堝彧姣旀瘝鐗� 鈫� 璇姤 2026-07 涓ゆ潯锛涘凡鎸夌敓鎴愰摼瀹炵幇琛ヤ笂 donor 姣斿锛屽娴� 0 鏉°�� +- **鎶ュ憡锛堟湰鍦般�佷笉鍏ュ簱锛�**锛歚docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_姹囨�诲ぇ琛ㄧ己鏁版竻鍗昣2026-10-12.md`銆� +- **寰呭姙**锛氬鍑哄墠寮圭獥 + 鐢熸垚浠躲�婃暟鎹己澶辨竻鍗曘�嬮〉锛堜笌 B4 鐨� P0-3 鍚堝苟锛夈�� +- **鐘舵��**锛�**銆愬緟楠屾敹銆�**锛堝彧璇诲姛鑳斤紱鏈惤鐩樸�佹湭鏀逛笟鍔℃暟鎹級銆� ## 鏈�鏂帮紙2026-10-10锛寊yj 绾匡級 ### 10-10锛歋tep 1 鎵╁垪鍣ㄨ惤鍦� + 8鈫�9 鏈堢増寮忛杞骇鍑恒�愬緟楠屾敹銆� -- Gitblit v1.9.1