From 073605b6d62363dd7d48f5ca047a1d401418574a Mon Sep 17 00:00:00 2001 From: zzw <228544128@qq.com> Date: 星期日, 04 十月 2026 17:34:06 +0800 Subject: [PATCH] docs: record 2026-10-04 integration commit --- HANDOFF.md | 41 +++++++++++++++++++++++++++++++++++------ 1 files changed, 35 insertions(+), 6 deletions(-) diff --git a/HANDOFF.md b/HANDOFF.md index 56d211e..99d1ccf 100644 --- a/HANDOFF.md +++ b/HANDOFF.md @@ -289,14 +289,14 @@ ### 0.10 2026-09-28 涓撲笟閰嶇疆涓庢晠闅滅紪鍙疯嚜鍔ㄧ敓鎴愶紙鏈浼氳瘽锛屽凡瀹炵幇骞堕獙璇侊級 -鐢ㄦ埛鏈缁欏嚭鐨� 4 鏉℃柊闇�姹傦細鈶� 绯荤粺绠＄悊澧炲姞鈥滃伐绋嬩笓涓氶厤缃�濓紙瀛楁浠呭悕绉帮級锛涒憽 绯荤粺绠＄悊澧炲姞鈥淭闃熶笓涓氶厤缃�濓紙瀛楁鍚嶇О銆佸垎绫� A/B锛夛紱鈶� 鏁呴殰缂栧彿涓嶅啀鎵嬪伐杈撳叆锛屾敼涓烘寜 `娼�1鍩�-X鍙�/A-YYMMDD-nnn` 鑷姩鐢熸垚锛涒懀 娲惧崟鍙蜂负 `鏁呴殰缂栧彿/nn`锛屾壙淇崟浣嶅簭鍙蜂粠 01 璧枫�� +鐢ㄦ埛鏈缁欏嚭鐨� 4 鏉℃柊闇�姹傦細鈶� 绯荤粺绠＄悊澧炲姞鈥滃伐绋嬩笓涓氶厤缃�濓紙瀛楁浠呭悕绉帮級锛涒憽 绯荤粺绠＄悊澧炲姞鈥淭闃熶笓涓氶厤缃�濓紙瀛楁鍚嶇О銆佸垎绫� A/B锛夛紱鈶� 鏁呴殰缂栧彿涓嶅啀鎵嬪伐杈撳叆锛屾敼涓烘寜 `鍥哄畾鍓嶇紑-X鍙�/A-YYMMDD-nnn` 鑷姩鐢熸垚锛涒懀 娲惧崟鍙蜂负 `鏁呴殰缂栧彿/nn`锛屾壙淇崟浣嶅簭鍙蜂粠 01 璧枫�� 宸插疄鐜帮細 - 鈥滃伐绋嬩笓涓氶厤缃�濓細鑿滃崟 `/system/engineering-majors`锛屽瓧娈典粎鈥滃悕绉扳�濓紱琛� `LX.T_ENGINEERING_MAJOR(ID, NAME, CREATE_TIME, UPDATE_TIME)`锛涙帴鍙� `/api/system/engineering-majors`锛圙ET/POST/PUT/DELETE锛夈�� - 鈥淭闃熶笓涓氶厤缃�濓細鑿滃崟 `/system/team-majors`锛屽瓧娈碘�滃悕绉般�佸垎绫伙紙A/B锛夆�濓紱琛� `LX.T_TEAM_MAJOR(ID, NAME, CATEGORY, CREATE_TIME, UPDATE_TIME)`锛涙帴鍙� `/api/system/team-majors`锛圙ET/POST/PUT/DELETE锛夈�� - 涓ゅ閰嶇疆鍧囨牎楠屽悕绉伴潪绌轰笌閲嶅悕锛汿闃熶笓涓氬垎绫诲彧鍏佽 A/B銆傚惎鍔ㄦ椂 `DataInitializer.ensureMajorConfigMenus` 骞傜瓑琛ヨ彍鍗曪紝`seedMajors` 棰勭疆婕旂ず鏁版嵁锛氬伐绋嬩笓涓� 鍔ㄥ姏/鐢垫皵/娑插帇/杈呮満锛汿闃熶笓涓� 鍔ㄥ姏=A銆佹恫鍘�=A銆佺數姘�=B銆佽緟鏈�=B锛堥粯璁ゆ媶鍒嗭紝鍙湪椤甸潰淇敼锛夈�� -- 鏁呴殰缂栧彿鑷姩鐢熸垚锛歚BusinessService.generateFaultCode`锛屾牸寮� `娼�1鍩�-X鍙�/鍒嗙被-YYMMDD-nnn`銆� - - 鍓嶇紑鍥哄畾 `娼�1鍩�-`锛沊鍙峰彇 3 浣嶆暟瀛楋紙`X01` 鈫� `001`锛夈�� +- 鏁呴殰缂栧彿鑷姩鐢熸垚锛歚BusinessService.generateFaultCode`锛屾牸寮� `鍥哄畾鍓嶇紑-X鍙�/鍒嗙被-YYMMDD-nnn`銆� + - 鍓嶇紑鍥哄畾 `鍥哄畾鍓嶇紑-`锛沊鍙峰彇 3 浣嶆暟瀛楋紙`X01` 鈫� `001`锛夈�� - 鍒嗙被鍙栤�淭闃熶笓涓氶厤缃�濈殑 A/B锛涙湭閰嶇疆鎴栧垎绫婚潪娉曟椂淇濆瓨鎶ラ敊骞舵彁绀哄厛琛岀淮鎶ゃ�� - YYMMDD 鍙栦笂鎶ユ棩鏈燂紱nnn 涓衡�滃悓涓� X鍙� + 鍚屼竴 T闃熶笓涓� + 鍚屼竴涓婃姤鏃ユ湡鈥濈殑搴忓彿锛屼粠 001 璧枫�� - 鏂板缓鑷姩鐢熸垚锛涗慨鏀规椂寮哄埗娌跨敤鍘熺紪鍙凤紙鏀� T闃熶笓涓�/鏃ユ湡涔熶笉閲嶆柊鐢熸垚锛夈�� @@ -309,8 +309,8 @@ 楠岃瘉锛�2026-09-28锛夛細 - 鍚庣 `mvn -q -DskipTests package` 閫氳繃锛涘墠绔� `vue-cli-service build` 閫氳繃锛堜粎鏃㈡湁鍖呬綋绉彁绀猴級銆� - 鎺ュ彛锛氬伐绋嬩笓涓氥�乀闃熶笓涓氬悇杩斿洖 4 鏉★紱`/api/system/menu/nav` 绯荤粺绠＄悊涓嬫柊澧炰袱椤癸紙鎺掑簭 35/36锛夈�� -- 鑷姩缂栧彿锛歚X02 + 鍔ㄥ姏涓撲笟(A) + 2026-09-28` 鈫� `娼�1鍩�-002/A-260928-001`銆乣娼�1鍩�-002/A-260928-002`锛涙崲 T闃熶笓涓氾紙鐢垫皵 B锛夆啋 `娼�1鍩�-002/B-260928-001`锛涙崲涓婃姤鏃ユ湡 鈫� `娼�1鍩�-001/A-260929-001`锛涗慨鏀规晠闅滄敼 T闃熶笓涓氬悗缂栧彿淇濇寔涓嶅彉銆� -- 娲惧崟绔埌绔細涓�鏉℃晠闅滃垎閰嶄袱涓壙淇崟浣嶏紝鐢熸垚 `娼�1鍩�-002/B-260928-001/01`銆乣.../02`銆傛祴璇曟暟鎹凡浠� `LX.T_FAULT`銆乣LX.T_WORK_ORDER` 娓呯悊銆� +- 鑷姩缂栧彿锛歚X02 + 鍔ㄥ姏涓撲笟(A) + 2026-09-28` 鈫� `鍥哄畾鍓嶇紑-002/A-260928-001`銆乣鍥哄畾鍓嶇紑-002/A-260928-002`锛涙崲 T闃熶笓涓氾紙鐢垫皵 B锛夆啋 `鍥哄畾鍓嶇紑-002/B-260928-001`锛涙崲涓婃姤鏃ユ湡 鈫� `鍥哄畾鍓嶇紑-001/A-260929-001`锛涗慨鏀规晠闅滄敼 T闃熶笓涓氬悗缂栧彿淇濇寔涓嶅彉銆� +- 娲惧崟绔埌绔細涓�鏉℃晠闅滃垎閰嶄袱涓壙淇崟浣嶏紝鐢熸垚 `鍥哄畾鍓嶇紑-002/B-260928-001/01`銆乣.../02`銆傛祴璇曟暟鎹凡浠� `LX.T_FAULT`銆乣LX.T_WORK_ORDER` 娓呯悊銆� - 娴忚鍣細涓や釜鏂伴厤缃〉姝ｅ父娓叉煋锛涙晠闅滀笂鎶ユ柊澧炶〃鍗曗�滄晠闅滅紪鍙封�濆彧璇讳笖鍗犱綅鈥滀繚瀛樺悗鑷姩鐢熸垚鈥濓紝T闃熶笓涓�/宸ョ▼涓撲笟涓嬫媺涓洪厤缃」锛涗慨澶嶅悗鎺у埗鍙版棤鏂板鎶ラ敊銆� - 鍘嗗彶婕旂ず鏁呴殰浠嶄娇鐢� `GZ-2026-0xx` 鏃х紪鍙凤紙鏈縼绉伙紝閬垮厤褰卞搷宸叉淳宸ュ崟寮曠敤锛夛紱鏂板缓鏁呴殰涓�寰嬩娇鐢ㄦ柊瑙勫垯銆� - 鏂囨。宸插悓姝ワ細`requirement\鍐崇瓥琛╛寰呯‘璁ら」.md`銆乣鍓�44椤甸渶姹傛⒊鐞�.md`銆乣宸ョ▼鐘舵�佹満璁捐.md`銆乣鐣岄潰杩樺師.html`锛屼互鍙婇椤靛叕鍛娾�滄淳鍗曡鍒欌�濇枃妗堛�� @@ -646,7 +646,7 @@ **鏈浼氳瘽瀹屾垚锛堢粏鑺傝 0.10 / 0.11锛�** - 鍐崇瓥琛� B1鈥揃4 鎸夊缓璁叧闂苟钀藉湴锛氱郴缁熺鐞嗘柊澧炩�滃伐绋嬩笓涓氶厤缃�濓紙瀛楁锛氬悕绉帮級銆佲�淭闃熶笓涓氶厤缃�濓紙瀛楁锛氬悕绉般�佸垎绫� A/B锛夈�� -- 鏁呴殰缂栧彿鏀逛负鑷姩鐢熸垚锛歚娼�1鍩�-X鍙�/A-YYMMDD-nnn`锛圶鍙� 3 浣嶆暟瀛楋紝A锛漈闃熶笓涓� A/B锛宯nn 涓哄悓涓� X鍙凤紜鍚屼竴涓撲笟锛嬪悓涓�涓婃姤鏃ユ湡鍐呬粠 001 閫掑锛夛紱娲惧崟鍙凤紳`鏁呴殰缂栧彿/nn`锛堟壙淇崟浣嶅簭鍙凤紝浠� 01 璧凤級銆� +- 鏁呴殰缂栧彿鏀逛负鑷姩鐢熸垚锛歚鍥哄畾鍓嶇紑-X鍙�/A-YYMMDD-nnn`锛圶鍙� 3 浣嶆暟瀛楋紝A锛漈闃熶笓涓� A/B锛宯nn 涓哄悓涓� X鍙凤紜鍚屼竴涓撲笟锛嬪悓涓�涓婃姤鏃ユ湡鍐呬粠 001 閫掑锛夛紱娲惧崟鍙凤紳`鏁呴殰缂栧彿/nn`锛堟壙淇崟浣嶅簭鍙凤紝浠� 01 璧凤級銆� - 鏁呴殰涓婃姤椤碉細浠诲姟鐘舵�佹爣绛句笌浠诲姟鐘舵�佷笅鎷夋鎷嗘垚涓よ锛堟爣绛炬崲鍒颁笅涓�琛岋級銆� - 瀹屽伐淇℃伅涓婃姤椤碉紙AXU15锛夛細淇悗璐ㄩ噺鎯呭喌鐙崰鏁磋锛涢」鐩悕绉颁笌楠屾敹鏂瑰紡鍚屼竴琛岋紱鏁呴殰璇存槑銆佸師鍥犲垎鏋愬悇鐙崰鏁磋锛涒�滃鐞嗚В鍐虫儏鍐碘�濇敼涓哄彲澶氳鐨勮〃鏍硷紙搴忓彿锛忓鐞嗚В鍐虫儏鍐碉級锛涚淮淇櫒鏉愯〃鍒楁敼涓哄簭鍙枫�佸悕绉般�佽鏍煎瀷鍙枫�佹妧鏈弬鏁般�佹暟閲忋�佽閲忓崟浣嶃�佸悎鏍艰瘉鏄庛�佸嚭搴撳崟鍙枫�佹潵婧愩�佸娉ㄣ�傚悗绔柊澧� `LX.T_COMPLETION_INFO.SOLUTIONS_JSON` 涓� `MaterialItem.certificate`锛屽苟缁х画鍏煎鍘� `SOLUTION` 瀛楁銆� - 椤圭洰绾冲叆鍏徃 Git 浠撳簱锛歚http://admin@61.183.254.94:3000/r/EmergencyRepair.git`锛屽垎鏀� `main`锛岄鎻愪氦 `5305262`锛�103 涓枃浠讹級锛岄殢鍚� `0bacdcf` 琛ヨ杩滅淇℃伅銆� @@ -697,3 +697,32 @@ 2. `sensitive.js` 鏀瑰姩宸茶幏纭骞堕殢鏈鎻愪氦鎺ㄩ�侊紱`requirement\~$鍘熷闇�姹�.docx` 鏄� Word 閿佹枃浠讹紝涓嶈鎻愪氦銆� 3. 闇�姹備晶寰呯‘璁ら」涓嶅彉锛氬喅绛栬〃 B6鈥揃10銆丄XU15 瀛楁鏉ユ簮涓庡彲鏀规�с�佸畬宸ラ獙鏀跺悇鐜妭瑙掕壊涓庢墦鍗拌緭鍑恒�佷慨鍚庤川閲忚瘎绾т笌 AXU14 T鍛樿瘎鍒嗗瓧娈电殑鍏崇郴銆� 4. 鍚庣画鏀瑰姩瀹屾垚鍚庢帹閫佸埌鍏徃 Git 浠撳簱 `main` 鍒嗘敮銆� + +## 17. 鏀跺熬蹇収锛�2026-10-04 鍛ㄥ叚锛岄渶姹� 11 / 12 / 17-19 鑱旇皟鏀跺熬锛� + +**鏈疆瀹屾垚鍐呭** +- 闇�姹� 11锛氬畬宸ユ儏鍐靛鐞嗗皢鐘舵�佹敼涓衡�滃畬宸モ�濇椂锛屽彧鏇存柊娲惧伐鍗曠姸鎬侊紝涓嶅啀璺宠浆鈥滃畬宸ヤ俊鎭～鎶モ�濄�傚畬宸ュ鐞嗕笌瀹屽伐濉姤鐢变笉鍚岀敤鎴峰垎鍒搷浣溿�� +- 闇�姹� 12锛氬畬宸ヤ俊鎭～鎶ョ殑娲惧伐鍗曢�夋嫨鍒楄〃鍙睍绀衡�滃凡鍦ㄥ畬宸ユ儏鍐靛鐞嗕腑纭瀹屽伐銆佸睘浜庡綋鍓嶇櫥褰曠敤鎴锋墍灞炲崟浣嶃�佷笖灏氭湭濉姤鈥濈殑娲惧伐鍗曪紝骞跺鍔犲伐绋嬪悕绉帮紙椤圭洰鍚嶇О锛夋樉绀恒�� +- 闇�姹� 17锛氳鑹茬鐞嗙殑鈥滅敤鎴疯缃�濆鍔犫�滃叏閮� / 宸茶缃�濊繃婊ゅ垏鎹€�� +- 闇�姹� 18锛氭柊澧炩�滅粍缁囨満鏋勨�濋儴闂ㄦ爲琛ㄩ〉闈紝鑿滃崟 `/system/organization`锛岄〉闈� `OrganizationManage.vue`锛屾暟鎹潵鑷� `CSICZB_ZB.SYS_DEPT`锛屽悗绔帴鍙� `/api/system/depts`銆傚綋鍓嶇幆澧冭繑鍥� 34 涓儴闂紝鏀寔鍚嶇О銆佺紪鐮併�佽礋璐ｄ汉銆侀儴闂ㄧ被鍨嬬瓫閫夈�� +- 闇�姹� 19锛氭壙淇崟浣嶆敼涓鸿鍙� `SYS_DEPT.DEPT_TYPE='cj'` 鐨勯儴闂ㄨ褰曪紝閮ㄩ棬 ID 浣滀负鎵夸慨鍗曚綅 ID锛涙壙淇崟浣嶆帴鍙ｄ繚鐣� GET锛岄〉闈㈡敼涓哄彧璇汇�傚綋鍓嶇幆澧冭繑鍥� 7 涓� cj 閮ㄩ棬锛孹CB瀹℃牳銆佹淳鍗曞潎浣跨敤 cj 閮ㄩ棬 ID/鍚嶇О銆� + +**涓昏鏂囦欢** +- 鍚庣锛歚emergency-repair-server/src/main/java/com/emergencyrepair/system/service/SystemService.java`銆乣emergency-repair-server/src/main/java/com/emergencyrepair/business/service/BusinessService.java`銆乣emergency-repair-server/src/main/java/com/emergencyrepair/bootstrap/DataInitializer.java`銆� +- 鍓嶇锛歚emergency-repair-web/src/views/system/OrganizationManage.vue`銆乣emergency-repair-web/src/views/system/ContractorManage.vue`銆乣emergency-repair-web/src/views/completion/CompletionReport.vue`銆乣emergency-repair-web/src/views/system/RoleManage.vue`銆乣emergency-repair-web/src/router/index.js`銆� + +**楠岃瘉缁撴灉** +- 鍚庣 `mvn -B -DskipTests clean package` 閫氳繃锛涘墠绔� `npm run build` 閫氳繃銆� +- 椤甸潰楠岃瘉鑴氭湰瀹屾暣閫氳繃锛歚node .codex-run/verify-items-11-12-17.js`銆乣node .codex-run/verify-items-18-19.js`锛涙埅鍥捐 `.codex-run/organization-verified.png`銆乣.codex-run/contractor-readonly-verified.png`銆乣.codex-run/completion-report-verified.png`銆乣.codex-run/role-scope-verified.png`銆� +- 绔埌绔仈璋冧娇鐢ㄤ复鏃舵晠闅� `鍥哄畾鍓嶇紑-088/A-261004-001`锛岃窇閫氫笂鎶ャ�乆CB瀹℃牳鍒嗛厤鈥滃巶瀹�1/鍘傚2鈥濄�丆MB/JCC涓夌骇瀹℃壒銆佹淳鍗曘�傛渶缁堟晠闅滀繚瀛� `contractorIds = 1303144990487465986,1303145150793764866`銆乣contractorNames = 鍘傚1銆佸巶瀹�2`锛岀敓鎴愪袱寮犳淳宸ュ崟锛屽潎淇濆瓨 cj 閮ㄩ棬 ID/鍚嶇О銆� +- 瀹屽伐濉姤鍙鎬ч獙璇侊細`cjyh1-1` 浠呯湅鍒板巶瀹�1娲惧伐鍗曪紝`cjyh2-1` 浠呯湅鍒板巶瀹�2娲惧伐鍗曪紝`admin` 鍙湅鍒颁袱寮犮�備复鏃� `T_FAULT` / `T_WORK_ORDER` 娴嬭瘯鏁版嵁宸叉竻鐞嗐�� + +**褰撳墠杩愯鐘舵�侊紙2026-10-04锛�** +- 鍓嶇锛歚http://localhost:8082`锛涘悗绔細`http://127.0.0.1:8091`锛汥M8锛歚127.0.0.1:5236`锛沨eadless Edge 璋冭瘯瀹炰緥绔彛 `9222`銆� +- 鐧诲綍锛歚admin / admin123`锛涙暟鎹簱锛歚SYSDBA/SYSDBA`锛屼笟鍔� schema `LX`銆� + +**鎺ユ墜娉ㄦ剰浜嬮」** +- 闈炵鐞嗗憳鐢ㄦ埛鐨勫畬宸ュ～鎶ユ淳宸ュ崟鍗曚綅鍖归厤褰撳墠鎸� `DEPT_NAME`锛屼笉鏄寜 `DEPT_ID`銆傛湰娆￠獙璇侀�氳繃锛涘瀛樺湪鍚屽悕閮ㄩ棬锛屽簲鏀逛负鎸夐儴闂� ID 绮剧‘鍖归厤銆� +- 鍘嗗彶婕旂ず娲惧伐鍗曞彲鑳戒繚鐣欐棫 `T_CONTRACTOR` 鍚嶇О锛岄潪绠＄悊鍛� cj 鐢ㄦ埛鍙兘鐪嬩笉鍒拌繖浜涘巻鍙插崟锛沗admin` 涓嶅彈鍗曚綅杩囨护褰卞搷銆� +- `.codex-run`銆丱ffice 閿佹枃浠� `requirement\~$鍘熷闇�姹�.docx` 鍜� `emergency-repair-web/public/鏂板缓 鏂囨湰鏂囨。.txt` 灞炴湰鍦拌仈璋冩垨涓存椂鏂囦欢锛屼笉搴旀彁浜ゃ�� +- 鏈疆浠ｇ爜宸叉彁浜ゅ苟鎺ㄩ�佸叕鍙� Git 浠撳簱 `main` 鍒嗘敮锛屾彁浜� `757dcb3`锛涗氦鎺ユ枃浠跺洖濉彁浜よ褰曘�傚悗缁惎鍔ㄣ�佹瀯寤哄拰鎺掗敊鍛戒护娌跨敤绗� 16 鑺傘�� -- Gitblit v1.9.1