From d86a37f36ec375f8aa3d3eaee18ea1ad323eba0b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 26 四月 2024 09:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 66 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 21 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 83ab2fa..8386d6c 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)琛ㄥ璞�
@@ -29,33 +28,56 @@
@ApiModelProperty(value = "妫�楠岄」")
private String inspectionItem;
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "妫�楠岄」EN")
+ private String inspectionItemEn;
+
// @ValueTableShow(2)
-// @ApiModelProperty(value = "妫�楠屽瓙椤�")
+// @ApiModelProperty(value = "妫�楠屽垎绫�")
// private String inspectionItemClassify;
@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 = "鍗曚环(鍏�)")
+ 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(5)
- @ApiModelProperty(value = "妫�楠屾爣鍑�")
- private String method;
-
@ValueTableShow(6)
- @ApiModelProperty(value = "鍗曚环(鍏�)")
- private BigDecimal price;
+ @ApiModelProperty(value = "璇曢獙鏂规硶")
+ private String method;
@ValueTableShow(7)
@ApiModelProperty(value = "宸ユ椂(H)")
- private Integer manHour;
+ private Double manHour;
@ValueTableShow(7)
@ApiModelProperty(value = "棰勮鏃堕棿(澶�)")
@@ -73,11 +95,9 @@
@ApiModelProperty(value = "妫�楠屽�肩被鍨�")
private String inspectionValueType;
- @ValueTableShow(10)
@ApiModelProperty(value = "璁惧缁�")
private String deviceGroup;
- @ValueTableShow(11)
@ApiModelProperty(value = "妫�楠屾鏁�")
private Integer checkoutNumber;
@@ -85,17 +105,17 @@
@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 String sample;
+ @ValueTableShow(14)
+ @ApiModelProperty(value = "鍘熷璁板綍妯℃澘")
+ private Integer templateId;
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
@@ -117,5 +137,9 @@
@ValueTableShow(15)
private LocalDateTime updateTime;
+ @ValueTableShow(9)
+ @ApiModelProperty(value = "瀛楀吀绫诲瀷")
+ private String dic;
+
}
--
Gitblit v1.9.3