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/EamReportRepair.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java
index 9ca62b5..1cdc36e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java
@@ -31,9 +31,22 @@
private static final long serialVersionUID = 3966250456529614720L;
/**
+ * 璁惧ID
+ */
+ @Excel(name = "璁惧ID", width = 15, dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code")
+ @ApiModelProperty(value = "璁惧ID")
+ @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code")
+ private String equipmentId;
+ /**
+ * 璁惧鍚嶇О
+ */
+ @Excel(name = "璁惧鍚嶇О", width = 15)
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ private String equipmentName;
+ /**
* 鍒犻櫎鏍囪
*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@Dict(dicCode = "del_flag")
private Integer delFlag;
@@ -43,20 +56,15 @@
@ApiModelProperty(value = "鏁呴殰寮�濮嬫椂闂�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鏁呴殰寮�濮嬫椂闂�", width = 15, format = "yyyy-MM-dd HH:mm:ss")
private Date faultStartTime;
/**
* 鏄惁鍋滄満
*/
- @Excel(name = "鏄惁鍋滄満", width = 15)
+ @Excel(name = "鏄惁鍋滄満", width = 15, dicCode = "breakdown_flag")
@ApiModelProperty(value = "鏄惁鍋滄満")
@Dict(dicCode = "breakdown_flag")
private String breakdownFlag;
- /**
- * 璁惧ID
- */
- @Excel(name = "璁惧ID", width = 15)
- @ApiModelProperty(value = "璁惧ID")
- private String equipmentId;
/**
* 鏁呴殰绠�绉�
*/
@@ -66,7 +74,7 @@
/**
* 鏁呴殰鍒嗙被
*/
- @Excel(name = "鏁呴殰鍒嗙被", width = 15)
+ @Excel(name = "鏁呴殰鍒嗙被", width = 15, dicCode = "fault_reason_category")
@ApiModelProperty(value = "鏁呴殰鍒嗙被")
@Dict(dicCode = "fault_reason_category")
private String faultType;
@@ -79,14 +87,14 @@
/**
* 鎶ヤ慨鐘舵��
*/
- @Excel(name = "鎶ヤ慨鐘舵��", width = 15)
+ @Excel(name = "鎶ヤ慨鐘舵��", width = 15, dicCode = "report_repair_status")
@ApiModelProperty(value = "鎶ヤ慨鐘舵��")
@Dict(dicCode = "report_repair_status")
private String reportStatus;
/**
* 鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧
*/
- @Excel(name = "鐓х墖", width = 15)
+ @Excel(name = "鐓х墖", width = 15, type = 2)
@ApiModelProperty(value = "鐓х墖")
private String imageFiles;
/**
@@ -96,7 +104,4 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @TableField(exist = false)
- @ApiModelProperty(value = "璁惧鍚嶇О")
- private String equipmentName;
}
--
Gitblit v1.9.3