From 57df7097f99ffe16a4b81876f23aebf38b637ec5 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 22 七月 2025 11:24:15 +0800
Subject: [PATCH] art: 技术状态变更申请-验收接口
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java
index 567a90e..57973e2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java
@@ -1,13 +1,16 @@
package org.jeecg.modules.eam.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+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.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -40,6 +43,9 @@
/**鏇存柊鏃堕棿*/
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
+ /**鍙樻洿鍗旾D*/
+ @ApiModelProperty(value = "鍙樻洿鍗旾D")
+ private String changeOrderId;
/**璁惧ID*/
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
@@ -48,6 +54,8 @@
private String changeCategory;
/**鍙樻洿鏃ユ湡*/
@ApiModelProperty(value = "鍙樻洿鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date changeDate;
/**鍙樻洿鍚庢妧鏈姸鎬�;鍙樻洿閫氳繃鍚庨粯璁よ澶囨妧鏈姸鎬佹敼涓虹鐢�*/
@ApiModelProperty(value = "鍙樻洿鍚庢妧鏈姸鎬�;鍙樻洿閫氳繃鍚庨粯璁よ澶囨妧鏈姸鎬佹敼涓虹鐢�")
@@ -61,7 +69,17 @@
/**楠屾敹妫�鏌ョ粨鏋�;澶т慨銆佹敼閫� 闇�瑕佸～鍐欓獙鏀剁粨鏋滐紝鎼縼鎸夌収鎶�鏈姸鎬侀壌瀹氬伐鍗曠淮鎶わ紝鍏朵粬鏆傛湭浣跨敤鍒帮紝鍙鐣欐绫诲瀷*/
@ApiModelProperty(value = "楠屾敹妫�鏌ョ粨鏋�;澶т慨銆佹敼閫� 闇�瑕佸～鍐欓獙鏀剁粨鏋滐紝鎼縼鎸夌収鎶�鏈姸鎬侀壌瀹氬伐鍗曠淮鎶わ紝鍏朵粬鏆傛湭浣跨敤鍒帮紝鍙鐣欐绫诲瀷")
private String acceptanceCheckResult;
- /**鎶�鏈姸鎬侀壌瀹氬伐鍗旾D;鎼縼浣跨敤*/
- @ApiModelProperty(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗旾D;鎼縼浣跨敤")
- private String orderId;
+ /**楠屾敹鎰忚*/
+ @ApiModelProperty(value = "楠屾敹鎰忚")
+ private String acceptanceCheckComment;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+ @TableField(exist = false)
+ private String equipmentModel;
+ @TableField(exist = false)
+ private String factoryName;
}
--
Gitblit v1.9.3