From 548de3053898bc6571c90d014a40050c39a7d195 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 02 八月 2025 15:33:07 +0800
Subject: [PATCH] 二保添加流转节点
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
index 762c118..4a52c29 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
@@ -103,9 +103,11 @@
private Date actualEndTime;
/** 鎿嶄綔宸� */
@ApiModelProperty(value = "鎿嶄綔宸�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String operator ;
/** 缁翠慨宸� */
@ApiModelProperty(value = "缁翠慨宸�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairman ;
/**
* 淇濆吇鐘舵�� 寰呬繚鍏汇�佷繚鍏讳腑銆佺鐞嗗憳纭銆佹鏌ヤ汉纭銆佸凡瀹屾垚
@@ -126,8 +128,14 @@
*/
@Excel(name = "绠＄悊鍛樼‘璁�", width = 15)
@ApiModelProperty(value = "绠＄悊鍛樼‘璁�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String manageUser;
+ /**
+ * 绠＄悊鍛樼‘璁ょ粨鏋�
+ */
+ @ApiModelProperty(value = "绠＄悊鍛樼‘璁ょ粨鏋�")
+ @Dict(dicCode = "approve_reject")
+ private String manageUserResult;
/** 闂鎻忚堪;榛樿 鏃� */
@ApiModelProperty(name = "闂鎻忚堪",notes = "榛樿 鏃�")
private String problemDescription ;
@@ -138,16 +146,25 @@
@ApiModelProperty(name = "绠＄悊鍛樼‘璁ゆ椂闂�",notes = "")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date confirmTime ;
+ private Date confirmTime;
/** 妫�鏌ヤ汉纭 */
@ApiModelProperty(name = "妫�鏌ヤ汉纭",notes = "")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String inspector;
+ /**
+ * 妫�鏌ヤ汉纭缁撴灉
+ */
+ @ApiModelProperty(name = "妫�鏌ヤ汉纭缁撴灉",notes = "")
+ @Dict(dicCode = "approve_reject")
+ private String inspectorResult;
/** 妫�鏌ヤ汉鎰忚 */
@ApiModelProperty(name = "妫�鏌ヤ汉鎰忚",notes = "")
private String inspectConfirmComment;
/** 妫�鏌ヤ汉纭鏃堕棿 */
@ApiModelProperty(name = "妫�鏌ヤ汉纭鏃堕棿",notes = "")
- private String inspectConfirmTime;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date inspectConfirmTime;
/** HF缂栫爜 */
@ApiModelProperty(name = "HF缂栫爜",notes = "")
private String hfCode;
@@ -166,4 +183,8 @@
//鍨嬪彿
@TableField(exist = false)
private String equipmentModel;
+
+ //娴佽浆鑺傜偣浣跨敤鏌ヨ
+ @TableField(exist = false)
+ private String procInstId;
}
--
Gitblit v1.9.3