From 58f63d0e061123b15f780d294272d8a461f183db Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 23 七月 2025 17:41:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceChange.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceChange.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceChange.java
index 06065f9..28b0887 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceChange.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceChange.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -41,6 +42,7 @@
*/
@Excel(name = "涓変繚宸ュ崟ID", width = 15)
@ApiModelProperty(value = "涓変繚宸ュ崟ID")
+ @Dict(dictTable = "eam_third_maintenance_order", dicCode = "id", dicText = "order_num")
private String orderId;
/**
* 鍙樻洿鍗曞彿
@@ -53,13 +55,14 @@
*/
@Excel(name = "鐢宠浜�", width = 15)
@ApiModelProperty(value = "鐢宠浜�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String applicant;
/**
* 鐢宠閮ㄩ棬
*/
@Excel(name = "鐢宠閮ㄩ棬", width = 15)
@ApiModelProperty(value = "鐢宠閮ㄩ棬")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
private String factoryOrgCode;
/**
* 鐢宠鏃ユ湡
@@ -74,18 +77,21 @@
*/
@Excel(name = "鐢宠绫诲瀷;鎶ュ簾銆佸欢淇�", width = 15)
@ApiModelProperty(value = "鐢宠绫诲瀷;鎶ュ簾銆佸欢淇�")
+ @Dict(dicCode = "third_maintenance_change_category")
private String applyCategory;
/**
* 鍙樻洿鐘舵��;寰呮彁浜ゃ�佸緟涓荤瀹℃牳銆佸緟閮ㄩ棬纭銆佸緟淇濋殰閮ㄧ‘璁ゃ�佸凡浣滃簾銆佸凡瀹屾垚
*/
@Excel(name = "鍙樻洿鐘舵��;寰呮彁浜ゃ�佸緟涓荤瀹℃牳銆佸緟閮ㄩ棬纭銆佸緟淇濋殰閮ㄧ‘璁ゃ�佸凡浣滃簾銆佸凡瀹屾垚", width = 15)
@ApiModelProperty(value = "鍙樻洿鐘舵��;寰呮彁浜ゃ�佸緟涓荤瀹℃牳銆佸緟閮ㄩ棬纭銆佸緟淇濋殰閮ㄧ‘璁ゃ�佸凡浣滃簾銆佸凡瀹屾垚")
+ @Dict(dicCode = "third_maintenance_change_status")
private String changeStatus;
/**
* 寤朵繚鍘熷洜绫诲瀷;鐢熶骇浠诲姟銆佽澶囨晠闅溿�佹姤搴熴�佸ぇ淇」淇�佹惉杩�
*/
@Excel(name = "寤朵繚鍘熷洜绫诲瀷;鐢熶骇浠诲姟銆佽澶囨晠闅溿�佹姤搴熴�佸ぇ淇」淇�佹惉杩�", width = 15)
@ApiModelProperty(value = "寤朵繚鍘熷洜绫诲瀷;鐢熶骇浠诲姟銆佽澶囨晠闅溿�佹姤搴熴�佸ぇ淇」淇�佹惉杩�")
+ @Dict(dicCode = "third_maintenance_change_reason")
private String applyReasonType;
/**
* 寤朵繚(鍙樻洿)鍘熷洜
@@ -106,7 +112,7 @@
*/
@Excel(name = "涓荤棰嗗绛惧瓧", width = 15)
@ApiModelProperty(value = "涓荤棰嗗绛惧瓧")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String equipmentManagerSignature;
/**
* 涓荤棰嗗绛惧瓧鏃堕棿
@@ -116,12 +122,22 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date equipmentManagerSignatureTime;
+ /**涓荤棰嗗绛惧瓧缁撴灉*/
+ @ApiModelProperty(value = "涓荤棰嗗绛惧瓧缁撴灉")
+ @Dict(dicCode = "approve_reject")
+ private String equipmentManagerSignatureResult;
+ /**
+ * 閮ㄩ棬棰嗗鎰忚
+ */
+ @Excel(name = "涓荤棰嗗鎰忚", width = 15)
+ @ApiModelProperty(value = "涓荤棰嗗鎰忚")
+ private String equipmentManagerComment;
/**
* 閮ㄩ棬棰嗗绛惧瓧;鏍规嵁寤朵繚鍘熷洜绫诲瀷鍖哄垎涓嶅悓鐨勪汉瀹℃壒
*/
@Excel(name = "閮ㄩ棬棰嗗绛惧瓧;鏍规嵁寤朵繚鍘熷洜绫诲瀷鍖哄垎涓嶅悓鐨勪汉瀹℃壒", width = 15)
@ApiModelProperty(value = "閮ㄩ棬棰嗗绛惧瓧;鏍规嵁寤朵繚鍘熷洜绫诲瀷鍖哄垎涓嶅悓鐨勪汉瀹℃壒")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String departManagerSignature;
/**
* 閮ㄩ棬棰嗗绛惧瓧鏃堕棿
@@ -131,6 +147,10 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date departManagerSignatureTime;
+ /**閮ㄩ棬棰嗗绛惧瓧缁撴灉*/
+ @ApiModelProperty(value = "閮ㄩ棬棰嗗绛惧瓧缁撴灉")
+ @Dict(dicCode = "approve_reject")
+ private String departManagerSignatureResult;
/**
* 閮ㄩ棬棰嗗鎰忚
*/
@@ -142,7 +162,7 @@
*/
@Excel(name = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛�", width = 15)
@ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String productionSupportSignature;
/**
* 鐢熶骇淇濋殰閮ㄩ瀵肩瀛楁椂闂�
@@ -152,6 +172,10 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date productionSupportSignatureTime;
+ /**鐢熶骇淇濋殰閮ㄩ瀵肩瀛楃粨鏋�*/
+ @ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛楃粨鏋�")
+ @Dict(dicCode = "approve_reject")
+ private String productionSupportSignatureResult;
/**
* 鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�
*/
@@ -164,4 +188,12 @@
@Excel(name = "HF缂栫爜", width = 15)
@ApiModelProperty(value = "HF缂栫爜")
private String hfCode;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+ @TableField(exist = false)
+ private String equipmentModel;
}
--
Gitblit v1.9.3