From f7dfadbc98dae361369acd06ad33b273a01862f1 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 03 七月 2025 15:34:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
db/430设备管理数据库设计.pdma.json | 832 ++++++++++++++++++++++++++++++++++++++++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IEamBaseRepairDepartService.java | 8
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/EamBaseRepairDepartUserMapper.xml | 9
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java | 32
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/EamBaseRepairDepartImpl.java | 155 ++++----
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/EamBaseRepairDepartUserMapper.java | 21 +
6 files changed, 962 insertions(+), 95 deletions(-)
diff --git "a/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" "b/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
index 69504bf..3afad5a 100644
--- "a/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
+++ "b/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.9.2",
"createdTime": "2025-3-10 16:38:19",
- "updatedTime": "2025-7-3 11:31:35",
+ "updatedTime": "2025-7-3 15:11:28",
"dbConns": [],
"profile": {
"default": {
@@ -8908,6 +8908,575 @@
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "DB19CCCD-2006-4950-86A6-B4780B4D9C34"
+ }
+ ],
+ "correlations": [],
+ "indexes": [],
+ "type": "P"
+ },
+ {
+ "id": "93D54F80-5237-4ADB-86DC-4E4F4F7261A6",
+ "env": {
+ "base": {
+ "nameSpace": "",
+ "codeRoot": ""
+ }
+ },
+ "defKey": "eam_third_maintenance_change",
+ "defName": "涓変繚鍙樻洿",
+ "comment": "",
+ "properties": {
+ "partitioned by": "(date string)",
+ "row format delimited": "",
+ "fields terminated by ','": "",
+ "collection items terminated by '-'": "",
+ "map keys terminated by ':'": "",
+ "store as textfile;": ""
+ },
+ "sysProps": {
+ "nameTemplate": "{defKey}[{defName}]"
+ },
+ "notes": {},
+ "headers": [
+ {
+ "refKey": "hideInGraph",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "defKey",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "defName",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "comment",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "primaryKey",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "notNull",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "autoIncrement",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "domain",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "type",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "len",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "scale",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "refDict",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "defaultValue",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "isStandard",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "uiHint",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "extProps",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr1",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr2",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr3",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr4",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr5",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr6",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr7",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr8",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr9",
+ "freeze": false,
+ "hideInGraph": true
+ }
+ ],
+ "fields": [
+ {
+ "defKey": "id",
+ "defName": "涓婚敭",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": true,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "id": "7E7714A5-B442-4842-8E65-6179F3F43740"
+ },
+ {
+ "defKey": "create_by",
+ "defName": "鍒涘缓浜�",
+ "comment": "",
+ "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": "",
+ "uiHint": "",
+ "id": "798B2007-0498-43E2-B16A-39A506CA7582",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "create_time",
+ "defName": "鍒涘缓鏃堕棿",
+ "comment": "",
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": "",
+ "uiHint": "",
+ "id": "7E05F985-6784-4C22-B253-50985D0628BC",
+ "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
+ },
+ {
+ "defKey": "update_by",
+ "defName": "鏇存柊浜�",
+ "comment": "",
+ "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": "",
+ "uiHint": "",
+ "id": "11FD1A5C-9345-4C70-8C60-6FE02C43F622",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "update_time",
+ "defName": "鏇存柊鏃堕棿",
+ "comment": "",
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": "",
+ "uiHint": "",
+ "id": "A50B7296-8570-4CF7-8AA0-D4CCC2F90B63",
+ "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
+ },
+ {
+ "defKey": "del_flag",
+ "defName": "鍒犻櫎鏍囪",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "F888AE02-055A-458A-98FD-CB22C3EA539B"
+ },
+ {
+ "defKey": "order_id",
+ "defName": "涓変繚宸ュ崟ID",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "id": "854769A0-58E7-4492-A427-683CE6235B78"
+ },
+ {
+ "defKey": "applicant",
+ "defName": "鐢宠浜�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+ "id": "F459DC6D-88C7-4EFD-B8A1-FF8AF72BE4F8"
+ },
+ {
+ "defKey": "factory_org_code",
+ "defName": "鐢宠閮ㄩ棬",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
+ "id": "FC83B13D-EF09-4D73-AFFA-92B0E50F03EB"
+ },
+ {
+ "defKey": "apply_date",
+ "defName": "鐢宠鏃ユ湡",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "CC55D858-C397-4074-8927-7A590ED8E003"
+ },
+ {
+ "defKey": "apply_category",
+ "defName": "鐢宠绫诲瀷",
+ "comment": "鍙栨秷銆佸欢淇�",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+ "id": "F65D9395-B94E-4B38-A5E4-D5307B1DD1A4"
+ },
+ {
+ "defKey": "change_status",
+ "defName": "鍙樻洿鐘舵��",
+ "comment": "寰呮彁浜ゃ�佸緟涓荤瀹℃牳銆佸緟閮ㄩ棬纭銆佸緟淇濋殰閮ㄧ‘璁ゃ�佸彇娑堛�佸畬鎴�",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+ "id": "D5A5D530-DA24-48BD-A8D9-61FAE13C40B2"
+ },
+ {
+ "defKey": "apply_reason_type",
+ "defName": "寤朵繚鍘熷洜绫诲瀷",
+ "comment": "鐢熶骇浠诲姟銆佽澶囨晠闅溿�佹姤搴熴�佸ぇ淇」淇�佹惉杩�",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+ "id": "C0300ECF-AE87-416F-A7E7-3DFDE74C5B29"
+ },
+ {
+ "defKey": "apply_reason",
+ "defName": "寤朵繚(鍙樻洿)鍘熷洜",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "116B5D6B-A21E-4C1B-860A-3EA592E3A5BE"
+ },
+ {
+ "defKey": "deferred_maintenance_date",
+ "defName": "寤惰繜淇濆吇鏃ユ湡",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "1BFF7F74-35AE-4BEE-886F-E12E9EE139B6"
+ },
+ {
+ "defKey": "equipment_manager_signature",
+ "defName": "涓荤棰嗗绛惧瓧",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+ "id": "27DC2251-F306-48BF-86F8-99DF11ACDB7E"
+ },
+ {
+ "defKey": "equipment_manager_signature_time",
+ "defName": "涓荤棰嗗绛惧瓧鏃堕棿",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "D81F9B85-1C0C-4B24-B8F3-E12C13E62501"
+ },
+ {
+ "defKey": "depart_manager_signature",
+ "defName": "閮ㄩ棬棰嗗绛惧瓧",
+ "comment": "鏍规嵁寤朵繚鍘熷洜绫诲瀷鍒掑垎涓嶅悓鐨勪汉瀹℃壒",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+ "id": "59B13587-E245-4DDA-9399-1AC3D7363989"
+ },
+ {
+ "defKey": "depart_manager_signature_time",
+ "defName": "閮ㄩ棬棰嗗绛惧瓧鏃堕棿",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "42DF30B4-04DD-4B40-98A6-C4FF34927AEA"
+ },
+ {
+ "defKey": "depart_manager_comment",
+ "defName": "閮ㄩ棬棰嗗鎰忚",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "4BB098EC-A8B8-4873-B520-F3CE975BFF0C"
+ },
+ {
+ "defKey": "production_support_signature",
+ "defName": "鐢熶骇淇濋殰閮ㄩ瀵肩瀛�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+ "id": "352D39A7-FB74-4CAE-8D8E-B1AECAF19045"
+ },
+ {
+ "defKey": "production_support_signature_time",
+ "defName": "鐢熶骇淇濋殰閮ㄩ瀵肩瀛楁椂闂�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "9FEDFFD2-B600-461D-8D7C-4F38A7621502"
+ },
+ {
+ "defKey": "production_support_comment",
+ "defName": "鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "16F4A88A-666C-436D-8C96-83BCB2C9E0CB"
}
],
"correlations": [],
@@ -21277,6 +21846,254 @@
"type": "P"
},
{
+ "id": "F422735F-F0B0-4DCD-979C-BBDDA704F624",
+ "env": {
+ "base": {
+ "nameSpace": "",
+ "codeRoot": ""
+ }
+ },
+ "defKey": "eam_base_repair_depart_user",
+ "defName": "缁翠慨鐝粍浜哄憳鍏崇郴缁存姢",
+ "comment": "",
+ "properties": {
+ "partitioned by": "(date string)",
+ "row format delimited": "",
+ "fields terminated by ','": "",
+ "collection items terminated by '-'": "",
+ "map keys terminated by ':'": "",
+ "store as textfile;": ""
+ },
+ "sysProps": {
+ "nameTemplate": "{defKey}[{defName}]"
+ },
+ "notes": {},
+ "headers": [
+ {
+ "refKey": "hideInGraph",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "defKey",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "defName",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "comment",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "primaryKey",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "notNull",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "autoIncrement",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "domain",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "type",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "len",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "scale",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "refDict",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "defaultValue",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "isStandard",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "uiHint",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "extProps",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr1",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr2",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr3",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr4",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr5",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr6",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr7",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr8",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr9",
+ "freeze": false,
+ "hideInGraph": true
+ }
+ ],
+ "fields": [
+ {
+ "defKey": "id",
+ "defName": "涓婚敭",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": true,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": null,
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "id": "31C04E3A-8C13-417C-9D26-75469DA45AE2",
+ "uiHint": null
+ },
+ {
+ "defKey": "create_by",
+ "defName": "鍒涘缓浜�",
+ "comment": "",
+ "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": null,
+ "uiHint": null,
+ "id": "C25B0A2E-B28C-44E5-BC69-C7F78242C726",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "create_time",
+ "defName": "鍒涘缓鏃堕棿",
+ "comment": "",
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": null,
+ "uiHint": null,
+ "id": "C1E0DD5D-B2E8-42EC-A0D2-B7AB00CEB323",
+ "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
+ },
+ {
+ "defKey": "user_id",
+ "defName": "鐢ㄦ埛ID",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": null,
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "id": "19AAE7DD-C7BE-4806-89F7-11409C97810D",
+ "uiHint": null
+ },
+ {
+ "defKey": "depart_id",
+ "defName": "鐝粍ID",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": null,
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "id": "50F48673-0128-4E8F-AA60-117FF9676FB0",
+ "uiHint": null
+ }
+ ],
+ "correlations": [],
+ "indexes": [],
+ "type": "P"
+ },
+ {
"id": "71918E5B-292A-4A4B-A72C-DDEB1F46CEC1",
"env": {
"base": {
@@ -22587,6 +23404,7 @@
"7800D6F2-BC2F-4679-96AC-EDF4E3DF15CD",
"4B01C8F7-4302-4189-A319-58D509E6A910",
"46D0F664-07ED-4072-8208-30E984714F52",
+ "93D54F80-5237-4ADB-86DC-4E4F4F7261A6",
"A4B854B2-A6DD-4AF8-A65F-54EEB8E5F444",
"09140240-1EAE-4CFC-9834-0AE8DD304C98",
"1A3E4955-3BDA-4628-A07A-37D3AD875659",
@@ -22612,6 +23430,7 @@
"5173F017-082A-41F7-822E-E24B800C72D2",
"71918E5B-292A-4A4B-A72C-DDEB1F46CEC1",
"CEFAEC98-1130-408E-AF46-0F63352FAD9C",
+ "F422735F-F0B0-4DCD-979C-BBDDA704F624",
"C0FFF043-304D-445B-9668-55F97F80CB9C"
],
"refViews": [],
@@ -22953,6 +23772,17 @@
"username": "sa",
"customer_driver": ""
}
+ },
+ {
+ "defKey": "B26888BB-593E-4718-9B9C-4D842B06FAFE",
+ "defName": "430new",
+ "type": "BFC87171-C74F-494A-B7C2-76B9C55FACC9",
+ "properties": {
+ "driver_class_name": "com.microsoft.sqlserver.jdbc.SQLServerDriver",
+ "url": "jdbc:sqlserver://localhost:1433;DatabaseName=LXZN_TEST_430_NEW",
+ "password": "123",
+ "username": "sa"
+ }
}
],
"logicEntities": [],
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java
index e04b991..795d137 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java
@@ -87,22 +87,22 @@
return result;
}
-// @AutoLog(value = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」")
-// @ApiOperation(value = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」", notes = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」")
-// @GetMapping(value = "/loadMaintainDepartTreeOptions")
-// public Result<List<RepairDepartIdModel>> loadMaintainDepartTreeOptions() {
-// Result<List<RepairDepartIdModel>> result = new Result<>();
-// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-// String userId = user.getId();
-// try {
-// List<RepairDepartIdModel> list = eamBaseRepairDepartService.loadMaintainDepartTreeOptions(userId);
-// result.setSuccess(true);
-// result.setResult(list);
-// } catch (Exception e) {
-// log.error(e.getMessage(), e);
-// }
-// return result;
-// }
+ @AutoLog(value = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」")
+ @ApiOperation(value = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」", notes = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」")
+ @GetMapping(value = "/loadMaintainDepartTreeOptions")
+ public Result<List<RepairDepartIdModel>> loadMaintainDepartTreeOptions() {
+ Result<List<RepairDepartIdModel>> result = new Result<>();
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ try {
+ List<RepairDepartIdModel> list = eamBaseRepairDepartService.loadMaintainDepartTreeOptions(userId);
+ result.setSuccess(true);
+ result.setResult(list);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ return result;
+ }
@AutoLog(value = "缁翠慨閮ㄩ棬鐝粍-id闆嗗悎")
@ApiOperation(value = "缁翠慨閮ㄩ棬鐝粍-id闆嗗悎", notes = "缁翠慨閮ㄩ棬鐝粍-id闆嗗悎")
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/EamBaseRepairDepartUserMapper.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/EamBaseRepairDepartUserMapper.java
new file mode 100644
index 0000000..75a2e3f
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/EamBaseRepairDepartUserMapper.java
@@ -0,0 +1,21 @@
+package org.jeecg.modules.eam.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.eam.base.entity.EamBaseRepairDepartUser;
+
+import java.util.List;
+
+/**
+ * @Author: Lius
+ * @CreateTime: 2025-07-01
+ * @Description:
+ */
+public interface EamBaseRepairDepartUserMapper extends BaseMapper<EamBaseRepairDepartUser> {
+
+ /**
+ * 鏍规嵁鎸囧畾鐢ㄦ埛id鏌ヨ缁翠慨閮ㄩ棬鐝粍id闆嗗悎
+ */
+ List<String> queryRepairDepartIdsByUserId(@Param("userId") String userId);
+
+}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/EamBaseRepairDepartUserMapper.xml b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/EamBaseRepairDepartUserMapper.xml
new file mode 100644
index 0000000..eb78982
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/EamBaseRepairDepartUserMapper.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.eam.base.mapper.EamBaseRepairDepartUserMapper">
+
+ <!--鏍规嵁鎸囧畾鐢ㄦ埛id鏌ヨ浜х嚎id闆嗗悎-->
+ <select id="queryRepairDepartIdsByUserId" resultType="java.lang.String">
+ SELECT depart_id FROM eam_base_repair_depart_user WHERE user_id = #{userId}
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IEamBaseRepairDepartService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IEamBaseRepairDepartService.java
index 90a26bb..90ddfb6 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IEamBaseRepairDepartService.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IEamBaseRepairDepartService.java
@@ -59,10 +59,10 @@
// */
// List<EamBaseRepairDepart> queryRepDepByPid(String pid);
//
-// /**
-// * 鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」
-// */
-// List<RepairDepartIdModel> loadMaintainDepartTreeOptions(String userId);
+ /**
+ * 鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」
+ */
+ List<RepairDepartIdModel> loadMaintainDepartTreeOptions(String userId);
//
// /**
// * 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/EamBaseRepairDepartImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/EamBaseRepairDepartImpl.java
index 38a4fe4..6df251a 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/EamBaseRepairDepartImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/EamBaseRepairDepartImpl.java
@@ -10,11 +10,14 @@
import org.jeecg.common.util.FillRuleUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.base.entity.EamBaseRepairDepart;
+import org.jeecg.modules.eam.base.entity.EamBaseRepairDepartUser;
+import org.jeecg.modules.eam.base.mapper.EamBaseRepairDepartUserMapper;
import org.jeecg.modules.eam.base.service.IEamBaseRepairDepartService;
import org.jeecg.modules.eam.base.mapper.EamBaseRepairDepartMapper;
import org.jeecg.modules.eam.base.model.EamBaseRepairDepartTreeModel;
import org.jeecg.modules.eam.base.model.RepairDepartIdModel;
import org.jeecg.modules.eam.base.util.FindsRepairDepartsChildrenUtil;
+import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
@@ -22,6 +25,7 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @Author: Lius
@@ -34,6 +38,9 @@
@Resource
private SysUserMapper sysUserMapper;
+ @Resource
+ private EamBaseRepairDepartUserMapper repairDepartUserMapper;
+
/**
* queryTreeList 瀵瑰簲 queryTreeList 鏌ヨ鎵�鏈夌殑缁翠慨閮ㄩ棬鐝粍鏁版嵁,浠ユ爲缁撴瀯褰㈠紡鍝嶅簲缁欏墠绔�
*/
@@ -45,7 +52,7 @@
query.orderByAsc(EamBaseRepairDepart::getDepartOrder);
List<EamBaseRepairDepart> list = this.list(query);
//璁剧疆鐢ㄦ埛id锛岃鍓嶅彴鏄剧ず
-// this.setUserIdsByProList(list);
+ this.setUserIdsByProList(list);
//璋冪敤wrapTreeDataToTreeList鏂规硶鐢熸垚鏍戠姸鏁版嵁
return FindsRepairDepartsChildrenUtil.wrapTreeDataToTreeList(list);
}
@@ -150,7 +157,7 @@
this.checkChildrenExists(id, idList);
boolean result = this.removeByIds(idList);
//鏍规嵁缁翠慨閮ㄩ棬鐝粍id鍒犻櫎鐢ㄦ埛涓庣淮淇儴闂ㄧ彮缁勫叧绯�
-// repairDepartUserMapper.delete(new LambdaQueryWrapper<EamBaseRepairDepartUser>().in(EamBaseRepairDepartUser::getDepartId, idList));
+ repairDepartUserMapper.delete(new LambdaQueryWrapper<EamBaseRepairDepartUser>().in(EamBaseRepairDepartUser::getDepartId, idList));
//鏍规嵁缁翠慨閮ㄩ棬鐝粍id鍒犻櫎缁翠慨閮ㄩ棬鐝粍涓庤澶囧叧绯�
// repairDepartEquipmentMapper.delete(new LambdaQueryWrapper<SysMaintainDepartEquipment>().in(SysMaintainDepartEquipment::getMaintainDepartId, idList));
return result;
@@ -169,7 +176,7 @@
}
this.removeByIds(idList);
//鏍规嵁缁翠慨閮ㄩ棬鐝粍id鍒犻櫎鐢ㄦ埛涓庣淮淇儴闂ㄧ彮缁勫叧绯�
-// repairDepartUserMapper.delete(new LambdaQueryWrapper<EamBaseRepairDepartUser>().in(EamBaseRepairDepartUser::getDepartId, idList));
+ repairDepartUserMapper.delete(new LambdaQueryWrapper<EamBaseRepairDepartUser>().in(EamBaseRepairDepartUser::getDepartId, idList));
//鏍规嵁缁翠慨閮ㄩ棬鐝粍id鍒犻櫎缁翠慨閮ㄩ棬鐝粍涓庤澶囧叧绯�
// repairDepartEquipmentMapper.delete(new LambdaQueryWrapper<SysMaintainDepartEquipment>().in(SysMaintainDepartEquipment::getMaintainDepartId, idList));
}
@@ -182,26 +189,26 @@
// return this.baseMapper.queryRepDepByPid(pid);
// }
//
-// /**
-// * 鏍规嵁鐢ㄦ埛id鑾峰彇缁翠慨閮ㄩ棬鐝粍涓嬫媺鏍戦�夐」
-// */
-// @Override
-// public List<RepairDepartIdModel> loadMaintainDepartTreeOptions(String userId) {
-// //鑾峰彇鎵�鏈夌淮淇儴闂ㄧ彮缁勬暟鎹�
-// List<EamBaseRepairDepart> repairDepartList = this.baseMapper.selectList(new LambdaQueryWrapper<EamBaseRepairDepart>().eq(EamBaseRepairDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).orderByAsc(EamBaseRepairDepart::getDepartOrder));
-// //鏍规嵁鐢ㄦ埛id鑾峰彇鎷ユ湁鐨勭淮淇儴闂ㄧ彮缁勪俊鎭泦鍚�
-// List<String> repairDepartIds = repairDepartUserMapper.queryRepairDepartIdsByUserId(userId);
-// List<String> allMaintainDepartIds = new ArrayList<>();
-// //鎵惧埌鎵�鏈夌淮淇儴闂ㄧ彮缁刬d鐨勪笂绾d
-// if (repairDepartIds != null && !repairDepartIds.isEmpty()) {
-// for (String repairDepartId : repairDepartIds) {
-// this.getAllMaintainDepartIds(repairDepartList, repairDepartId, allMaintainDepartIds);
-// }
-// }
-// //杩囨护缁翠慨閮ㄩ棬鐝粍鏁版嵁
-// List<EamBaseRepairDepart> list = repairDepartList.stream().filter((EamBaseRepairDepart eamBaseRepairDepart) -> allMaintainDepartIds.contains(eamBaseRepairDepart.getId())).collect(Collectors.toList());
-// return FindsRepairDepartsChildrenUtil.wrapTreeDataToMaintainDepartIdTreeList(list);
-// }
+ /**
+ * 鏍规嵁鐢ㄦ埛id鑾峰彇缁翠慨閮ㄩ棬鐝粍涓嬫媺鏍戦�夐」
+ */
+ @Override
+ public List<RepairDepartIdModel> loadMaintainDepartTreeOptions(String userId) {
+ //鑾峰彇鎵�鏈夌淮淇儴闂ㄧ彮缁勬暟鎹�
+ List<EamBaseRepairDepart> repairDepartList = this.baseMapper.selectList(new LambdaQueryWrapper<EamBaseRepairDepart>().eq(EamBaseRepairDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).orderByAsc(EamBaseRepairDepart::getDepartOrder));
+ //鏍规嵁鐢ㄦ埛id鑾峰彇鎷ユ湁鐨勭淮淇儴闂ㄧ彮缁勪俊鎭泦鍚�
+ List<String> repairDepartIds = repairDepartUserMapper.queryRepairDepartIdsByUserId(userId);
+ List<String> allMaintainDepartIds = new ArrayList<>();
+ //鎵惧埌鎵�鏈夌淮淇儴闂ㄧ彮缁刬d鐨勪笂绾d
+ if (repairDepartIds != null && !repairDepartIds.isEmpty()) {
+ for (String repairDepartId : repairDepartIds) {
+ this.getAllMaintainDepartIds(repairDepartList, repairDepartId, allMaintainDepartIds);
+ }
+ }
+ //杩囨护缁翠慨閮ㄩ棬鐝粍鏁版嵁
+ List<EamBaseRepairDepart> list = repairDepartList.stream().filter((EamBaseRepairDepart eamBaseRepairDepart) -> allMaintainDepartIds.contains(eamBaseRepairDepart.getId())).collect(Collectors.toList());
+ return FindsRepairDepartsChildrenUtil.wrapTreeDataToMaintainDepartIdTreeList(list);
+ }
//
// /**
// * 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣id
@@ -250,56 +257,56 @@
}
}
-// /**
-// * 鑾峰彇鎵�鏈夌殑缁翠慨閮ㄩ棬鐝粍id锛堝寘鍚墍鏈変笂绾э級
-// */
-// private void getAllMaintainDepartIds(List<EamBaseRepairDepart> repairDepartList, String repairDepartId, List<String> allMaintainDepartIds) {
-// if (!allMaintainDepartIds.contains(repairDepartId)) {
-// allMaintainDepartIds.add(repairDepartId);
-// }
-// for (EamBaseRepairDepart eamBaseRepairDepart : repairDepartList) {
-// if (StringUtils.isEmpty(eamBaseRepairDepart.getParentId())) {
-// continue;
-// }
-// if (repairDepartId.equals(eamBaseRepairDepart.getId())) {
-// if (!allMaintainDepartIds.contains(eamBaseRepairDepart.getParentId())) {
-// allMaintainDepartIds.add(eamBaseRepairDepart.getParentId());
-// getAllMaintainDepartIds(repairDepartList, eamBaseRepairDepart.getParentId(), allMaintainDepartIds);
-// }
-// }
-// }
-// }
-//
-// /**
-// * 閫氳繃缁翠慨閮ㄩ棬鐝粍闆嗗悎涓虹淮淇儴闂ㄧ彮缁勮缃敤鎴穒d锛岀敤浜庡墠鍙板睍绀�
-// */
-// private void setUserIdsByProList(List<EamBaseRepairDepart> repairDepartList) {
-// //鏌ヨ璐熻矗閮ㄩ棬涓嶄负绌虹殑鎯呭喌
-// LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>();
-// query.isNotNull(SysUser::getDepartIds);
-// List<SysUser> users = sysUserMapper.selectList(query);
-// Map<String, Object> map = new HashMap(5);
-// //鍏堝惊鐜竴閬嶆壘鍒颁笉鍚岀殑璐熻矗缁翠慨閮ㄩ棬鐝粍id
-// for (SysUser user : users) {
-// String repairDepartIds = user.getRepairDepartIds();
-// if (StringUtils.isNotBlank(repairDepartIds)) {
-// String[] repairDepartIdArray = repairDepartIds.split(",");
-// for (String repairDepartId : repairDepartIdArray) {
-// if (map.containsKey(repairDepartId)) {
-// String userIds = map.get(repairDepartId) + "," + user.getId();
-// map.put(repairDepartId, userIds);
-// } else {
-// map.put(repairDepartId, user.getId());
-// }
-// }
-// }
-// }
-// //寰幆缁翠慨閮ㄩ棬鐝粍闆嗗悎鎵惧埌缁翠慨閮ㄩ棬鐝粍id瀵瑰簲鐨勮礋璐ｇ敤鎴�
-// for (EamBaseRepairDepart eamBaseRepairDepart : repairDepartList) {
-// if (map.containsKey(eamBaseRepairDepart.getId())) {
-// eamBaseRepairDepart.setDirectorUserIds(map.get(eamBaseRepairDepart.getId()).toString());
-// }
-// }
-// }
+ /**
+ * 鑾峰彇鎵�鏈夌殑缁翠慨閮ㄩ棬鐝粍id锛堝寘鍚墍鏈変笂绾э級
+ */
+ private void getAllMaintainDepartIds(List<EamBaseRepairDepart> repairDepartList, String repairDepartId, List<String> allMaintainDepartIds) {
+ if (!allMaintainDepartIds.contains(repairDepartId)) {
+ allMaintainDepartIds.add(repairDepartId);
+ }
+ for (EamBaseRepairDepart eamBaseRepairDepart : repairDepartList) {
+ if (StringUtils.isEmpty(eamBaseRepairDepart.getParentId())) {
+ continue;
+ }
+ if (repairDepartId.equals(eamBaseRepairDepart.getId())) {
+ if (!allMaintainDepartIds.contains(eamBaseRepairDepart.getParentId())) {
+ allMaintainDepartIds.add(eamBaseRepairDepart.getParentId());
+ getAllMaintainDepartIds(repairDepartList, eamBaseRepairDepart.getParentId(), allMaintainDepartIds);
+ }
+ }
+ }
+ }
+
+ /**
+ * 閫氳繃缁翠慨閮ㄩ棬鐝粍闆嗗悎涓虹淮淇儴闂ㄧ彮缁勮缃敤鎴穒d锛岀敤浜庡墠鍙板睍绀�
+ */
+ private void setUserIdsByProList(List<EamBaseRepairDepart> repairDepartList) {
+ //鏌ヨ璐熻矗閮ㄩ棬涓嶄负绌虹殑鎯呭喌
+ LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>();
+ query.isNotNull(SysUser::getDepartIds);
+ List<SysUser> users = sysUserMapper.selectList(query);
+ Map<String, Object> map = new HashMap(5);
+ //鍏堝惊鐜竴閬嶆壘鍒颁笉鍚岀殑璐熻矗缁翠慨閮ㄩ棬鐝粍id
+ for (SysUser user : users) {
+ String repairDepartIds = user.getRepairDepartIds();
+ if (StringUtils.isNotBlank(repairDepartIds)) {
+ String[] repairDepartIdArray = repairDepartIds.split(",");
+ for (String repairDepartId : repairDepartIdArray) {
+ if (map.containsKey(repairDepartId)) {
+ String userIds = map.get(repairDepartId) + "," + user.getId();
+ map.put(repairDepartId, userIds);
+ } else {
+ map.put(repairDepartId, user.getId());
+ }
+ }
+ }
+ }
+ //寰幆缁翠慨閮ㄩ棬鐝粍闆嗗悎鎵惧埌缁翠慨閮ㄩ棬鐝粍id瀵瑰簲鐨勮礋璐ｇ敤鎴�
+ for (EamBaseRepairDepart eamBaseRepairDepart : repairDepartList) {
+ if (map.containsKey(eamBaseRepairDepart.getId())) {
+ eamBaseRepairDepart.setDirectorUserIds(map.get(eamBaseRepairDepart.getId()).toString());
+ }
+ }
+ }
}
--
Gitblit v1.9.3