From 9de1d40d3a61ce166c63a2c07d02d89bf8bdabd0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 07 三月 2025 16:16:18 +0800
Subject: [PATCH] art: 选择设备查询逻辑修改， 点检工单新增时产线逻辑修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandard.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandard.java
index e65e56e..2127880 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandard.java
@@ -64,12 +64,12 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
/**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
+ @Excel(name = "瀹℃牳缁撴灉", width = 15)
+ @ApiModelProperty(value = "瀹℃牳缁撴灉")
private String maintenanceStandardUda1;
/**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
+ @Excel(name = "瀹℃壒缁撴灉", width = 15)
+ @ApiModelProperty(value = "瀹℃壒缁撴灉")
private String maintenanceStandardUda2;
/**澶囩敤瀛楁3*/
@Excel(name = "澶囩敤瀛楁3", width = 15)
@@ -101,6 +101,32 @@
@ApiModelProperty(value = "鏍囧噯鍒嗙被锛坉aily鏃ュ父鐐规鏍囧噯锛宻pecialty涓撲笟鐐规鏍囧噯锛�")
private String type;
+ @ApiModelProperty(value = "绛惧鐘舵�侊紙1宸茬紪鍒讹紝2椹冲洖缂栧埗锛�3宸插鏍革紝4椹冲洖瀹℃牳锛�5閫氳繃锛�")
+ private String approvalStatus;
+
+ @ApiModelProperty(value = "瀹℃牳/椹冲洖鎰忚")
+ private String auditFeedback;
+
+ @ApiModelProperty(value = "瀹℃壒/椹冲洖鎰忚")
+ private String approvalFeedback;
+
+ @ApiModelProperty(value = "缂栧埗浜�")
+ private String writePerson;
+
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ private String auditPerson;
+
+ @ApiModelProperty(value = "瀹℃壒浜�")
+ private String approvalPerson;
+
+ @ApiModelProperty(value = "瀹℃壒澶辨晥浜�")
+ private String loseEfficacyPerson;
+ /**
+ * 鍖哄垎浜岀骇淇濆吇鏍囧噯 鍜� 涓夌骇淇濆吇鏍囧噯
+ */
+ @ApiModelProperty(value = "瀛楀吀锛氫繚鍏荤被鍨嬶紙2浜岀骇淇濆吇锛�3涓夌骇淇濆吇锛�")
+ private String maintenanceType;
+
/**
* 鐢熸晥鏃堕棿
*/
@@ -121,5 +147,12 @@
@TableField(exist = false)
private List<MaintenanceStandardDetail> maintenanceStandardDetaillist;
+ @TableField(exist = false)
+ private String equipmentNum;
+ @TableField(exist = false)
+ private String equipmentName;
+ @TableField(exist = false)
+ private String equipmentModel;
+
}
--
Gitblit v1.9.3