From 82cae82571a0c6c57ee5dc357efaf0e238c20ac9 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 10 七月 2025 14:54:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
db/430设备管理数据库设计.pdma.json | 718 +++++++++++++++++++++++++++++++-------------------
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamEquipmentDto.java | 44 +++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java | 13
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 13
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java | 6
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 13
6 files changed, 522 insertions(+), 285 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 08906d9..7e645a9 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"
@@ -11536,6 +11536,24 @@
"id": "D5F4AD3E-A9C5-41BB-A699-720C3EAEC040"
},
{
+ "defKey": "is_processed",
+ "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": "06BF0EBA-007A-451D-95F9-E00553E5F6CD"
+ },
+ {
"defKey": "fault_start_time",
"defName": "鏁呴殰寮�濮嬫椂闂�",
"comment": "",
@@ -11660,34 +11678,6 @@
"extProps": {},
"domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
"id": "1229A626-1039-4386-A28C-25297478328B"
- },
- {
- "defKey": "image_files",
- "defName": "鐓х墖鏂囦欢ids",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "domain": "13DE7063-440C-426F-B1DF-25EC824C6DB8",
- "refDict": "",
- "extProps": {},
- "notes": {},
- "attr1": "",
- "attr2": "",
- "attr3": "",
- "attr4": "",
- "attr5": "",
- "attr6": "",
- "attr7": "",
- "attr8": "",
- "attr9": "",
- "id": "0552EC0A-4846-49B3-BA5A-6049CD295D13",
- "baseType": "B17BDED3-085F-40E1-9019-3B79CF2BF075"
},
{
"defKey": "remark",
@@ -12027,7 +12017,7 @@
{
"defKey": "repair_status",
"defName": "缁翠慨鐘舵��",
- "comment": "",
+ "comment": "寰呯淮淇�佺淮淇腑銆佸緟纭銆佺淮淇畬鎴�",
"type": "",
"len": "",
"scale": "",
@@ -12041,6 +12031,78 @@
"extProps": {},
"domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
"id": "E3F4CCD6-CA19-4A44-AEE6-EAB76C447B6B"
+ },
+ {
+ "defKey": "fault_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": "BCE8BD76-B110-4B3E-B64C-5753B9F0598C"
+ },
+ {
+ "defKey": "fault_analysis",
+ "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": "DF070EAC-2AA1-482B-B8F2-5BFE2BFBF294"
+ },
+ {
+ "defKey": "fault_process",
+ "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": "AF768E3B-7329-4C6C-959E-BE4F0E4E0ED2"
+ },
+ {
+ "defKey": "fault_prevent",
+ "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": "88AA9F44-C655-4140-B34E-26E2A10E0F1D"
},
{
"defKey": "actual_start_time",
@@ -12133,250 +12195,6 @@
"id": "E3BD4018-31D8-412D-AD9C-00ED3F068906"
},
{
- "defKey": "fault_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": "BCE8BD76-B110-4B3E-B64C-5753B9F0598C"
- },
- {
- "defKey": "repair_description",
- "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": "C158BB3C-06F2-451C-974F-7A8A46A4026B"
- },
- {
- "defKey": "repairer",
- "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": "39B6A4DB-4B2F-4997-BE68-04267F517AD6"
- },
- {
- "defKey": "leader_user",
- "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": "BE863706-C9DD-45D3-9303-4180F1A444E2"
- },
- {
- "defKey": "leader_confirm",
- "defName": "棰嗗纭缁撴灉",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
- "extProps": {},
- "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
- "id": "958A9D56-586D-483A-B670-EA3351BEEF50"
- },
- {
- "defKey": "leader_confirm_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": "F7BAD961-9011-4A25-B80B-7D6865B93F92"
- },
- {
- "defKey": "leader_confirm_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": "32CAA017-36BD-4EB3-B4E5-88F972CEE9CD"
- },
- {
- "defKey": "external_repairer",
- "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": "AC27EA79-E7DA-4B72-B39B-8ECA8D968958"
- },
- {
- "defKey": "external_confirm",
- "defName": "鏈哄姩鍔炵‘璁ょ粨鏋�",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
- "extProps": {},
- "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
- "id": "ED829432-3B4C-49D4-8B91-05DF171070E9"
- },
- {
- "defKey": "external_confirm_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": "16D85E43-DC62-4809-BC8C-8274A8EACD4C"
- },
- {
- "defKey": "external_confirm_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": "1FFC3F79-6226-4B7C-9F96-233CCEB9FE6E"
- },
- {
- "defKey": "outsourced_user",
- "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": "69D5E505-79B5-4960-804B-26F679622056"
- },
- {
- "defKey": "image_files",
- "defName": "鐓х墖鏂囦欢ids",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "domain": "13DE7063-440C-426F-B1DF-25EC824C6DB8",
- "refDict": "",
- "extProps": {},
- "notes": {},
- "attr1": "",
- "attr2": "",
- "attr3": "",
- "attr4": "",
- "attr5": "",
- "attr6": "",
- "attr7": "",
- "attr8": "",
- "attr9": "",
- "id": "F12C512D-9550-40EA-8583-C6476F69C135",
- "baseType": "B17BDED3-085F-40E1-9019-3B79CF2BF075"
- },
- {
"defKey": "confirmer",
"defName": "鎿嶄綔宸�",
"comment": "",
@@ -12429,6 +12247,359 @@
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "D78104A0-7502-4867-BE4D-6727F35FAE54"
+ }
+ ],
+ "correlations": [],
+ "indexes": [],
+ "type": "P"
+ },
+ {
+ "id": "B058461D-4E6B-4E93-AC93-202C470F32FD",
+ "env": {
+ "base": {
+ "nameSpace": "",
+ "codeRoot": ""
+ }
+ },
+ "defKey": "eam_repair_person",
+ "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": "D7DEA958-4C18-479C-B2C0-94FE06DA3ADF"
+ },
+ {
+ "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": "58D6FF91-89A9-490A-B90A-327E81A74E23",
+ "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": "8F4966FE-F0C2-4AB2-83EF-94B24B7B224E",
+ "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": "4F8FB139-0BB5-415D-831E-6143E3A8D8F6",
+ "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": "A032D1CD-7BBA-4E7B-BE9B-B11D37E43D0D",
+ "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": "15E782AF-A99B-49CC-9782-59BE3F710287"
+ },
+ {
+ "defKey": "repair_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": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "32E4CAED-83AE-4227-B398-586CA02E9879"
+ },
+ {
+ "defKey": "repair_user",
+ "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": "4C1E8950-C463-4892-9132-2CDAA4EBBD19"
+ },
+ {
+ "defKey": "repair_primary",
+ "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": "1BD2D6BC-3EF4-40EF-99C0-D322F854E501"
+ },
+ {
+ "defKey": "repair_duration",
+ "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": "0950E648-7BD4-4A85-A658-1F6F5E74E1EA"
+ },
+ {
+ "defKey": "remark",
+ "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": "4B6B2E90-0A46-44BC-B297-CB8C5AF2C1E7"
}
],
"correlations": [],
@@ -29443,6 +29614,7 @@
"1A3E4955-3BDA-4628-A07A-37D3AD875659",
"B57F92D3-3089-453E-A007-85C497CEE088",
"EE37A932-3559-47C8-A1F3-1E788DE4A116",
+ "B058461D-4E6B-4E93-AC93-202C470F32FD",
"4A919A9B-7871-44DF-8C20-878564B3B502",
"F4027093-9CA4-4A9B-BA41-8891528459A8",
"64408D01-665E-43FB-92AE-916BE3234D48",
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamEquipmentDto.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamEquipmentDto.java
index 4e05465..bdf3a30 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamEquipmentDto.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamEquipmentDto.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.dto;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -82,9 +83,25 @@
private String equipmentName;
/**
+ * 涓績
+ */
+// @Excel(name = "涓績", width = 15, orderNum = "5")
+ @ApiModelProperty(value = "涓績")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ private transient String zxfactoryOrgCode;
+
+ /**
+ * 宸ュ尯
+ */
+// @Excel(name = "宸ュ尯", width = 15, orderNum = "6")
+ @ApiModelProperty(value = "宸ュ尯")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ private transient String gqfactoryOrgCode;
+
+ /**
* 宸ユ
*/
- @Excel(name = "涓績/宸ュ尯/宸ユ", width = 15, orderNum = "4",dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @Excel(name = "涓績/宸ュ尯/宸ユ", width = 15, orderNum = "4")
@ApiModelProperty(value = "涓績/宸ュ尯/宸ユ")
@Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "factory_code")
private String factoryOrgCode;
@@ -151,8 +168,9 @@
/**
* 鐏伀鍣�
*/
- @Excel(name = "鐏伀鍣�", width = 15, orderNum = "16")
+ @Excel(name = "鐏伀鍣�", width = 15, orderNum = "16",dicCode = "yn")
@ApiModelProperty(value = "鐏伀鍣�")
+ @Dict(dicCode = "yn")
private String fireExtinguisher;
/**
@@ -195,6 +213,12 @@
* 閲嶉噺(鍚�)
*/
@Excel(name = "閲嶉噺(鍚�)", width = 15, orderNum = "22")
+ @ApiModelProperty(value = "閲嶉噺(鍚�)")
+ private String equipmentWeightStr;
+
+ /**
+ * 閲嶉噺(鍚�)
+ */
@ApiModelProperty(value = "閲嶉噺(鍚�)")
private BigDecimal equipmentWeight;
@@ -410,4 +434,20 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ public void setFactoryOrgCode(String factoryOrgCode){
+ this.factoryOrgCode = factoryOrgCode;
+ if(StrUtil.isNotEmpty(factoryOrgCode)){
+ if(factoryOrgCode.length()==12){
+ this.gqfactoryOrgCode = factoryOrgCode.substring(0,9);
+ this.zxfactoryOrgCode = factoryOrgCode.substring(0,6);
+ }
+
+ if(factoryOrgCode.length()==9){
+ this.zxfactoryOrgCode = factoryOrgCode.substring(0,6);
+ }
+
+ }
+ }
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 400264b..743d9ec 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -26,8 +26,6 @@
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
import org.jeecg.modules.eam.vo.EquipmentSearchResult;
-//import org.jeecg.modules.mdc.entity.MdcEquipment;
-//import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.system.entity.BaseFactory;
import org.jeecg.modules.system.entity.EamBaseRepairDepart;
import org.jeecg.modules.system.service.IBaseFactoryService;
@@ -230,6 +228,17 @@
equipmentList.forEach(item -> {
EamEquipmentDto eamEquipmentDto = new EamEquipmentDto();
BeanUtils.copyProperties(item,eamEquipmentDto);
+ if (eamEquipmentDto.getFactoryOrgCode().length()==12){
+ eamEquipmentDto.setFactoryOrgCode(
+ baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getZxfactoryOrgCode())
+ +"/"+baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getGqfactoryOrgCode())+"/"+
+ baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getFactoryOrgCode()));
+ }else {
+ eamEquipmentDto.setFactoryOrgCode(
+ baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getZxfactoryOrgCode())
+ +"/"+ baseFactoryService.factoryDataNameByOrgCode(eamEquipmentDto.getFactoryOrgCode()));
+ }
+ eamEquipmentDto.setEquipmentWeightStr(eamEquipmentDto.getEquipmentWeight().toEngineeringString());
eamEquipmentDtos.add(eamEquipmentDto);
});
// Step.3 AutoPoi 瀵煎嚭Excel
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 1bf8ee0..ab94a57 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -285,9 +285,8 @@
// 鍚堝苟鍑芥暟锛氬綋鍚屼竴鈥滃ぉ鈥濇湁澶氫釜瀵硅薄鏃讹紝濡備綍澶勭悊锛堣繖閲岀ず渚嬪彇绗竴涓級
(existing, replacement) -> existing // 鑻ユ湁閲嶅閿紝淇濈暀宸插瓨鍦ㄧ殑瀵硅薄
));
- List<Map<String, Object>> resultList = new ArrayList<>();
+ Map<String, Object> resultMap = new LinkedHashMap<>();
for (int i = 1; i <= 31; i++) {
- Map<String, Object> resultMap = new HashMap<>();
if (groupMap.containsKey(i)) {
EamInsOrderDetailUserResponse eamInsOrderDetailUserResponse = groupMap.get(i);
resultMap.put("operator" + i, sysDictService.queryTableDictTextByKey("sys_user", "realname", "username", eamInsOrderDetailUserResponse.getOperator()));
@@ -296,9 +295,8 @@
resultMap.put("operator" + i, "");
resultMap.put("confirmUser" + i, "");
}
- resultList.add(resultMap);
}
- result.put("data", resultList);
+ result.put("data", Collections.singletonList(resultMap));
return result;
}
@@ -403,9 +401,8 @@
// 鍚堝苟鍑芥暟锛氬綋鍚屼竴鈥滃ぉ鈥濇湁澶氫釜瀵硅薄鏃讹紝濡備綍澶勭悊锛堣繖閲岀ず渚嬪彇绗竴涓級
(existing, replacement) -> existing // 鑻ユ湁閲嶅閿紝淇濈暀宸插瓨鍦ㄧ殑瀵硅薄
));
- List<Map<String, Object>> resultList = new ArrayList<>();
+ Map<String, Object> resultMap = new LinkedHashMap<>();
for (int i = 1; i <= 5; i++) {
- Map<String, Object> resultMap = new HashMap<>();
if (groupMap.containsKey(i)) {
EamWeekInsDetailUserResponse eamWeekInsDetailUserResponse = groupMap.get(i);
resultMap.put("operator" + i, sysDictService.queryTableDictTextByKey("sys_user", "realname", "username", eamWeekInsDetailUserResponse.getInspector()));
@@ -414,9 +411,9 @@
resultMap.put("operator" + i, "");
resultMap.put("confirmUser" + i, "");
}
- resultList.add(resultMap);
}
- result.put("data", resultList);
+ result.put("data", Collections.singletonList(resultMap));
+
return result;
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java
index 8541d75..3d4d2d7 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java
@@ -61,4 +61,10 @@
* 鏍规嵁浜х嚎id鎵归噺鍒犻櫎骞跺垹闄ゅ叾鍙兘瀛樺湪鐨勫瓙绾т骇绾�
*/
void deleteBatchWithChildren(List<String> ids);
+
+ /**
+ * 閫氳繃orgCode缃崲涓績鍚嶇О
+ * @param orgCode
+ */
+ String factoryDataNameByOrgCode(String orgCode);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java
index d1faf69..d28a83f 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java
@@ -349,4 +349,17 @@
}
}
}
+
+ /**
+ * 閫氳繃orgCode缃崲涓績鍚嶇О
+ * @param orgCode
+ */
+ @Override
+ public String factoryDataNameByOrgCode(String orgCode){
+ BaseFactory baseFactory = baseMapper.selectOne(new LambdaQueryWrapper<BaseFactory>().eq(BaseFactory::getOrgCode, orgCode));
+ if (baseFactory != null) {
+ return baseFactory.getFactoryName();
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3