From 5836788a6aabf60014a746b724607e3e965a0d86 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 10 六月 2025 10:51:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java | 98 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 76 insertions(+), 22 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
index 8d2c264..c28502d 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
@@ -51,7 +51,7 @@
*/
@Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
- @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code")
+// @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code")
private String equipmentId;
/**
* 缁翠慨鐘舵��
@@ -70,16 +70,23 @@
*/
@ApiModelProperty(value = "缁翠慨缁撴潫鏃堕棿")
private Date actualEndTime;
+
/**
- * 鏄惁棰嗙敤澶囦欢 1锛氭槸 0锛氬惁
+ * 缁翠慨纭缁撴灉
*/
- @ApiModelProperty(value = "鏄惁棰嗙敤澶囦欢")
- private Integer isUseSpare;
+ @ApiModelProperty(value = "缁翠慨纭缁撴灉")
+ @Dict(dicCode = "yn")
+ private String repairConfirm;
/**
- * 澶囦欢鎻忚堪
+ * 缁翠慨纭鎰忚
*/
- @ApiModelProperty(value = "澶囦欢鎻忚堪")
- private String sparePartDescription;
+ @ApiModelProperty(value = "缁翠慨纭鎰忚")
+ private String repairConfirmComment;
+ /**
+ * 缁翠慨纭鏃堕棿
+ */
+ @ApiModelProperty(value = "缁翠慨纭鏃堕棿")
+ private Date repairConfirmTime;
/**
* 鏁呴殰鍘熷洜
*/
@@ -99,42 +106,89 @@
@ApiModelProperty(value = "缁翠慨璐熻矗浜�")
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairer;
+
/**
- * 鏄惁濮斿
+ * 纭棰嗗
*/
- @Excel(name = "鏄惁濮斿", width = 15)
- @ApiModelProperty(value = "鏄惁濮斿")
- private String outsourcedFlag;
+ @ApiModelProperty(value = "纭棰嗗")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String leaderUser;
/**
- * 濮斿缁翠慨鎻忚堪
+ * 棰嗗纭缁撴灉
*/
- @Excel(name = "濮斿缁翠慨鎻忚堪", width = 15)
- @ApiModelProperty(value = "濮斿缁翠慨鎻忚堪")
- private String outsourcedRepairDescription;
+ @ApiModelProperty(value = "棰嗗纭缁撴灉")
+ @Dict(dicCode = "yn")
+ private String leaderConfirm;
/**
- * 濮斿缁翠慨寮�濮嬫椂闂�
+ * 纭鎰忚
*/
- @ApiModelProperty(value = "濮斿缁翠慨寮�濮嬫椂闂�")
- private Date outsourcedStartTime;
+ @ApiModelProperty(value = "纭鎰忚")
+ private String leaderConfirmComment;
/**
- * 濮斿缁翠慨缁撴潫鏃堕棿
+ * 纭鏃堕棿
*/
- @ApiModelProperty(value = "濮斿缁翠慨缁撴潫鏃堕棿")
- private Date outsourcedEndTime;
+ @ApiModelProperty(value = "纭鏃堕棿")
+ private Date leaderConfirmTime;
+ /**
+ * 鏈哄姩鍔炵淮淇汉
+ */
+ @ApiModelProperty(value = "鏈哄姩鍔炵淮淇汉")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String externalRepairer;
+ /**
+ * 鏈哄姩鍔炵‘璁ょ粨鏋�
+ */
+ @ApiModelProperty(value = "鏈哄姩鍔炵‘璁ょ粨鏋�")
+ @Dict(dicCode = "yn")
+ private String externalConfirm;
+ /**
+ * 鏈哄姩鍔炵‘璁ゆ剰瑙�
+ */
+ @ApiModelProperty(value = "鏈哄姩鍔炵‘璁ゆ剰瑙�")
+ private String externalConfirmComment;
+ /**
+ * 鏈哄姩鍔炵‘璁ゆ椂闂�
+ */
+ @ApiModelProperty(value = "鏈哄姩鍔炵‘璁ゆ椂闂�")
+ private Date externalConfirmTime;
/**
* 濮斿璐熻矗浜�
*/
@Excel(name = "濮斿璐熻矗浜�", width = 15)
@ApiModelProperty(value = "濮斿璐熻矗浜�")
- private String outsourcedPerson;
+ private String outsourcedUser;
/**
* 鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧
*/
@Excel(name = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧", width = 15)
@ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧")
private String imageFiles;
+ /**
+ * 鎿嶄綔宸ョ‘璁�
+ */
+ @ApiModelProperty(value = "鎿嶄綔宸ョ‘璁�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String confirmer;
+ /**
+ * 鎿嶄綔宸ョ‘璁ゆ剰瑙�
+ */
+ @ApiModelProperty(value = "鎿嶄綔宸ョ‘璁ゆ剰瑙�")
+ private String confirmComment;
+ /**
+ * 鎿嶄綔宸ョ‘璁ゆ椂闂�
+ */
+ @ApiModelProperty(value = "鎿嶄綔宸ョ‘璁ゆ椂闂�")
+ private Date confirmTime;
@TableField(exist = false)
@ApiModelProperty(value = "璁惧鍚嶇О")
private String equipmentName;
+ /**
+ * 璁惧缂栫爜
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁惧缂栫爜")
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String installationPosition;
}
--
Gitblit v1.9.3