From cc44920da3d40b8248b67560026e891afdd1a6ab Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 08 五月 2025 17:57:14 +0800
Subject: [PATCH] 1.查询可以被引用的部件接口开发完成 2.借用部件(可批量) 开发完成 3.修改原有新增、修改部件接口 完成 4.修改原有删除文档与导入文档接口 完成 5.修改工作流问题

---
 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