From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas

---
 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 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 14dd76e..9993d86 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
@@ -3,6 +3,7 @@
 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;
 
@@ -26,9 +27,14 @@
     @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;
@@ -45,6 +51,7 @@
     /**
      * 妫�楠岄」瀛愮被
      */
+    @ValueTableShow(value = 2, name = "妫�楠岄」瀛愮被")
     private String inspectionItemSubclass;
 
     private String inspectionItemSubclassEn;
@@ -62,16 +69,19 @@
     /**
      * 鏍峰搧鍒嗙被
      */
+    @ValueTableShow(value = 3, name = "鏍峰搧鍒嗙被")
     private String sampleType;
 
     /**
      * 鏍峰搧
      */
+    @ValueTableShow(value = 4, name = "鏍峰搧")
     private String sample;
 
     /**
      * 鍨嬪彿
      */
+    @ValueTableShow(value = 5, name = "鍨嬪彿")
     private String model;
 
     private String methodS;
@@ -79,6 +89,7 @@
     /**
      * 瀛愬疄楠屽
      */
+    @ValueTableShow(value = 6, name = "璇曢獙瀹�")
     private String sonLaboratory;
 
     /**
@@ -137,7 +148,7 @@
     private String method;
 
     /**
-     * 棰勮鏃堕棿(澶�)
+     * 棰勮鏃堕棿(h)
      */
     private Integer manDay;
 
@@ -149,11 +160,13 @@
     /**
      * 瑕佹眰鍊�
      */
+    @ValueTableShow(value = 7, name = "瑕佹眰鍊�")
     private String ask;
 
     /**
      * 瑕佹眰鎻忚堪
      */
+    @ValueTableShow(value = 8, name = "瑕佹眰鎻忚堪")
     private String tell;
 
     /**
@@ -163,7 +176,7 @@
     private String lastValue;
 
     /**
-     * 1锛氬悎鏍� 0锛氫笉鍚堟牸
+     * 1锛氬悎鏍� 0锛氫笉鍚堟牸 3:涓嶅垽瀹�
      */
     private Integer insResult;
 
@@ -208,6 +221,9 @@
     private InsProductResult insProductResult;
 
     @TableField(exist = false)
+    private List<InsProductResult2> insProductResult2;
+
+    @TableField(exist = false)
     private String templateName;
 
     private String dic;
@@ -216,9 +232,9 @@
     //婀垮害
     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