From 788b1abbdc75d6bc727be65fc107fb10eaa484b6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:10 +0800
Subject: [PATCH] 模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 9dd4be0..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,9 +46,10 @@
@ValueTableShow(4)
@ApiModelProperty(value = "鍗曚环(鍏�)")
- private BigDecimal price;
+ private String price;
@ApiModelProperty(value = "鍦烘墍")
+ @ValueTableShow(4)
private String laboratory;
@ValueTableShow(4)
@@ -67,7 +68,7 @@
@ApiModelProperty(value = "璁￠噺鍗曚綅")
private String unit;
- @ValueTableShow(15)
+ @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)
@@ -129,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