From 99d6db0aab044b740ce02f57872c1e38ae647b58 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 19:00:50 +0800
Subject: [PATCH] 三不原则分析 中心修改 台账导入导出字段修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusDeactivate.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusDeactivate.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusDeactivate.java
index 3d25acc..58d268f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusDeactivate.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusDeactivate.java
@@ -3,11 +3,14 @@
import com.baomidou.mybatisplus.annotation.IdType;
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;
@@ -48,35 +51,57 @@
private String deactivateOrderNum;
/**鐢宠浜�*/
@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_deactivate_status")
private String applicationStatus;
/**浣跨敤鍗曚綅瀹や富绠＄瀛�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅瀹や富绠＄瀛�")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String departHeaderSignature;
+ /**浣跨敤鍗曚綅瀹や富绠＄瀛楃粨鏋�*/
+ @ApiModelProperty(value = "浣跨敤鍗曚綅瀹や富绠＄瀛楃粨鏋�")
+ @Dict(dicCode = "approved_rejected")
+ private String departHeaderSignatureResult;
/**浣跨敤鍗曚綅瀹や富绠＄瀛楁椂闂�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅瀹や富绠＄瀛楁椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date departHeaderSignatureTime;
/**浣跨敤鍗曚綅瀹や富绠℃剰瑙�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅瀹や富绠℃剰瑙�")
- private String departHeaderSignatureComment;
+ private String departHeaderComment;
/**浣跨敤鍗曚綅閮ㄤ富绠＄瀛�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠＄瀛�")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String departLeaderSignature;
+ /**浣跨敤鍗曚綅閮ㄤ富绠＄瀛楃粨鏋�*/
+ @ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠＄瀛楃粨鏋�")
+ @Dict(dicCode = "approved_rejected")
+ private String departLeaderSignatureResult;
/**浣跨敤鍗曚綅閮ㄤ富绠＄瀛楁椂闂�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠＄瀛楁椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date departLeaderSignatureTime;
- /**浣跨敤鍗曚綅閮ㄤ富绠＄瀛�*/
- @ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠＄瀛�")
- private String departLeaderSignatureComment;
+ /**浣跨敤鍗曚綅閮ㄤ富绠℃剰瑙�*/
+ @ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠℃剰瑙�")
+ private String departLeaderComment;
/**HF缂栫爜*/
@ApiModelProperty(value = "HF缂栫爜")
private String hfCode;
+ /**澶囨敞*/
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
}
--
Gitblit v1.9.3