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 |   58 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 35 insertions(+), 23 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 236bdbd..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;
 
@@ -85,48 +81,59 @@
     private String accurateMeasurement;
 
     @ValueTableShow(16)
+    @ApiModelProperty(value = "澶囨敞")
+    private String notes;
+
+    @ValueTableShow(17)
     @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
     private String specificationModel;
 
-    @ValueTableShow(17)
+    @ValueTableShow(6)
     @ApiModelProperty(value = "璁惧鐘舵��")
-    private String deviceStatus;
+    private Integer deviceStatus;
 
-    @ValueTableShow(18)
+    @ValueTableShow(19)
     @ApiModelProperty(value = "瀛樻斁鐐�")
     private String storagePoint;
 
-    @ValueTableShow(19)
+    @ValueTableShow(20)
     @ApiModelProperty(value = "鏈�杩戣拷婧棩鏈�")
-    @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime latestTraceability;
 
-    @ValueTableShow(20)
+    @ValueTableShow(21)
     @ApiModelProperty(value = "鍋滅敤鏃堕棿")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime downTime;
 
-    @ValueTableShow(21)
+    @ValueTableShow(22)
     @ApiModelProperty(value = "缁翠慨璁板綍")
     private String maintenanceRecords;
 
-    @ValueTableShow(22)
+    @ValueTableShow(23)
     @ApiModelProperty(value = "鐢熶骇鍘傚")
     private String manufacturer;
 
-    @ValueTableShow(23)
+    @ValueTableShow(24)
     @ApiModelProperty(value = "妫�娴嬬被鍨�")
     private String detectionType;
 
-    @ValueTableShow(24)
+    @ValueTableShow(25)
     @ApiModelProperty(value = "閲囪喘璐圭敤")
     private String procurementCosts;
 
-    @ValueTableShow(25)
+    @ValueTableShow(26)
     @ApiModelProperty(value = "鏍″噯璇佷功")
     private String calibrationCerticate;
+
+    @ApiModelProperty(value = "鐘舵��")
+    private Integer status;
+
+    @ApiModelProperty(value = "鍥剧墖涓婁紶")
+    private String imageUpload;
+
+    @ApiModelProperty(value = "鍥剧墖澶囨敞")
+    private String imageName;
 
     @ApiModelProperty(value = "鍒涘缓浜篿d")
     @TableField(fill = FieldFill.INSERT)
@@ -141,4 +148,9 @@
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
+
+    @ValueTableShow(12)
+    @ApiModelProperty(value = "妫�楠岄」鐩�")
+    private String insProductIds;
+
 }

--
Gitblit v1.9.3