From 0e657827e6c501994c14bc273c7f2444d6c813a4 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 14 七月 2025 12:01:41 +0800
Subject: [PATCH] art:技术状态鉴定工单，字段转译修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java
index 9243597..82ed920 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java
@@ -81,8 +81,9 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
private Date actualEndTime;
- /**閴村畾浜�*/
- @ApiModelProperty(value = "閴村畾浜�")
+ /**棰嗗彇浜�*/
+ @ApiModelProperty(value = "棰嗗彇浜�")
+ @Dict(dicCode = "sys_user, realname, username")
private String evaluator;
/**閴村畾鐘舵��;寰呴壌瀹氥�侀壌瀹氫腑銆佺淮淇涓讳换绛惧瓧銆佸伐鑹轰汉鍛樼瀛椼�佷娇鐢ㄥ崟浣嶆妧鏈富绠＄瀛椼�佽澶囨楠屽憳绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡杩囨湡*/
@ApiModelProperty(value = "閴村畾鐘舵��;寰呴壌瀹氥�侀壌瀹氫腑銆佺淮淇涓讳换绛惧瓧銆佸伐鑹轰汉鍛樼瀛椼�佷娇鐢ㄥ崟浣嶆妧鏈富绠＄瀛椼�佽澶囨楠屽憳绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡杩囨湡")
@@ -113,10 +114,10 @@
/**瀹夊叏瑁呯疆妫�鏌ョ‘璁ょ粨鏋�*/
@ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁ょ粨鏋�")
@Dict(dicCode = "approved_rejected")
- private String safetyCheckResult;
+ private String safetyCheckConfirmResult;
/**瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ剰瑙�*/
@ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ剰瑙�")
- private String safetyCheckComment;
+ private String safetyCheckConfirmComment;
/**璁惧绮惧害妫�鏌ョ‘璁や汉*/
@ApiModelProperty(value = "璁惧绮惧害妫�鏌ョ‘璁や汉")
@Dict(dicCode = "sys_user, realname, username")
@@ -155,7 +156,7 @@
private String safetyEquipmentCheckResult;
/**绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/
@ApiModelProperty(value = "绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤")
- @Dict(dicCode = "ye_no_none")
+ @Dict(dicCode = "yes_no_none")
private String precisionCheckResult;
/**鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁*/
@ApiModelProperty(value = "鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁")
@@ -163,7 +164,7 @@
private String functionalCheckResult;
/**鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/
@ApiModelProperty(value = "鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤")
- @Dict(dicCode = "ye_no_none")
+ @Dict(dicCode = "yes_no_none")
private String otherCheckResult;
/**缁翠慨浜虹瀛�*/
@ApiModelProperty(value = "缁翠慨浜虹瀛�")
@@ -213,7 +214,7 @@
@ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛楁椂闂�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private String departTechnicalLeaderSignatureTime;
+ private Date departTechnicalLeaderSignatureTime;
/**浣跨敤鍗曚綅鎶�鏈富绠＄瀛楃粨鏋�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛楃粨鏋�")
@Dict(dicCode = "approved_rejected")
--
Gitblit v1.9.3