From 27421a34661fed2e141ab9aaa7447926aea46e36 Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 14:09:25 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 73 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 19 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..9dd4be0 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,15 +1,15 @@
package com.yuanchu.mom.pojo;
-import java.io.Serializable;
-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,28 +29,55 @@
private String inspectionItem;
@ValueTableShow(2)
- @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
- private String inspectionItemClassify;
+ @ApiModelProperty(value = "妫�楠岄」EN")
+ private String inspectionItemEn;
@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 = "瀹為獙瀹�")
+ @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(6)
- @ApiModelProperty(value = "鍗曚环(鍏�)")
- private Double price;
+ @ValueTableShow(15)
+ @ApiModelProperty(value = "璇曢獙鏂规硶")
+ private String method;
@ValueTableShow(7)
@ApiModelProperty(value = "宸ユ椂(H)")
- private Integer manHour;
+ private Double manHour;
+
+ @ValueTableShow(7)
+ @ApiModelProperty(value = "棰勮鏃堕棿(澶�)")
+ private Integer manDay;
@ValueTableShow(8)
@ApiModelProperty(value = "宸ユ椂鍒嗙粍")
@@ -60,21 +87,23 @@
@ApiModelProperty(value = "妫�楠岄」绫诲瀷")
private String inspectionItemType;
- @ValueTableShow(10)
- @ApiModelProperty(value = "璁惧缁�")
- private String deviceGroup;
+ @ValueTableShow(9)
+ @ApiModelProperty(value = "妫�楠屽�肩被鍨�")
+ private String inspectionValueType;
- @ValueTableShow(11)
@ApiModelProperty(value = "妫�楠屾鏁�")
private Integer checkoutNumber;
- @ValueTableShow(12)
@ApiModelProperty(value = "鍖洪棿")
private String section;
@ValueTableShow(13)
- @ApiModelProperty(value = "鍙栧�肩被鍨�")
- private String valueType;
+ @ApiModelProperty(value = "鐗规畩鏍囪瘑")
+ private String bsm;
+
+ @ValueTableShow(14)
+ @ApiModelProperty(value = "鍘熷璁板綍妯℃澘")
+ private Integer templateId;
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
@@ -87,12 +116,18 @@
@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;
+ @ValueTableShow(9)
+ @ApiModelProperty(value = "瀛楀吀绫诲瀷")
+ private String dic;
+
}
--
Gitblit v1.9.3