From 386af6fd927464760ed1d69a1a23d41bc91b1941 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 17 四月 2024 18:12:47 +0800
Subject: [PATCH] 调整模板功能

---
 cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java |   52 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 9 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 6354d44..8f54984 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,6 +1,7 @@
 package com.yuanchu.mom.pojo;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -28,29 +29,41 @@
     @ApiModelProperty(value = "妫�楠岄」")
     private String inspectionItem;
 
-    @ValueTableShow(2)
-    @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
-    private String inspectionItemClassify;
+//    @ValueTableShow(2)
+//    @ApiModelProperty(value = "妫�楠屽瓙椤�")
+//    private String inspectionItemClassify;
 
     @ValueTableShow(3)
-    @ApiModelProperty(value = "妫�楠岄」灏忕被")
+    @ApiModelProperty(value = "妫�楠岄」瀛愰」")
     private String inspectionItemSubclass;
 
     @ValueTableShow(4)
     @ApiModelProperty(value = "瀹為獙瀹�")
     private String laboratory;
 
+    @ValueTableShow(4)
+    @ApiModelProperty(value = "瀛愬疄楠屽")
+    private String sonLaboratory;
+
     @ValueTableShow(5)
     @ApiModelProperty(value = "璁￠噺鍗曚綅")
     private String unit;
 
+    @ValueTableShow(5)
+    @ApiModelProperty(value = "璇曢獙鏂规硶")
+    private String method;
+
     @ValueTableShow(6)
     @ApiModelProperty(value = "鍗曚环(鍏�)")
-    private Double price;
+    private BigDecimal price;
 
     @ValueTableShow(7)
     @ApiModelProperty(value = "宸ユ椂(H)")
-    private Integer manHour;
+    private Double manHour;
+
+    @ValueTableShow(7)
+    @ApiModelProperty(value = "棰勮鏃堕棿(澶�)")
+    private Integer manDay;
 
     @ValueTableShow(8)
     @ApiModelProperty(value = "宸ユ椂鍒嗙粍")
@@ -60,11 +73,14 @@
     @ApiModelProperty(value = "妫�楠岄」绫诲瀷")
     private String inspectionItemType;
 
+    @ValueTableShow(9)
+    @ApiModelProperty(value = "妫�楠屽�肩被鍨�")
+    private String inspectionValueType;
+
     @ValueTableShow(10)
     @ApiModelProperty(value = "璁惧缁�")
     private String deviceGroup;
 
-    @ValueTableShow(11)
     @ApiModelProperty(value = "妫�楠屾鏁�")
     private Integer checkoutNumber;
 
@@ -72,9 +88,21 @@
     @ApiModelProperty(value = "鍖洪棿")
     private String section;
 
-    @ValueTableShow(13)
+    /*@ValueTableShow(13)
     @ApiModelProperty(value = "鍙栧�肩被鍨�")
-    private String valueType;
+    private String valueType;*/
+
+    @ValueTableShow(13)
+    @ApiModelProperty(value = "鐗规畩鏍囪瘑")
+    private String bsm;
+
+    @ValueTableShow(5)
+    @ApiModelProperty(value = "妫�楠屽璞�")
+    private Integer sample;
+
+    @ValueTableShow(14)
+    @ApiModelProperty(value = "鍘熷璁板綍妯℃澘")
+    private Integer templateId;
 
     @ApiModelProperty(value = "鍒涘缓浜篿d")
     @TableField(fill = FieldFill.INSERT)
@@ -87,12 +115,18 @@
     @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;
+
 }
 

--
Gitblit v1.9.3