From a70c4bfde4a52a598a270901e41b8c253dd0bb89 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 04 七月 2025 21:02:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java
index efd0f47..755b231 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java
@@ -8,6 +8,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.eam.dto.MaintenanceStandardImport;
import org.jeecg.modules.eam.dto.SecondMaintenanceStandardImport;
import org.jeecg.modules.eam.dto.ThirdMaintenanceStandardImport;
@@ -27,7 +28,7 @@
@Accessors(chain = true)
@ApiModel(value="eam_maintenance_standard_detail瀵硅薄", description="淇濆吇鏍囧噯鏄庣粏")
public class EamMaintenanceStandardDetail implements Serializable {
-
+
/**涓婚敭*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
@@ -44,30 +45,26 @@
/**鏇存柊鏃堕棿*/
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
- /**淇濆吇鏍囧噯ID*/
- @ApiModelProperty(value = "淇濆吇鏍囧噯ID")
+ /**瑙勮寖id*/
+ @ApiModelProperty(value = "瑙勮寖id")
private String standardId;
- /**淇濆吇椤瑰簭鍙�*/
- @ApiModelProperty(value = "淇濆吇椤瑰簭鍙�")
+ /**淇濆吇椤瑰垎绫�*/
+ @ApiModelProperty(value = "淇濆吇椤瑰垎绫�")
+ @Dict(dicCode = "maintenance_item_category")
+ private String itemCategory;
+ /**椤圭洰搴忓彿*/
+ @ApiModelProperty(value = "椤圭洰搴忓彿")
private Integer itemCode;
/**閮ㄤ綅*/
@ApiModelProperty(value = "閮ㄤ綅")
private String itemPart;
- /**淇濆吇椤�*/
- @ApiModelProperty(value = "淇濆吇椤�")
+ /**淇濆吇椤圭洰*/
+ @ApiModelProperty(value = "淇濆吇椤圭洰")
private String itemName;
- /**瀛愪繚鍏婚」*/
- @ApiModelProperty(value = "瀛愪繚鍏婚」")
- private String subItemName;
/**妫�鏌ユ爣鍑嗘垨瑕佹眰*/
@ApiModelProperty(value = "妫�鏌ユ爣鍑嗘垨瑕佹眰")
private String itemDemand;
- /**淇濆吇瑕佹眰2*/
- @ApiModelProperty(value = "淇濆吇瑕佹眰2")
- private String itemDemandAlias;
- /**妫�鏌ユ柟娉�*/
- @ApiModelProperty(value = "妫�鏌ユ柟娉�")
- private String checkMethod;
+
public EamMaintenanceStandardDetail(){}
@@ -82,7 +79,6 @@
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();
}
@@ -91,8 +87,6 @@
this.itemName = dto.getItemName();
this.itemPart = dto.getItemPart();
this.itemDemand = dto.getItemDemand();
- this.itemDemandAlias = dto.getItemDemandAlias();
- this.checkMethod = dto.getCheckMethod();
}
public EamMaintenanceStandardDetail(ThirdMaintenanceStandardImport dto) {
@@ -100,7 +94,5 @@
this.itemName = dto.getItemName();
this.itemPart = dto.getItemPart();
this.itemDemand = dto.getItemDemand();
- this.itemDemandAlias = dto.getItemDemandAlias();
- this.checkMethod = dto.getCheckMethod();
}
}
--
Gitblit v1.9.3