From 427cb62b464b3c16748890848f31b9dcf812169b Mon Sep 17 00:00:00 2001 From: zhizhijie <zhizhijie@users.noreply.gitee.com> Date: 星期五, 18 九月 2026 15:06:52 +0800 Subject: [PATCH] feat(导入): 网约车订单报告支持 Word 2003 XML（WordML）＋格式嗅探与友好提示 --- docs/工作日结/工作日结_2026-09-18.md | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 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-18.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-18.md" index f1a92f4..033c6b2 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-18.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-18.md" @@ -60,6 +60,23 @@ 閭ｆ槸鎺у埗鍙颁腑鏂囦贡鐮侀�犳垚鐨勮璇伙紱姣嶇増/妯℃澘鐪熷疄鍏紡鏄纭殑 `=[1]鍑虹!C13-[1]鍑虹!C15` / `=[1]缃戠害杞�!C13-[1]缃戠害杞�!C15`锛� 鍙拌处椤点�屾�婚噺鈭掑煄甯傚唴銆嵨�17 甯傚窞 = 535.83 / 333.39锛屼笌姣嶇増瀹氱鍏ㄧ渷琛屽畬鍏ㄤ竴鑷淬��**姣嶇増鍏紡涓嶉渶瑕佷慨锛屼箣鍓�"寰呬慨姣嶇増"鐨勭粨璁轰綔搴熴��** +### 5. 缃戠害杞﹁鍗曟姤鍛婏細Word 2003 XML锛圵ordML锛夊吋瀹瑰鍏ワ紙15:00锛� + +**鐢ㄦ埛鎶ラ殰**锛氥�婃箹鍖楃綉缁滈绾﹀嚭绉熸苯杞�2025骞�09鏈堝垎鏋愭姤鍛�.docx銆嬫斁鍦ㄦ闈㈠涓嶈繘鍘汇�� + +**瀹氫綅**锛氳鏂囦欢鏍规湰涓嶆槸 docx 鈥斺�� 鏄� **Word 2003 XML锛圵ordML 骞抽摵 XML锛�** 琚敼鍚嶆垚 `.docx`锛堟枃浠跺ご `<?mso-application progid="Word.Document"?><w:wordDocument xmlns:w=".../word/2003/wordml">`锛�3.1MB 绾� XML銆佷笉鏄� zip 鍖咃級锛孭OI 鐨� `XWPFDocument` 鍙兘璇� OPC(zip) 鍖� 鈫� 鎶� `File is not a zip file`銆傜洃绠″钩鍙�/鍚屼簨闂存祦杞殑鎶ュ憡甯告槸杩欑鏍煎紡锛屼細鍙嶅鍑虹幇銆� + +**鏀瑰姩锛坄DataImportService.java`锛�**锛� +- `importWycOrderReport()` 鍏ュ彛鎸夋枃浠跺ご鍡呮帰鏍煎紡鍒嗘淳锛歾ip鈫抎ocx锛沗<w:wordDocument`+`wordml`鈫�**鏂板 WordML DOM 瑙ｆ瀽璺緞**锛沗D0CF11E0`鈫掓槑纭彁绀恒��.doc 璇峰彟瀛樹负 docx銆嶏紱鍏跺畠鈫掋�屾棤娉曡瘑鍒�嶏紱 +- 鏂板 `isWordPackage()`锛歾ip 浣嗘棤 `word/document.xml`锛坸lsx 鏀瑰悕锛夆啋 涓枃鎻愮ず锛屼笉鍐嶆姏 XMLBeans 鑻辨枃鍫嗘爤锛� +- 鏂板 `parseXmlSafely()`锛欴OM 瑙ｆ瀽鍏抽棴澶栭儴瀹炰綋/DTD锛堥槻 XXE锛夛紱 +- 琛ㄦ牸鍖归厤鎶芥垚涓庢牸寮忔棤鍏崇殑 `matchWycOrderTable()`锛宒ocx 涓� WordML 涓ゆ潯璺緞**鍏辩敤鍚屼竴濂楄〃澶磋瘑鍒�/17 甯傚窞鍙栧��/鍚堣琛岄�昏緫**锛屼笉浼氬彛寰勫垎鍙夛紱 +- 鎶ヨ〃鏈熻瘑鍒娊鎴� `periodOfParagraphs()`锛屼袱绉嶆牸寮忓叡鐢ㄣ�� + +**楠岃瘉**锛�8 鏉＄敤渚嬪叏閮ㄩ�氳繃锛堣銆婂姛鑳芥祴璇曟姤鍛奯缃戠害杞﹁鍗曟姤鍛奧ordML鍏煎瀵煎叆_2026-09-18銆嬶級銆�2025-09 鍏ュ簱锛氳鍗曞悎璁� 17,652,159锛涙姹� 8,076,610 / 榛勭煶 676,644 / 鍗佸牥 1,048,593 / 鎭╂柦 804,736 / 鏋楀尯 1,424锛屼笌鎶ュ憡闄勪欢1 閫愰」涓�鑷达紱pin 浠� `wyc_total_monthly` 鍚屾湡澶嶅埗銆傜湡 docx锛�2026-08锛夐噸瀵煎箓绛夋棤鍙樺寲锛沗.doc`銆亁lsx 鏀瑰悕銆侀潪鏈姤鍛� docx 涓夌璐熷悜鍧囩粰鍑轰腑鏂囧彲鎿嶄綔鎻愮ず銆� + +**鏁版嵁缂哄彛宸茶ˉ榻愶紙閲嶈锛�**锛氱敤鎴峰湪 14:21~14:49 涔嬮棿鑷瀵煎叆 2026-01~06锛�6 浠斤級銆�2025-01銆�2025-10~12锛�2025-09 鐢辨湰娆′慨澶嶅悗琛ュ叆銆傜幇鍦� **2025-01~12 + 2026-01~08 鐨勮鍗曚笌 pin 鍏ㄩ儴榻愬叏**銆傜洿鎺ユ晥鏋滐細涓彛寰勭淮搴� 4 鐨� 1~6 鏈堜粠銆屾棤婧愩�嶅彉涓恒�屽彲绠椼�嶏紝**涓彛寰勬帓鍚嶄欢涓庝腑鍙ｅ緞鏄庣粏浠剁殑绱鍙ｅ緞鑷姩褰掍竴**锛堜袱鑰� 1-8 鏈堢疮璁″潎涓� 31528.0606锛屾鍓嶅樊 2063.45锛夈�� + ## 浜屻�佹祴璇曠粨鏋滄憳瑕� 瑙� `docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_姹囨�昏〃鍏紡鎵╅〉涓庨噸绠梍2026-09-18.md`锛�8 鏉℃鍚� + 4 鏉¤礋鍚�/杈圭晫 + 4 椤瑰叆搴撴娊鏌ワ紝鍏ㄩ儴閫氳繃銆� @@ -88,15 +105,18 @@ - 鍥炲綊锛氭眹鎬诲ぇ琛� 17 椤� **0 鏍煎樊寮�**銆併�婄敓鎴恄涓彛寰勬帓鍚嶃��**0 鏍煎樊寮�**锛� 鏄庣粏浠跺樊寮備粎钀藉湪 鎬昏 / 鍑虹鍩庝埂 / 缃戠害杞﹀煄涔� 琛岀殑鏈堜唤鍒椾笌 AA 绱鍒楋紙灞為鏈燂級銆� +### 缃戠害杞﹁鍗曟姤鍛� WordML 瀵煎叆锛�15:00锛夐獙璇� + +- 8 鏉＄敤渚嬶紙4 姝ｅ悜 / 3 璐熷悜 / 1 杈圭晫锛夊叏閮ㄩ�氳繃锛歐ordML 2025-09 瀵煎叆鎴愬姛銆佹姤琛ㄦ湡鐣欑┖鏃堕潬鏍囬鑷姩璇嗗埆銆佺湡 docx 骞傜瓑鏃犲彉鍖栥�乣.doc`/xlsx 鏀瑰悕/闈炴湰鎶ュ憡 docx 鍧囩粰鍑轰腑鏂囨彁绀恒�� +- 鏁版嵁琛ラ綈鍚庨噸璺� 8 鏈堝鍑哄洖褰掞細鐙珛銆婄敓鎴恄涓彛寰勬槑缁嗐�嬫姤琛ㄦ湡鍐呬笉涓�鑷� 0銆佹姤琛ㄦ湡鍚庝粛鏈夊�� 0锛涗笌姹囨�诲ぇ琛ㄣ�屼腑鍙ｅ緞鏄庣粏銆嶉〉 **704 瀵规牸 0 宸紓**锛涘叏鐪� 1-8 鏈堟�诲杩愰噺 3733.79鈥�4003.57锛岀綉绾﹁溅鍩庝埂 333.39鈥�426.56锛岀疮璁� AA5=31528.0607銆丄A9=2911.47銆� +- 鎺掑悕浠朵笌鏄庣粏浠剁疮璁″彛寰勪竴鑷达紙鍧� 31528.0606锛夛紝宸�� 2063.45 娑堝け銆� + ## 涓夈�侀仐鐣欓棶棰樹笌寰呭姙 1. ~~涓彛寰勬帓鍚嶅悓姣斾粛鏄啓姝诲�紐~ 鈫� **宸叉寜鏂板彛寰勫彇鍊�**锛圡3=0.638 / Q3=0.2247锛夛紝浣嗕粛涓庝腑鍙ｅ緞鏄庣粏鐨� 0.0581 涓嶈嚜娲斤紝宸�� 2063.45 = 缃戠害杞� 1-6 鏈堟棤婧愶紱**鏀跺彛鍔炴硶瑙佷笅鏂�"绗� 3 姝ユ敹鍙ｅ缓璁�"**銆� 2. ~~`loadMidClassMap()` 缂哄贰娓稿嚭绉� + 缃戠害杞︿袱缁磣~ 鈫� **宸茶ˉ**锛堢淮搴� 3銆�4锛夛紝鐙珛涓彛寰勬槑缁嗗洓缁撮綈鍏ㄣ�� 3. ~~**姣嶇増缂洪櫡寰呬慨**锛氫腑鍙ｅ緞鏄庣粏鍩庡競绾у叕寮忓紩閿欓〉~~ 鈫� **璇垽锛屽凡浣滃簾**锛氱湡瀹炲叕寮忔槸姝ｇ‘鐨勮法绨垮紩鐢紝姣嶇増鏃犻渶淇敼锛涘綋鏃剁殑"寮曢敊椤�"鏄帶鍒跺彴涓枃涔辩爜璇銆� -4. **鏁版嵁缂哄彛锛堝凡鏍稿疄锛屽睘婧愬ご灏辨病鏈夛級**锛�2026-01~06 缃戠害杞﹁鍗曞湪**婧愭枃浠�**銆婃ā鏉縚缃戠害杞﹁鍗曞強鍏ㄧ渷鎬婚噺.xlsx銆嬮噷灏辨槸绌虹殑锛堝彧鏈夊叏鐪� pin銆佹棤璁㈠崟鍒楋級锛� - 涓嶆槸瀵煎叆澶辫触鈥斺�擿wyc_order_monthly` 璇� 6 鏈� `order_*` 鍏� NULL 涓庝箣鍚诲悎锛堝鍏ユ壒娆� `WYC_ORDER`锛�09-04锛夈�� - 褰卞搷闈㈠彧鏈変竴涓細`WycSplitCalc.calc()` 鍥� `orderSum<=0` 绠椾笉鍑虹綉绾﹁溅鎷嗗垎 鈫� 缁村害 4 璇� 6 涓湀鏃犳簮锛堢幇宸茬敱绗� 4 鏉℃敼鍔ㄤ繚鐣欐瘝鐗堝畾绋垮�煎厹浣忥級銆� - **寤鸿**锛氱粰缃戠害杞﹁鍗曞鍏ュ姞涓�鏉°�岃鍗曞垪鍏ㄧ┖銆嶇殑鏄惧紡鎻愮ず锛堢幇鍦ㄤ細闈欓粯鎴愬姛锛夛紝骞惰涓氬姟纭杩� 6 涓湀璁㈠崟鏄惁鍙ˉ銆� +4. ~~**鏁版嵁缂哄彛**锛�2026-01~06 缃戠害杞﹁鍗曟湭鍏ュ簱~~ 鈫� **宸茶ˉ榻�**锛堢敤鎴� 14:21~14:49 瀵煎叆 2026-01~06 + 2025-01 + 2025-10~12锛�2025-09 缁� WordML 淇鍚庤ˉ鍏ワ級銆傜幇鍦� 2025-01~12 + 2026-01~08 璁㈠崟榻愬叏锛岀淮搴� 4 鍏ㄦ湡鍙畻锛屾帓鍚嶄欢/鏄庣粏浠跺彛寰勫綊涓�銆備粛寤鸿琛ヤ竴鏉°�屽鍏ユ椂璁㈠崟鍒楀叏绌恒�嶇殑鏄惧紡鎻愮ず锛堛�婃ā鏉縚缃戠害杞﹁鍗曞強鍏ㄧ渷鎬婚噺.xlsx銆嬮偅绫绘枃浠剁幇鍦ㄤ細闈欓粯鎴愬姛锛夈�� 5. 搴撳唴 h2031銆屽叏鐪併�嶈 鈮� 危17 甯傚窞锛�1-8 鏈� 27524.49 vs 24481.74锛屽樊 3042.75锛夛細涓氬姟鍙ｅ緞闂锛屽缓璁笟鍔′晶鏍稿銆� 6. 鎶曡祫锛氭ā鏉块噷娌℃湁鐨勬柊椤圭洰涓嶄細鑷姩鎻掕锛涙槑缁嗚〃璧勯噾娓犻亾鍒嗙粍琛屾湭鍏ュ簱锛堥渶鍔� `fund_channel`锛夛紱鍚屽悕涓嶅悓椤圭洰鏈脊绐椼�� 7. 鎶曡祫涓ゅ紶鏄庣粏琛紙`X鏈堝杩愮珯鎶曡祫鏄庣粏琛╜ / `X鏈堢墿娴佺珯鍦烘姇璧勬槑缁哷锛夌敓鎴愬櫒鏈仛銆� @@ -116,6 +136,6 @@ ## 鍥涖�佹槑澶╄鍒� 1. 绗� 3 姝ユ敹鍙ｏ細鎺掑悕浠朵笌鏄庣粏浠跺彛寰勫綊涓�锛堝樊鍊� 2063.45 = 2026 骞� 1-6 鏈堢綉绾﹁溅鍩庝埂锛夆啋 鎺掑悕浠舵敼鍙栨眹鎬昏〃鍚屾簮鍊� 鈫� 鍥哄寲"鐢熸垚浠� vs 姣嶇増閲嶇畻"閫愭牸鍥炲綊鑴氭湰銆� -2. 缃戠害杞﹁鍗曞鍏ョ┖鍒楁彁绀猴紙椤甸潰鏄庣‘鎻愮ず"璇ユ湡璁㈠崟鍒椾负绌猴紝鏈啓鍏ヨ鍗曟暟"锛�+ 鍚戠敤鎴风‘璁� 2026-01~06 鏄惁琛ユ暟銆� +2. 缃戠害杞﹁鍗曞鍏ョ┖鍒楁彁绀猴紙椤甸潰鏄庣‘鎻愮ず"璇ユ湡璁㈠崟鍒椾负绌猴紝鏈啓鍏ヨ鍗曟暟"锛夆�斺�旀暟鎹櫧宸茶ˉ榻愶紝浣嗛潤榛樻垚鍔熶粛鏄殣鎮ｃ�� 3. 鎶曡祫"鏂板椤圭洰鎻掕 + 鍒嗙粍琛屽叆搴擄紙`fund_channel`锛�"鏂规钀藉湴锛堢瓑鐢ㄦ埛瀵�"妯″潡"鍙ｅ緞鐨勬渶鍚庣‘璁わ級銆� 4. 鎶曡祫涓ゅ紶鏄庣粏琛ㄧ敓鎴愬櫒锛坄X鏈堝杩愮珯鎶曡祫鏄庣粏琛╜ / `X鏈堢墿娴佺珯鍦烘姇璧勬槑缁哷锛夈�� -- Gitblit v1.9.1