From 09d5a256fe86629b1da10f13b30f53d107d307c1 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 七月 2025 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
db/430设备管理数据库设计.pdma.json | 316 ++++++++++++++++++++++++++++++++++++++++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationStandardMapper.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java | 9 +
3 files changed, 326 insertions(+), 3 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 b34a96b..6ebaead 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-7 21:00:24",
+ "updatedTime": "2025-7-8 15:34:54",
"dbConns": [],
"profile": {
"default": {
@@ -632,7 +632,7 @@
"#DDE5FF"
],
"DDLToggleCase": "L",
- "menuWidth": "371px"
+ "menuWidth": "465px"
},
"entities": [
{
@@ -5384,6 +5384,24 @@
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "002B8F72-C45A-4524-B640-C84EF0514764"
+ },
+ {
+ "defKey": "hf_code",
+ "defName": "HF缂栫爜",
+ "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": "C66ED6C1-01AF-455B-99D5-AA68EE84B6D7"
}
],
"correlations": [],
@@ -6402,6 +6420,34 @@
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "E93F68B2-6E1B-4058-8409-D3DDCBE0032C"
+ },
+ {
+ "defKey": "hf_code",
+ "defName": "HF缂栫爜",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "2A0B2F8F-6627-4459-91AC-C5AE6D82AC1A",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
},
{
"defKey": "remark",
@@ -8160,6 +8206,42 @@
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "2D1B4B74-517C-4C1E-8A81-BE47214D2048",
"uiHint": null
+ },
+ {
+ "defKey": "hf_code_a",
+ "defName": "绉讳氦鍗旽F缂栫爜",
+ "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": "F25BE183-0D23-4687-9D1D-0D267900366E"
+ },
+ {
+ "defKey": "hf_code_b",
+ "defName": "楠屾敹鍗旽F缂栫爜",
+ "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": "A4ACA44E-2744-46F4-9F74-DCE0FAA5AEED"
}
],
"correlations": [],
@@ -9180,6 +9262,24 @@
"extProps": {},
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"id": "4D2784FA-4590-44E2-AE97-68AFA3DB4540"
+ },
+ {
+ "defKey": "hf_code",
+ "defName": "HF缂栫爜",
+ "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": "624246E9-5FFE-49D3-B975-4439FF9DA03B"
}
],
"correlations": [],
@@ -10084,6 +10184,34 @@
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "16F4A88A-666C-436D-8C96-83BCB2C9E0CB"
+ },
+ {
+ "defKey": "hf_code",
+ "defName": "HF缂栫爜",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "0469FBD4-C04E-42B9-A69D-DA62F9D6FD7B",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
}
],
"correlations": [],
@@ -24945,6 +25073,78 @@
"baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
},
{
+ "defKey": "hf_code_a",
+ "defName": "闄勫綍A HF缂栫爜",
+ "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": "1E95505E-B351-47EE-8281-7003647B07A7"
+ },
+ {
+ "defKey": "hf_code_b",
+ "defName": "闄勫綍B HF缂栫爜",
+ "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": "AFB9A36B-289D-4A19-8E2E-D3DA65FF3D14"
+ },
+ {
+ "defKey": "hf_code_c",
+ "defName": "闄勫綍C HF缂栫爜",
+ "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": "64714662-83B6-446C-BA3D-A8FB5573446E"
+ },
+ {
+ "defKey": "hf_code_d",
+ "defName": "闄勫綍D HF缂栫爜",
+ "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": "15FC7289-2765-45F3-B438-0839058DA71C"
+ },
+ {
"defKey": "remark",
"defName": "澶囨敞",
"comment": "",
@@ -26004,6 +26204,34 @@
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "4478B303-EEFF-4F42-A389-0AC012E4DBAD",
"uiHint": null
+ },
+ {
+ "defKey": "hf_code",
+ "defName": "HF缂栫爜",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "7A93E21A-C20B-4A97-B8BA-F983BB7B3AB3",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
}
],
"correlations": [],
@@ -26447,6 +26675,34 @@
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "9FB2FB56-7A3D-4B68-B84E-DFE6B41611C8"
+ },
+ {
+ "defKey": "hf_code",
+ "defName": "HF缂栫爜",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "C4A479A5-B9DD-4911-B26A-ABEA85EF875A",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
}
],
"correlations": [],
@@ -27391,6 +27647,34 @@
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "0A1D4698-D332-4747-A96E-EF03DFAD0305"
+ },
+ {
+ "defKey": "hf_code",
+ "defName": "HF缂栫爜",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "1FDD4335-E2A5-4925-B353-DFB1518E8893",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
}
],
"correlations": [],
@@ -27962,6 +28246,34 @@
"attr9": "",
"id": "D05DDC06-FC09-42DC-B236-CE3E3C748486",
"baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "hf_code",
+ "defName": "HF缂栫爜",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "403E2E22-E3B6-4385-8438-50D2548E2766",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
}
],
"correlations": [],
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java
index 45016a3..070541f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -77,4 +78,12 @@
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+ @TableField(exist = false)
+ private String equipmentModel;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationStandardMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationStandardMapper.java
index 4d7b91f..72c9bbe 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationStandardMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationStandardMapper.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard;
/**
@@ -20,5 +22,5 @@
* @param queryWrapper
* @return
*/
- IPage<EamTechnicalStatusEvaluationStandard> queryPageList(Page<EamTechnicalStatusEvaluationStandard> page, QueryWrapper<EamTechnicalStatusEvaluationStandard> queryWrapper);
+ IPage<EamTechnicalStatusEvaluationStandard> queryPageList(Page<EamTechnicalStatusEvaluationStandard> page, @Param(Constants.WRAPPER) QueryWrapper<EamTechnicalStatusEvaluationStandard> queryWrapper);
}
--
Gitblit v1.9.3