From f5041d3a0a706809bc351ff6d0694935f33abc9f Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 15 四月 2024 07:17:11 +0800
Subject: [PATCH] 新增报告插入二维码
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 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 dec42e6..2145ff5 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,17 +29,21 @@
@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 = "璁￠噺鍗曚綅")
@@ -55,7 +59,7 @@
@ValueTableShow(7)
@ApiModelProperty(value = "宸ユ椂(H)")
- private Integer manHour;
+ private Double manHour;
@ValueTableShow(7)
@ApiModelProperty(value = "棰勮鏃堕棿(澶�)")
@@ -77,7 +81,6 @@
@ApiModelProperty(value = "璁惧缁�")
private String deviceGroup;
- @ValueTableShow(11)
@ApiModelProperty(value = "妫�楠屾鏁�")
private Integer checkoutNumber;
@@ -85,13 +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)
@@ -104,11 +115,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