From 762c419bb29a48557b7bf18cc3bf9c84309bc90e Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 06 六月 2024 15:52:48 +0800
Subject: [PATCH] 增加检验项分类

---
 cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java |   82 +++++++++++++++++++++++++++++++----------
 1 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
index f4101b3..9d59109 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
@@ -1,16 +1,15 @@
 package com.yuanchu.mom.pojo;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yuanchu.mom.annotation.ValueTableShow;
 import com.yuanchu.mom.common.OrderBy;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 /**
  * 妫�楠岄」鐩弬鏁�(StructureItemParameter)琛ㄥ璞�
@@ -30,28 +29,55 @@
     private String inspectionItem;
 
     @ValueTableShow(2)
-    @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
-    private String inspectionItemClassify;
+    @ApiModelProperty(value = "妫�楠岄」EN")
+    private String inspectionItemEn;
 
     @ValueTableShow(3)
-    @ApiModelProperty(value = "妫�楠岄」灏忕被")
+    @ApiModelProperty(value = "妫�楠屽瓙椤�")
     private String inspectionItemSubclass;
 
+    @ValueTableShow(3)
+    @ApiModelProperty(value = "妫�楠屽瓙椤笶N")
+    private String inspectionItemSubclassEn;
+
+    @ValueTableShow(3)
+    @ApiModelProperty(value = "妫�楠屽璞�")
+    private String sample;
+
     @ValueTableShow(4)
-    @ApiModelProperty(value = "瀹為獙瀹�")
+    @ApiModelProperty(value = "鍗曚环(鍏�)")
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "鍦烘墍")
     private String laboratory;
+
+    @ValueTableShow(4)
+    @ApiModelProperty(value = "璇曢獙瀹�")
+    private String sonLaboratory;
+
+    @ValueTableShow(5)
+    @ApiModelProperty(value = "瑕佹眰鎻忚堪")
+    private String askTell;
+
+    @ValueTableShow(5)
+    @ApiModelProperty(value = "瑕佹眰鍊�")
+    private String ask;
 
     @ValueTableShow(5)
     @ApiModelProperty(value = "璁￠噺鍗曚綅")
     private String unit;
 
-    @ValueTableShow(6)
-    @ApiModelProperty(value = "鍗曚环(鍏�)")
-    private BigDecimal price;
+    @ValueTableShow(18)
+    @ApiModelProperty(value = "璇曢獙鏂规硶")
+    private String method;
 
     @ValueTableShow(7)
     @ApiModelProperty(value = "宸ユ椂(H)")
-    private Integer manHour;
+    private Double manHour;
+
+    @ValueTableShow(7)
+    @ApiModelProperty(value = "棰勮鏃堕棿(澶�)")
+    private Integer manDay;
 
     @ValueTableShow(8)
     @ApiModelProperty(value = "宸ユ椂鍒嗙粍")
@@ -61,21 +87,23 @@
     @ApiModelProperty(value = "妫�楠岄」绫诲瀷")
     private String inspectionItemType;
 
-    @ValueTableShow(10)
-    @ApiModelProperty(value = "璁惧缁�")
-    private String deviceGroup;
+    @ValueTableShow(9)
+    @ApiModelProperty(value = "妫�楠屽�肩被鍨�")
+    private String inspectionValueType;
 
-    @ValueTableShow(11)
     @ApiModelProperty(value = "妫�楠屾鏁�")
     private Integer checkoutNumber;
 
-    @ValueTableShow(12)
     @ApiModelProperty(value = "鍖洪棿")
     private String section;
 
     @ValueTableShow(13)
-    @ApiModelProperty(value = "鍙栧�肩被鍨�")
-    private String valueType;
+    @ApiModelProperty(value = "鐗规畩鏍囪瘑")
+    private String bsm;
+
+    @ValueTableShow(14)
+    @ApiModelProperty(value = "鍘熷璁板綍妯℃澘")
+    private Integer templateId;
 
     @ApiModelProperty(value = "鍒涘缓浜篿d")
     @TableField(fill = FieldFill.INSERT)
@@ -88,12 +116,26 @@
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ValueTableShow(14)
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "淇敼鏃堕棿")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ValueTableShow(15)
     private LocalDateTime updateTime;
 
+    @ValueTableShow(9)
+    @ApiModelProperty(value = "瀛楀吀绫诲瀷")
+    private String dic;
+
+    @ValueTableShow(16)
+    @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
+    private String inspectionItemClass;
+
+    @ValueTableShow(17)
+    @ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
+    private String inspectionItemClassEn;
+
 }
 

--
Gitblit v1.9.3