From a640e58d5f28a62eb54491fb0a0afac48fe04285 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期四, 10 七月 2025 14:55:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java | 74 +++++++++++++++++++++++++++++++++++++ 1 files changed, 74 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 new file mode 100644 index 0000000..b4f75fe --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderRequest.java @@ -0,0 +1,74 @@ +package org.jeecg.modules.eam.request; + +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.modules.eam.entity.EamTechnicalStatusEvaluationOrderDetail; +import org.jeecg.modules.flowable.domain.vo.FlowTaskVo; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曞璞�", description="鎶�鏈姸鎬侀壌瀹氬伐鍗�") +public class EamTechnicalStatusEvaluationOrderRequest extends FlowTaskVo implements Serializable { + /**涓婚敭*/ + @ApiModelProperty(value = "涓婚敭") + private String id; + /**宸ュ崟鍙�*/ + @ApiModelProperty(value = "宸ュ崟鍙�") + private String orderNum; + /**璁惧ID*/ + @ApiModelProperty(value = "璁惧ID") + private String equipmentId; + /**瑙勮寖ID*/ + @ApiModelProperty(value = "瑙勮寖ID") + private String standardId; + /**璁″垝閴村畾鏃ユ湡*/ + @ApiModelProperty(value = "璁″垝閴村畾鏃ユ湡") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date evaluationDate; + /**閴村畾浜�*/ + @ApiModelProperty(value = "閴村畾浜�") + private String evaluator; + /**鍒涘缓鏂瑰紡*/ + @ApiModelProperty(value = "鍒涘缓鏂瑰紡") + private String creationMethod; + /**澶囨敞*/ + @ApiModelProperty(value = "澶囨敞") + private String remark; + /**鍒楄〃 淇濆吇椤规槑缁�*/ + @ApiModelProperty(value = "鍒楄〃 妫�鏌ラ」鏄庣粏") + private List<EamTechnicalStatusEvaluationOrderDetail> tableDetailList; + + //瀹℃壒鎿嶄綔 + /**瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁*/ + @ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁") + private String safetyEquipmentCheckResult; + /**绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/ + @ApiModelProperty(value = "绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤") + private String precisionCheckResult; + /**鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁*/ + @ApiModelProperty(value = "鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁") + private String functionalCheckResult; + /**鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/ + @ApiModelProperty(value = "鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤") + private String otherCheckResult; + /**璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸*/ + @ApiModelProperty(value = "璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸") + private String sampleCheckResult; + /**閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�*/ + @ApiModelProperty(value = "閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�") + private String evaluationResult; + /**闄怽绂佺敤鍘熷洜(澶氶��);瀹夊叏瑁呯疆銆佽澶囧姛鑳姐�佺簿搴︺�佽瘯浠躲�佸叾浠�*/ + @ApiModelProperty(value = "闄�/绂佺敤鍘熷洜(澶氶��);瀹夊叏瑁呯疆銆佽澶囧姛鑳姐�佺簿搴︺�佽瘯浠躲�佸叾浠�") + private String evaluationReason; +} -- Gitblit v1.9.3