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/EamInspectionOrder.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
index fb934c4..bb2358a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
@@ -16,6 +16,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* @Description: 鐐规宸ュ崟
@@ -64,12 +65,12 @@
/**璁惧ID*/
@Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
- @Dict(dictTable = "eam_equipment", dicCode = "equipment_code", dicText = "id")
+ @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code")
private String equipmentId;
/**鏍囧噯ID*/
@Excel(name = "淇濆吇鏍囧噯ID", width = 15)
@ApiModelProperty(value = "淇濆吇鏍囧噯ID")
- @Dict(dictTable = "eam_maintenance_standard", dicCode = "standard_code", dicText = "id")
+ @Dict(dictTable = "eam_maintenance_standard", dicCode = "id", dicText = "standard_code")
private String standardId;
/**鐐规鏃ユ湡*/
@Excel(name = "鐐规鏃ユ湡锛堣鍒掞級", width = 15, format = "yyyy-MM-dd")
@@ -97,10 +98,12 @@
/**鍒涘缓鏂瑰紡*/
@Excel(name = "鍒涘缓鏂瑰紡", width = 15)
@ApiModelProperty(value = "鍒涘缓鏂瑰紡")
+ @Dict(dicCode = "order_creation_method")
private String creationMethod;
/**鐐规鐘舵��*/
@Excel(name = "鐐规鐘舵��", width = 15)
- @ApiModelProperty(value = "鐐规鐘舵�� 寰呯偣妫�-寰呯‘璁�-宸插畬鎴�")
+ @ApiModelProperty(value = "鐐规鐘舵�� 寰呯偣妫�-鐐规涓�-寰呯‘璁�-宸插畬鎴�-浣滃簾")
+ @Dict(dicCode = "inspection_status")
private String inspectionStatus;
/**鐝粍闀跨‘璁�*/
@Excel(name = "鐝粍闀跨‘璁�", width = 15)
@@ -121,4 +124,26 @@
@Excel(name = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧-鎵ц鏃�", width = 15)
@ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧")
private String imageFiles;
+
+ /**鏍囧噯鍚嶇О*/
+ @ApiModelProperty(value = "鏍囧噯鍚嶇О")
+ private transient String standardName;
+ /**淇濆吇鍛ㄦ湡;鍗曚綅:澶�*/
+ @ApiModelProperty(value = "淇濆吇鍛ㄦ湡;鍗曚綅:澶�")
+ private transient Integer maintenancePeriod;
+ /**璁惧缂栧彿*/
+ @ApiModelProperty(value = "璁惧缂栧彿")
+ private transient String equipmentCode;
+
+ /**鍒楄〃 淇濆吇椤规槑缁�*/
+ @ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
+ private transient List<EamInspectionOrderDetail> tableDetailList;
+
+ /**澶勭悊绫诲瀷*/
+ @ApiModelProperty(value = "澶勭悊绫诲瀷")
+ private transient String dealType;
+
+ /**澶勭悊鎰忚*/
+ @ApiModelProperty(value = "澶勭悊鎰忚")
+ private transient String dealSuggestion;
}
--
Gitblit v1.9.3