From 44f4c17ed71ccaf151d600836f7ef32a8c2dbaea Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 25 四月 2024 16:46:50 +0800
Subject: [PATCH] 完善报告；完善检验对象内容
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index 9e4218b..b67eb1b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -8,6 +8,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -20,25 +21,24 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @ValueTableShow(2)
+ //@ValueTableShow(2)
@ApiModelProperty(value = "澶х被")
private String largeCategory;
- @ValueTableShow(3)
+ @ValueTableShow(13)
@ApiModelProperty(value = "鍑哄巶鏃ユ湡")
- @TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String dateProduction;
@ValueTableShow(4)
@ApiModelProperty(value = "璁惧璐熻矗浜�")
- private String equipmentManager;
+ private Integer equipmentManager;
@ValueTableShow(5)
@ApiModelProperty(value = "琚巿鏉冧汉")
private String authorizedPerson;
- @ValueTableShow(6)
+ @ValueTableShow(1)
@ApiModelProperty(value = "璁惧鍚嶇О")
private String deviceName;
@@ -52,13 +52,10 @@
@ValueTableShow(9)
@ApiModelProperty(value = "鏍″噯鏃ユ湡锛堟湀锛�")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime calibrationDate;
+ private String calibrationDate;
@ValueTableShow(10)
@ApiModelProperty(value = "鎶ュ簾鏃ユ湡")
- @TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime scrapTime;
@@ -71,12 +68,11 @@
private String subclass;
@ValueTableShow(13)
- @ApiModelProperty(value = "鍑哄巶缂栧彿")
+ @ApiModelProperty(value = "璁惧缂栫爜")
private String factoryNo;
@ValueTableShow(14)
@ApiModelProperty(value = "璐疆鏃ユ湡")
- @TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String acquisitionDate;
@@ -92,9 +88,9 @@
@ApiModelProperty(value = "瑙勬牸鍨嬪彿")
private String specificationModel;
- @ValueTableShow(18)
+ @ValueTableShow(6)
@ApiModelProperty(value = "璁惧鐘舵��")
- private String deviceStatus;
+ private Integer deviceStatus;
@ValueTableShow(19)
@ApiModelProperty(value = "瀛樻斁鐐�")
@@ -102,13 +98,11 @@
@ValueTableShow(20)
@ApiModelProperty(value = "鏈�杩戣拷婧棩鏈�")
- @TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime latestTraceability;
@ValueTableShow(21)
@ApiModelProperty(value = "鍋滅敤鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime downTime;
@@ -155,4 +149,8 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+ @ValueTableShow(12)
+ @ApiModelProperty(value = "妫�楠岄」鐩�")
+ private String insProductIds;
+
}
--
Gitblit v1.9.3