From 599b942446bb8bfc1f6d12c1fcb22a5e95398b37 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 13 三月 2024 16:12:39 +0800
Subject: [PATCH] 功能调整
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 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..51ec312 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,21 +29,29 @@
@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 = "鍗曚环(鍏�)")
@@ -51,7 +59,11 @@
@ValueTableShow(7)
@ApiModelProperty(value = "宸ユ椂(H)")
- private Integer manHour;
+ private Double manHour;
+
+ @ValueTableShow(7)
+ @ApiModelProperty(value = "棰勮鏃堕棿(澶�)")
+ private Integer manDay;
@ValueTableShow(8)
@ApiModelProperty(value = "宸ユ椂鍒嗙粍")
@@ -60,6 +72,10 @@
@ValueTableShow(9)
@ApiModelProperty(value = "妫�楠岄」绫诲瀷")
private String inspectionItemType;
+
+ @ValueTableShow(9)
+ @ApiModelProperty(value = "妫�楠屽�肩被鍨�")
+ private String inspectionValueType;
@ValueTableShow(10)
@ApiModelProperty(value = "璁惧缁�")
@@ -73,9 +89,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 String sample;
+
+ @ValueTableShow(14)
+ @ApiModelProperty(value = "鍘熷璁板綍妯℃澘")
+ private Integer templateId;
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
@@ -88,11 +116,13 @@
@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;
}
--
Gitblit v1.9.3