From ddc0f14384619b9618f26a3f363f679833a68b3d Mon Sep 17 00:00:00 2001
From: yangbin <yangbin@qq.com>
Date: 星期三, 16 四月 2025 09:51:32 +0800
Subject: [PATCH] 自动化产线集成模块添加数据查询
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
index cc529f9..37502c6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
@@ -9,7 +9,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -26,69 +26,69 @@
@Accessors(chain = true)
@ApiModel(value="eam_maintenance_standard瀵硅薄", description="淇濆吇鏍囧噯")
public class EamMaintenanceStandard implements Serializable {
-
+
/**涓婚敭*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
private String id;
/**鍒涘缓浜�*/
- @Excel(name = "鍒涘缓浜�", width = 15)
@ApiModelProperty(value = "鍒涘缓浜�")
private String createBy;
/**鍒涘缓鏃堕棿*/
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
private Date createTime;
/**鏇存柊浜�*/
- @Excel(name = "鏇存柊浜�", width = 15)
@ApiModelProperty(value = "鏇存柊浜�")
private String updateBy;
/**鏇存柊鏃堕棿*/
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
/**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
private Integer delFlag;
/**鏍囧噯缂栫爜*/
- @Excel(name = "鏍囧噯缂栫爜", width = 15)
@ApiModelProperty(value = "鏍囧噯缂栫爜")
private String standardCode;
/**鏍囧噯鍚嶇О*/
- @Excel(name = "鏍囧噯鍚嶇О", width = 15)
@ApiModelProperty(value = "鏍囧噯鍚嶇О")
private String standardName;
/**淇濆吇鍛ㄦ湡;鍗曚綅:澶�*/
- @Excel(name = "淇濆吇鍛ㄦ湡;鍗曚綅:澶�", width = 15)
@ApiModelProperty(value = "淇濆吇鍛ㄦ湡;鍗曚綅:澶�")
private Integer maintenancePeriod;
/**鍒濆鏃ユ湡 浠庡摢涓�澶╁紑濮嬭绠椾笅娆′繚鍏绘棩鏈�*/
- @Excel(name = "鍒濆鏃ユ湡", width = 15, format = "yyyy-MM-dd")
@ApiModelProperty(value = "鍒濆鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date initialDate;
/**淇濆吇鍒嗙被*/
- @Excel(name = "淇濆吇鍒嗙被", width = 15)
@ApiModelProperty(value = "淇濆吇鍒嗙被")
+ @Dict(dicCode = "maintenance_category")
private String maintenanceCategory;
- /**璁惧ID*/
- @Excel(name = "璁惧ID", width = 15)
- @ApiModelProperty(value = "璁惧ID")
+ /**璁惧缂栧彿*/
+ @ApiModelProperty(value = "璁惧缂栧彿")
+ @Dict(dicCode = "eam_equipment, equipment_code, id")
private String equipmentId;
/**鏍囧噯鐘舵��*/
- @Excel(name = "鏍囧噯鐘舵��", width = 15)
@ApiModelProperty(value = "鏍囧噯鐘舵��")
+ @Dict(dicCode = "maintenance_standard_status")
private String standardStatus;
/**鏍囧噯鐗堟湰*/
- @Excel(name = "鏍囧噯鐗堟湰", width = 15)
@ApiModelProperty(value = "鏍囧噯鐗堟湰")
private Integer standardVersion;
/**鏂囦欢缂栧彿*/
- @Excel(name = "鏂囦欢缂栧彿", width = 15)
@ApiModelProperty(value = "鏂囦欢缂栧彿")
private String fileCode;
/**鍙傝�冩枃浠�*/
- @Excel(name = "鍙傝�冩枃浠�", width = 15)
@ApiModelProperty(value = "鍙傝�冩枃浠�")
private String referenceFile;
+ /**
+ * 鏈�鏂扮敓鎴愬伐鍗曟椂闂�
+ * 涓嬩竴娆＄敓鎴愭椂闂翠负姝ゆ椂闂� + 淇濆吇鍛ㄦ湡
+ */
+ @ApiModelProperty(value = "鏈�鏂扮敓鎴愬伐鍗曟椂闂�")
+ private Date lastGenerateTime;
+
+ /**璁惧缂栧彿*/
+ private transient String equipmentText;
+
}
--
Gitblit v1.9.3