From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/java/com/nanometer/smartlab/entity/OpeApply.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeApply.java b/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
index e2eba2e..74ecd72 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;
@@ -72,6 +73,8 @@
private String secondUserName;
+ private ApplyStatus orderStatus;
+
public String getSecondUserName() {
return secondUserName;
}
@@ -132,7 +135,7 @@
}
public void setApplyGoal(String applyGoal) {
- this.applyGoal = applyGoal;
+ this.applyGoal = Validator.filter(applyGoal);
}
public String getId() {
@@ -156,7 +159,7 @@
}
public void setNum(Integer num) {
- this.num = num;
+ this.num = Integer.parseInt(Validator.filter(num.toString()));
}
public String getApplyUserId() {
@@ -172,7 +175,7 @@
}
public void setObjective(String objective) {
- this.objective = objective;
+ this.objective = Validator.filter(objective);
}
public Timestamp getCreateTime() {
@@ -210,7 +213,7 @@
this.beforeApproveUserId=beforeApproveUserId;
}
public void setApproveUserId(String approveUserId) {
- this.approveUserId = approveUserId;
+ this.approveUserId = Validator.filter(approveUserId);
}
public String getMemo() {
@@ -401,4 +404,13 @@
sb.append('}');
return sb.toString();
}
+
+
+ public ApplyStatus getOrderStatus() {
+ return orderStatus;
+ }
+
+ public void setOrderStatus(ApplyStatus orderStatus) {
+ this.orderStatus = orderStatus;
+ }
}
--
Gitblit v1.9.2