From 7a9de16c90c1d936c35d426c95c3f4a9bba8a1f8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 22 十一月 2024 09:25:54 +0800
Subject: [PATCH] 电路试验的计算规则,将检验值转换成绝对值进行判定,不判定的情况加上要求值是中文
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 7f9a25b..16ac213 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
@@ -46,13 +46,14 @@
@ValueTableShow(4)
@ApiModelProperty(value = "鍗曚环(鍏�)")
- private BigDecimal price;
+ private String price;
- @ApiModelProperty(value = "瀹為獙瀹�")
+ @ApiModelProperty(value = "鍦烘墍")
+ @ValueTableShow(4)
private String laboratory;
@ValueTableShow(4)
- @ApiModelProperty(value = "瀛愬疄楠屽")
+ @ApiModelProperty(value = "璇曢獙瀹�")
private String sonLaboratory;
@ValueTableShow(5)
@@ -67,7 +68,7 @@
@ApiModelProperty(value = "璁￠噺鍗曚綅")
private String unit;
- @ValueTableShow(6)
+ @ValueTableShow(18)
@ApiModelProperty(value = "璇曢獙鏂规硶")
private String method;
@@ -76,7 +77,7 @@
private Double manHour;
@ValueTableShow(7)
- @ApiModelProperty(value = "棰勮鏃堕棿(澶�)")
+ @ApiModelProperty(value = "棰勮鏃堕棿(H)")
private Integer manDay;
@ValueTableShow(8)
@@ -94,7 +95,6 @@
@ApiModelProperty(value = "妫�楠屾鏁�")
private Integer checkoutNumber;
- @ValueTableShow(12)
@ApiModelProperty(value = "鍖洪棿")
private String section;
@@ -130,5 +130,13 @@
@ApiModelProperty(value = "瀛楀吀绫诲瀷")
private String dic;
+ @ValueTableShow(16)
+ @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
+ private String inspectionItemClass;
+
+ @ValueTableShow(17)
+ @ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
+ private String inspectionItemClassEn;
+
}
--
Gitblit v1.9.3