From bb9499352faae20bb2c898f3f6078f7a4e9ceef2 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 19 四月 2024 10:17:19 +0800
Subject: [PATCH] 检验项目数据导入；检验模板调整
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 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 8f54984..4ce5560 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
@@ -29,13 +29,29 @@
@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 Integer sample;
+
+ @ValueTableShow(4)
+ @ApiModelProperty(value = "鍗曚环(鍏�)")
+ private BigDecimal price;
@ValueTableShow(4)
@ApiModelProperty(value = "瀹為獙瀹�")
@@ -46,16 +62,20 @@
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)
+ @ValueTableShow(6)
@ApiModelProperty(value = "璇曢獙鏂规硶")
private String method;
-
- @ValueTableShow(6)
- @ApiModelProperty(value = "鍗曚环(鍏�)")
- private BigDecimal price;
@ValueTableShow(7)
@ApiModelProperty(value = "宸ユ椂(H)")
@@ -77,7 +97,6 @@
@ApiModelProperty(value = "妫�楠屽�肩被鍨�")
private String inspectionValueType;
- @ValueTableShow(10)
@ApiModelProperty(value = "璁惧缁�")
private String deviceGroup;
@@ -95,10 +114,6 @@
@ValueTableShow(13)
@ApiModelProperty(value = "鐗规畩鏍囪瘑")
private String bsm;
-
- @ValueTableShow(5)
- @ApiModelProperty(value = "妫�楠屽璞�")
- private Integer sample;
@ValueTableShow(14)
@ApiModelProperty(value = "鍘熷璁板綍妯℃澘")
--
Gitblit v1.9.3