From 706053d51e4f1663f3c1959a73d59e8cde3880ae Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 15 五月 2025 10:58:03 +0800
Subject: [PATCH] art: 设备管理-保养标准 导入模板修改
---
db/数据库产品化设计.pdma.json | 40 +++++++++++++++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java | 10 +++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/dto/ThirdMaintenanceStandardImport.java | 6 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/dto/SecondMaintenanceStandardImport.java | 6 ++
4 files changed, 58 insertions(+), 4 deletions(-)
diff --git "a/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json" "b/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
index 6e6ef34..d2c148d 100644
--- "a/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
+++ "b/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\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-5-14 17:06:24",
+ "updatedTime": "2025-5-15 10:21:28",
"dbConns": [],
"profile": {
"default": {
@@ -4445,7 +4445,7 @@
},
{
"defKey": "item_demand",
- "defName": "淇濆吇瑕佹眰",
+ "defName": "淇濆吇鏍囧噯鍙婅姹�",
"comment": "",
"type": "",
"len": "",
@@ -4460,6 +4460,42 @@
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "657B83E6-18F6-47AA-ABFB-BE6E3BEE9720"
+ },
+ {
+ "defKey": "item_demand_alias",
+ "defName": "淇濆吇瑕佹眰2",
+ "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": "6C7C3999-BDAB-4387-84A7-16A9C0D54F7A"
+ },
+ {
+ "defKey": "check_method",
+ "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": "3C93219F-1A79-42CD-9D3C-59C49458A099"
}
],
"correlations": [],
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/dto/SecondMaintenanceStandardImport.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/dto/SecondMaintenanceStandardImport.java
index 0a3e6fc..c69135d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/dto/SecondMaintenanceStandardImport.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/dto/SecondMaintenanceStandardImport.java
@@ -14,6 +14,10 @@
private String itemPart;
@Excel(name = "淇濆吇鍐呭", width = 15)
private String itemName;
- @Excel(name = "淇濆吇瑕佹眰", width = 15)
+ @Excel(name = "妫�鏌ユ爣鍑嗘垨瑕佹眰", width = 15)
private String itemDemand;
+ @Excel(name = "淇濆吇瑕佹眰", width = 15)
+ private String itemDemandAlias;
+ @Excel(name = "妫�鏌ユ柟娉�", width = 15)
+ private String checkMethod;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/dto/ThirdMaintenanceStandardImport.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/dto/ThirdMaintenanceStandardImport.java
index be9f4cb..f33a088 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/dto/ThirdMaintenanceStandardImport.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/dto/ThirdMaintenanceStandardImport.java
@@ -14,6 +14,10 @@
private String itemPart;
@Excel(name = "淇濆吇鍐呭", width = 15)
private String itemName;
- @Excel(name = "淇濆吇瑕佹眰", width = 15)
+ @Excel(name = "妫�鏌ユ爣鍑嗘垨瑕佹眰", width = 15)
private String itemDemand;
+ @Excel(name = "淇濆吇瑕佹眰", width = 15)
+ private String itemDemandAlias;
+ @Excel(name = "妫�鏌ユ柟娉�", width = 15)
+ private String checkMethod;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java
index ca50e2e..eaded5a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java
@@ -62,6 +62,12 @@
/**淇濆吇瑕佹眰*/
@ApiModelProperty(value = "淇濆吇瑕佹眰")
private String itemDemand;
+ /**淇濆吇瑕佹眰2*/
+ @ApiModelProperty(value = "淇濆吇瑕佹眰2")
+ private String itemDemandAlias;
+ /**妫�鏌ユ柟娉�*/
+ @ApiModelProperty(value = "妫�鏌ユ柟娉�")
+ private String checkMethod;
public EamMaintenanceStandardDetail(){}
@@ -85,6 +91,8 @@
this.itemName = dto.getItemName();
this.itemPart = dto.getItemPart();
this.itemDemand = dto.getItemDemand();
+ this.itemDemandAlias = dto.getItemDemandAlias();
+ this.checkMethod = dto.getCheckMethod();
}
public EamMaintenanceStandardDetail(ThirdMaintenanceStandardImport dto) {
@@ -92,5 +100,7 @@
this.itemName = dto.getItemName();
this.itemPart = dto.getItemPart();
this.itemDemand = dto.getItemDemand();
+ this.itemDemandAlias = dto.getItemDemandAlias();
+ this.checkMethod = dto.getCheckMethod();
}
}
--
Gitblit v1.9.3