From 043c1adb3047489ec8c2d2d50ddc49d7856901ee Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 12 三月 2024 18:01:23 +0800
Subject: [PATCH] 功能调整
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 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..83ab2fa 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,12 +29,12 @@
@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)
@@ -44,13 +45,21 @@
@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;
+
+ @ValueTableShow(7)
+ @ApiModelProperty(value = "棰勮鏃堕棿(澶�)")
+ private Integer manDay;
@ValueTableShow(8)
@ApiModelProperty(value = "宸ユ椂鍒嗙粍")
@@ -59,6 +68,10 @@
@ValueTableShow(9)
@ApiModelProperty(value = "妫�楠岄」绫诲瀷")
private String inspectionItemType;
+
+ @ValueTableShow(9)
+ @ApiModelProperty(value = "妫�楠屽�肩被鍨�")
+ private String inspectionValueType;
@ValueTableShow(10)
@ApiModelProperty(value = "璁惧缁�")
@@ -76,6 +89,14 @@
@ApiModelProperty(value = "鍙栧�肩被鍨�")
private String valueType;
+ @ValueTableShow(13)
+ @ApiModelProperty(value = "鐗规畩鏍囪瘑")
+ private String bsm;
+
+ @ValueTableShow(5)
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О")
+ private String sample;
+
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@@ -87,11 +108,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