From 8ebf5bc4bf1cc2b70b6aa9dc295eaa9d86c95245 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 02 七月 2024 13:17:26 +0800
Subject: [PATCH] 委托编号生成规则修改+用户默认密码更改+温度循环项目新增逻辑+检验任务模版切换

---
 inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java |   71 +++++++++++++++++++++--------------
 1 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
index ba54bf8..79c2d57 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
@@ -1,15 +1,14 @@
 package com.yuanchu.mom.pojo;
 
 import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * 鏍囧噯鏍戜笅鐨勬楠岄」鐩�
@@ -21,8 +20,9 @@
     /**
      * 涓婚敭id
      */
-    @TableId(type = IdType.AUTO)
-    private Integer id;
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
 
     /**
      * 妫�楠岄」
@@ -30,11 +30,8 @@
     @ApiModelProperty("妫�楠岄」")
     private String inspectionItem;
 
-    /**
-     * 妫�楠岄」鍒嗙被
-     */
-    @ApiModelProperty("妫�楠岄」鍒嗙被")
-    private String inspectionItemClassify;
+    @ApiModelProperty("妫�楠岄」EN")
+    private String inspectionItemEn;
 
     /**
      * 妫�楠岄」灏忕被
@@ -42,11 +39,17 @@
     @ApiModelProperty("妫�楠岄」灏忕被")
     private String inspectionItemSubclass;
 
+    @ApiModelProperty("妫�楠岄」灏忕被EN")
+    private String inspectionItemSubclassEn;
+
     /**
      * 瀹為獙瀹�
      */
     @ApiModelProperty("瀹為獙瀹�")
     private String laboratory;
+
+    @ApiModelProperty("瀛愬疄楠屽")
+    private String sonLaboratory;
 
     /**
      * 璁￠噺鍗曚綅
@@ -58,13 +61,13 @@
      * 鍗曚环(鍏�)
      */
     @ApiModelProperty("鍗曚环")
-    private BigDecimal price;
+    private String price;
 
     /**
      * 宸ユ椂(H)
      */
     @ApiModelProperty("宸ユ椂")
-    private Integer manHour;
+    private String manHour;
 
     /**
      * 宸ユ椂鍒嗙粍
@@ -85,12 +88,6 @@
     private String inspectionValueType;
 
     /**
-     * 璁惧缁�
-     */
-    @ApiModelProperty("璁惧缁�")
-    private String deviceGroup;
-
-    /**
      * 妫�楠屾鏁�
      */
     @ApiModelProperty("妫�楠屾鏁�")
@@ -103,16 +100,13 @@
     private String section;
 
     /**
-     * 鍙栧�肩被鍨�
-     */
-    @ApiModelProperty("鍙栧�肩被鍨�")
-    private String valueType;
-
-    /**
      * 鏂规硶
      */
-    @ApiModelProperty("鏂规硶")
+    @ApiModelProperty("鏂规硶鍒楄〃")
     private String method;
+
+    @ApiModelProperty("鏂规硶")
+    private String methodS;
 
     /**
      * 棰勮鏃堕棿(澶�)
@@ -132,6 +126,9 @@
     @ApiModelProperty("瑕佹眰鍊�")
     private String ask;
 
+    @ApiModelProperty("瑕佹眰鎻忚堪")
+    private String tell;
+
     /**
      * 澶栭敭锛氭爣鍑嗘柟娉昳d
      */
@@ -149,6 +146,9 @@
 
     @ApiModelProperty("鍨嬪彿")
     private String model;
+
+    @ApiModelProperty("鍨嬪彿")
+    private Integer templateId;
 
     @ApiModelProperty("")
     @TableField(fill = FieldFill.INSERT)
@@ -173,4 +173,19 @@
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
+
+    @ApiModelProperty("1锛氭湁鏁� 0锛氭棤鏁�")
+    private Integer state;
+
+    private String dic;
+
+    private String tree;
+
+    private Integer structureItemParameterId;
+
+    @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
+    private String inspectionItemClass;
+
+    @ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
+    private String inspectionItemClassEn;
 }
\ No newline at end of file

--
Gitblit v1.9.3