From e78cc56f04556a1d3d54f0db830ba9f16eb28a58 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 03 八月 2024 21:40:53 +0800
Subject: [PATCH] 检验下单待检撤销+删除检验值结论还在

---
 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java |   75 +++++++++++++++++++++++++++++++++----
 1 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
index 2014bd2..059ef59 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
@@ -1,21 +1,24 @@
 package com.yuanchu.mom.pojo;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 妫�楠岄」鐩�
+ *
  * @TableName ins_product
  */
-@TableName(value ="ins_product")
+@TableName(value = "ins_product")
 @Data
 public class InsProduct implements Serializable {
     /**
@@ -24,20 +27,34 @@
     @TableId(type = IdType.AUTO)
     private Integer id;
 
+    @ValueTableShow(value = 1, name = "鏍峰搧缂栧彿")
+    @TableField(exist = false,select = false)
+    private String sampleCode;
+
     /**
      * 妫�楠岄」
      */
+    @ValueTableShow(value = 2, name = "妫�楠岄」")
     private String inspectionItem;
+
+    private String inspectionItemEn;
 
     /**
      * 妫�楠岄」鍒嗙被
      */
-    private String inspectionItemClassify;
+    @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
+    private String inspectionItemClass;
+
+    @ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
+    private String inspectionItemClassEn;
 
     /**
      * 妫�楠岄」瀛愮被
      */
+    @ValueTableShow(value = 2, name = "妫�楠岄」瀛愮被")
     private String inspectionItemSubclass;
+
+    private String inspectionItemSubclassEn;
 
     /**
      * 宸ュ巶
@@ -52,21 +69,27 @@
     /**
      * 鏍峰搧鍒嗙被
      */
+    @ValueTableShow(value = 3, name = "鏍峰搧鍒嗙被")
     private String sampleType;
 
     /**
      * 鏍峰搧
      */
+    @ValueTableShow(value = 4, name = "鏍峰搧")
     private String sample;
 
     /**
      * 鍨嬪彿
      */
+    @ValueTableShow(value = 5, name = "鍨嬪彿")
     private String model;
+
+    private String methodS;
 
     /**
      * 瀛愬疄楠屽
      */
+    @ValueTableShow(value = 6, name = "璇曢獙瀹�")
     private String sonLaboratory;
 
     /**
@@ -125,7 +148,7 @@
     private String method;
 
     /**
-     * 棰勮鏃堕棿(澶�)
+     * 棰勮鏃堕棿(h)
      */
     private Integer manDay;
 
@@ -137,11 +160,19 @@
     /**
      * 瑕佹眰鍊�
      */
+    @ValueTableShow(value = 7, name = "瑕佹眰鍊�")
     private String ask;
+
+    /**
+     * 瑕佹眰鎻忚堪
+     */
+    @ValueTableShow(value = 8, name = "瑕佹眰鎻忚堪")
+    private String tell;
 
     /**
      * 鏈�缁堝��
      */
+    @TableField("`last_value`")
     private String lastValue;
 
     /**
@@ -179,4 +210,32 @@
      * 澶栭敭锛歴tandard_template琛╥d
      */
     private Integer templateId;
+
+    @TableField(exist = false)
+    private List<JSONObject> template;
+
+    @TableField(exist = false)
+    private Map<String, Object> style;
+
+    @TableField(exist = false)
+    private InsProductResult insProductResult;
+
+    @TableField(exist = false)
+    private String templateName;
+
+    private String dic;
+    //娓╁害
+    private String temperature;
+    //婀垮害
+    private String humidity;
+
+    private Integer insFiberId;
+
+    private Integer insFibersId;
+
+    private Integer standardMethodListId;
+
+    //杩斿洖鐨�20搴﹀父娓╃殑璁＄畻鍊�(娓╁害寰幆)
+    @TableField(exist = false ,select = false)
+    private String complue;
 }
\ No newline at end of file

--
Gitblit v1.9.3