From 0a19d4923b0a048aee0cda91c37f25bc6e140d54 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 16 七月 2025 21:01:24 +0800
Subject: [PATCH] 修改接收字段
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderChange.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderChange.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderChange.java
index bc81f5d..7b416fd 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderChange.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderChange.java
@@ -4,11 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -55,43 +58,75 @@
private String changeOrderNum;
/**鐢宠浜�*/
@ApiModelProperty(value = "鐢宠浜�")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String applicant;
/**鐢宠閮ㄩ棬*/
@ApiModelProperty(value = "鐢宠閮ㄩ棬")
+ @Dict(dictTable = "eam_base_factory", dicText = "factory_name", dicCode = "org_code")
private String factoryOrgCode;
/**鐢宠鏃ユ湡*/
@ApiModelProperty(value = "鐢宠鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date applyDate;
/**鍙樻洿鐘舵��;寰呮彁浜ゃ�佸緟涓荤瀹℃牳銆佸緟閮ㄩ棬纭銆佸緟淇濋殰閮ㄧ‘璁ゃ�佸凡浣滃簾銆佸凡瀹屾垚*/
@ApiModelProperty(value = "鍙樻洿鐘舵��;寰呮彁浜ゃ�佸緟涓荤瀹℃牳銆佸緟閮ㄩ棬纭銆佸緟淇濋殰閮ㄧ‘璁ゃ�佸凡浣滃簾銆佸凡瀹屾垚")
+ @Dict(dicCode = "technical_status_evaluation_order_change_status")
private String changeStatus;
/**鍙樻洿鍘熷洜;鐢熶骇浠诲姟鎬ユ棤娉曞仠鏈恒�佽澶囨晠闅滄澶勪簬缁翠慨鐘舵�併�佽澶囧凡鎶ュ簾銆佽澶囧ぇ淇�佹惉杩併�佹敼閫�*/
@ApiModelProperty(value = "鍙樻洿鍘熷洜;鐢熶骇浠诲姟鎬ユ棤娉曞仠鏈恒�佽澶囨晠闅滄澶勪簬缁翠慨鐘舵�併�佽澶囧凡鎶ュ簾銆佽澶囧ぇ淇�佹惉杩併�佹敼閫�")
+ @Dict(dicCode = "technical_status_evaluation_order_change_reason")
private String applyReason;
/**鍙樻洿閴村畾鏃ユ湡*/
@ApiModelProperty(value = "鍙樻洿閴村畾鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date deferredEvaluationDate;
/**涓荤棰嗗绛惧瓧*/
@ApiModelProperty(value = "涓荤棰嗗绛惧瓧")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String equipmentManagerSignature;
/**涓荤棰嗗绛惧瓧鏃堕棿*/
@ApiModelProperty(value = "涓荤棰嗗绛惧瓧鏃堕棿")
+ @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 = "approved_rejected")
+ private String equipmentManagerSignatureResult;
+ /**涓荤棰嗗鎰忚*/
+ @ApiModelProperty(value = "涓荤棰嗗鎰忚")
+ private String equipmentManagerComment;
/**閮ㄩ棬棰嗗绛惧瓧;鏍规嵁鍙樻洿鍘熷洜绫诲瀷鍖哄垎涓嶅悓鐨勪汉瀹℃壒*/
@ApiModelProperty(value = "閮ㄩ棬棰嗗绛惧瓧;鏍规嵁鍙樻洿鍘熷洜绫诲瀷鍖哄垎涓嶅悓鐨勪汉瀹℃壒")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String departManagerSignature;
/**閮ㄩ棬棰嗗绛惧瓧鏃堕棿*/
@ApiModelProperty(value = "閮ㄩ棬棰嗗绛惧瓧鏃堕棿")
+ @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 = "approved_rejected")
+ private String departManagerSignatureResult;
/**閮ㄩ棬棰嗗鎰忚*/
@ApiModelProperty(value = "閮ㄩ棬棰嗗鎰忚")
private String departManagerComment;
/**鐢熶骇淇濋殰閮ㄩ瀵肩瀛�*/
@ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛�")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String productionSupportSignature;
/**鐢熶骇淇濋殰閮ㄩ瀵肩瀛楁椂闂�*/
@ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛楁椂闂�")
+ @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 = "approved_rejected")
+ private String productionSupportSignatureResult;
/**鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�*/
@ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�")
private String productionSupportComment;
--
Gitblit v1.9.3