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 |  117 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 93 insertions(+), 24 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 1051f71..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
@@ -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,19 +69,27 @@
     /**
      * 鏍峰搧鍒嗙被
      */
+    @ValueTableShow(value = 3, name = "鏍峰搧鍒嗙被")
     private String sampleType;
 
     /**
      * 鏍峰搧
      */
+    @ValueTableShow(value = 4, name = "鏍峰搧")
     private String sample;
 
     /**
      * 鍨嬪彿
      */
+    @ValueTableShow(value = 5, name = "鍨嬪彿")
     private String model;
 
-    @ApiModelProperty("瀛愬疄楠屽")
+    private String methodS;
+
+    /**
+     * 瀛愬疄楠屽
+     */
+    @ValueTableShow(value = 6, name = "璇曢獙瀹�")
     private String sonLaboratory;
 
     /**
@@ -80,7 +105,7 @@
     /**
      * 宸ユ椂(H)
      */
-    private Integer manHour;
+    private Double manHour;
 
     /**
      * 宸ユ椂鍒嗙粍
@@ -123,7 +148,7 @@
     private String method;
 
     /**
-     * 棰勮鏃堕棿(澶�)
+     * 棰勮鏃堕棿(h)
      */
     private Integer manDay;
 
@@ -135,37 +160,81 @@
     /**
      * 瑕佹眰鍊�
      */
+    @ValueTableShow(value = 7, name = "瑕佹眰鍊�")
     private String ask;
+
+    /**
+     * 瑕佹眰鎻忚堪
+     */
+    @ValueTableShow(value = 8, name = "瑕佹眰鎻忚堪")
+    private String tell;
+
+    /**
+     * 鏈�缁堝��
+     */
+    @TableField("`last_value`")
+    private String lastValue;
+
+    /**
+     * 1锛氬悎鏍� 0锛氫笉鍚堟牸 3:涓嶅垽瀹�
+     */
+    private Integer insResult;
 
     /**
      * 1锛氭湁鏁� 0锛氭棤鏁�
      */
     private Integer state;
 
-    @ApiModelProperty("鍨嬪彿")
-    private Integer templateId;
+    /**
+     * 澶栭敭锛歩ns_sample琛╥d
+     */
+    private Integer insSampleId;
 
-    @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
-    /**
-     *
-     */
+
     @ApiModelProperty("鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
-    /**
-     *
-     */
-    @ApiModelProperty("")
+
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Integer updateUser;
-    /**
-     *
-     */
+
     @ApiModelProperty("淇敼鏃堕棿")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
+
+    /**
+     * 澶栭敭锛歴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 List<InsProductResult2> insProductResult2;
+
+    @TableField(exist = false)
+    private String templateName;
+
+    private String dic;
+    //娓╁害
+    private String temperature;
+    //婀垮害
+    private String humidity;
+
+    private Integer standardMethodListId;
+
+    //杩斿洖鐨�20搴﹀父娓╃殑璁＄畻鍊�(娓╁害寰幆)
+    @TableField(exist = false ,select = false)
+    private String complue;
 }
\ No newline at end of file

--
Gitblit v1.9.3