From c87738a78f57e6f68a0111d68ef3748b29dc1eda Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 23 六月 2021 12:21:59 +0800
Subject: [PATCH] 修改试剂排序
---
src/main/java/com/nanometer/smartlab/entity/OpeApply.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeApply.java b/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
index c35ed83..ad696f2 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
@@ -2,6 +2,7 @@
import com.nanometer.smartlab.entity.enumtype.ApplyStatus;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import com.nanometer.smartlab.util.Validator;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -99,6 +100,9 @@
private BigDecimal applyPrice;
private int stockFlag;
private String stockFlagValue;
+ //用于存放仓库 和仓库货柜的id
+ private String warehouseId;
+ private String warehouseContainerId;
public String getStockFlagValue() {
return stockFlagValue;
@@ -129,7 +133,7 @@
}
public void setApplyGoal(String applyGoal) {
- this.applyGoal = applyGoal;
+ this.applyGoal = Validator.filter(applyGoal);
}
public String getId() {
@@ -153,7 +157,7 @@
}
public void setNum(Integer num) {
- this.num = num;
+ this.num = Integer.parseInt(Validator.filter(num.toString()));
}
public String getApplyUserId() {
@@ -169,7 +173,7 @@
}
public void setObjective(String objective) {
- this.objective = objective;
+ this.objective = Validator.filter(objective);
}
public Timestamp getCreateTime() {
@@ -207,7 +211,7 @@
this.beforeApproveUserId=beforeApproveUserId;
}
public void setApproveUserId(String approveUserId) {
- this.approveUserId = approveUserId;
+ this.approveUserId = Validator.filter(approveUserId);
}
public String getMemo() {
@@ -356,7 +360,23 @@
this.ownerDepartment = ownerDepartment;
}
- @Override
+ public String getWarehouseId() {
+ return warehouseId;
+ }
+
+ public void setWarehouseId(String warehouseId) {
+ this.warehouseId = warehouseId;
+ }
+
+ public String getWarehouseContainerId() {
+ return warehouseContainerId;
+ }
+
+ public void setWarehouseContainerId(String warehouseContainerId) {
+ this.warehouseContainerId = warehouseContainerId;
+ }
+
+ @Override
public int compareTo(OpeApply o) {
if(this.projectOwner == null || o.getProjectOwner() == null){
return 1;
--
Gitblit v1.9.2