From 8904f9e6005e7e1f3cc06f415fdcde0033c32332 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 21 七月 2025 20:33:53 +0800
Subject: [PATCH] art: 技术状态鉴定工单-生成逻辑优化
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java
index b4f75fe..69afb5b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java
@@ -6,6 +6,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderDetail;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.springframework.format.annotation.DateTimeFormat;
@@ -36,6 +37,16 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date evaluationDate;
+ /**閿佸畾宸ュ崟鏃ユ湡;鎻愬墠55澶╅攣瀹氬伐鍗�*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "閿佸畾宸ュ崟鏃ユ湡;鎻愬墠55澶╅攣瀹氬伐鍗�")
+ private Date freezeOrderDate;
+ /**宸ュ崟杩囨湡鏃ユ湡;鍒版湡鏈仛鐩存帴杩囨湡锛屽苟淇敼璁惧鎶�鏈姸鎬佷负绂佺敤*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "宸ュ崟杩囨湡鏃ユ湡;鍒版湡鏈仛鐩存帴杩囨湡锛屽苟淇敼璁惧鎶�鏈姸鎬佷负绂佺敤")
+ private Date orderExpirationDate;
/**閴村畾浜�*/
@ApiModelProperty(value = "閴村畾浜�")
private String evaluator;
@@ -50,6 +61,26 @@
private List<EamTechnicalStatusEvaluationOrderDetail> tableDetailList;
//瀹℃壒鎿嶄綔
+ //缁翠慨瀹や富浠荤‘璁�
+ /**瀹夊叏瑁呯疆妫�鏌ョ‘璁ょ粨鏋�*/
+ @ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁ょ粨鏋�")
+ private String safetyCheckConfirmResult;
+ /**瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ剰瑙�*/
+ @ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ剰瑙�")
+ private String safetyCheckConfirmComment;
+ /**璁惧绮惧害妫�鏌ョ‘璁ょ粨鏋�*/
+ @ApiModelProperty(value = "璁惧绮惧害妫�鏌ョ‘璁ょ粨鏋�")
+ private String precisionCheckConfirmResult;
+ /**璁惧绮惧害妫�鏌ョ‘璁ゆ剰瑙�*/
+ @ApiModelProperty(value = "璁惧绮惧害妫�鏌ョ‘璁ゆ剰瑙�")
+ private String precisionCheckConfirmComment;
+ /**鍏朵粬妫�鏌ョ‘璁ょ粨鏋�*/
+ @ApiModelProperty(value = "鍏朵粬妫�鏌ョ‘璁ょ粨鏋�")
+ private String otherCheckConfirmResult;
+ /**鍏朵粬妫�鏌ョ‘璁ゆ剰瑙�*/
+ @ApiModelProperty(value = "鍏朵粬妫�鏌ョ‘璁ゆ剰瑙�")
+ private String otherCheckConfirmComment;
+ //缁翠慨宸ョ瀛�
/**瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁*/
@ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁")
private String safetyEquipmentCheckResult;
@@ -62,13 +93,35 @@
/**鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/
@ApiModelProperty(value = "鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤")
private String otherCheckResult;
+ //缁翠慨瀹や富浠荤瀛�
+ /**缁翠慨瀹や富浠荤瀛楃粨鏋�*/
+ @ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛楃粨鏋�")
+ private String repairManagerSignatureResult;
+ /**缁翠慨瀹や富浠绘剰瑙�*/
+ @ApiModelProperty(value = "缁翠慨瀹や富浠绘剰瑙�")
+ private String repairManagerComment;
+ //宸ヨ壓鍛樼瀛�
/**璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸*/
@ApiModelProperty(value = "璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸")
private String sampleCheckResult;
+ /**宸ヨ壓鍛樻剰瑙�*/
+ @ApiModelProperty(value = "宸ヨ壓鍛樻剰瑙�")
+ private String processTechnicianComment;
+ //浣跨敤鍗曚綅鎶�鏈富绠＄瀛�
+ /**浣跨敤鍗曚綅鎶�鏈富绠＄瀛楃粨鏋�*/
+ @ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛楃粨鏋�")
+ private String departTechnicalLeaderSignatureResult;
+ /**浣跨敤鍗曚綅鎶�鏈富绠℃剰瑙�*/
+ @ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠℃剰瑙�")
+ private String departTechnicalLeaderComment;
+ //璁惧妫�楠屽憳绛惧瓧
/**閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�*/
@ApiModelProperty(value = "閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�")
private String evaluationResult;
/**闄怽绂佺敤鍘熷洜(澶氶��);瀹夊叏瑁呯疆銆佽澶囧姛鑳姐�佺簿搴︺�佽瘯浠躲�佸叾浠�*/
@ApiModelProperty(value = "闄�/绂佺敤鍘熷洜(澶氶��);瀹夊叏瑁呯疆銆佽澶囧姛鑳姐�佺簿搴︺�佽瘯浠躲�佸叾浠�")
private String evaluationReason;
+ /**璁惧妫�鏌ヤ汉鎰忚*/
+ @ApiModelProperty(value = "璁惧妫�鏌ヤ汉鎰忚")
+ private String inspectorComment;
}
--
Gitblit v1.9.3