From bf1e124ea501c777b62a19a5b693d9515beb5f11 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期日, 27 四月 2025 16:27:18 +0800
Subject: [PATCH] art: 设备管理-设备工艺、精度参数-基础代码提交
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
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 019c1b6..0ad9bc0 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
@@ -8,6 +8,8 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.modules.eam.dto.MaintenanceStandardImport;
+import org.jeecg.modules.eam.dto.WeekMaintenanceStandardImport;
import java.io.Serializable;
import java.util.Date;
@@ -40,15 +42,12 @@
/**鏇存柊鏃堕棿*/
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
/**淇濆吇鏍囧噯ID*/
@ApiModelProperty(value = "淇濆吇鏍囧噯ID")
private String standardId;
/**淇濆吇椤瑰簭鍙�*/
@ApiModelProperty(value = "淇濆吇椤瑰簭鍙�")
- private String itemCode;
+ private Integer itemCode;
/**淇濆吇椤�*/
@ApiModelProperty(value = "淇濆吇椤�")
private String itemName;
@@ -58,4 +57,20 @@
/**淇濆吇瑕佹眰*/
@ApiModelProperty(value = "淇濆吇瑕佹眰")
private String itemDemand;
+
+
+ public EamMaintenanceStandardDetail(){}
+
+ public EamMaintenanceStandardDetail(MaintenanceStandardImport dto) {
+ this.itemCode = dto.getItemCode();
+ this.itemName = dto.getItemName() + " " + dto.getItemPart() + " " + dto.getItemContent();
+ this.itemDemand = dto.getItemDemand();
+ }
+
+ public EamMaintenanceStandardDetail(WeekMaintenanceStandardImport dto) {
+ this.itemCode = dto.getItemCode();
+ this.itemName = dto.getItemName();
+ this.subItemName = dto.getSubItemName() + " " + (dto.getItemPart() == null ? "" : dto.getItemPart());
+ this.itemDemand = dto.getItemDemand();
+ }
}
--
Gitblit v1.9.3