From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Wed, 18 Aug 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/java/com/nanometer/smartlab/entity/enumtype/ApplyStatus.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/enumtype/ApplyStatus.java b/src/main/java/com/nanometer/smartlab/entity/enumtype/ApplyStatus.java
index 2a6d0c5..dcddaa4 100644
--- a/src/main/java/com/nanometer/smartlab/entity/enumtype/ApplyStatus.java
+++ b/src/main/java/com/nanometer/smartlab/entity/enumtype/ApplyStatus.java
@@ -3,7 +3,19 @@
import java.util.HashMap;
public enum ApplyStatus {
- REFUSE(0, "拒绝"), PENDING_APPROVAL(1, "待审批"), APPROVED(2, "已审批"), PENDING_PURCHASE(3, "待采购"), STORAGE(4, "已入库"), CANCEL(5, "取消"),SUPPLIER_CONFIRM(6,"已确认"),SUPPLIER_CANCEL(7,"已取消"),FINISHED(8,"已完成"),UNCOMPLETED(9,"未完成");
+ REFUSE(0, "拒绝"),
+ PENDING_APPROVAL(1, "待审批"),
+ APPROVED(2, "已审批"),
+ PENDING_PURCHASE(3, "待采购"),
+ STORAGE(4, "已入库"),
+ CANCEL(5, "取消"),
+ SUPPLIER_CONFIRM(6,"已确认"),
+ SUPPLIER_CANCEL(7,"已取消"),
+ FINISHED(8,"已完成"),
+ UNCOMPLETED(9,"未完成"),
+
+
+ EXPIRED(10,"过期"),;
private int key;
private String text;
@@ -27,13 +39,13 @@
map.put(d.key, d);
}
}
-
+
public static ApplyStatus parse(Integer index) {
if(map.containsKey(index)){
return map.get(index);
}
return null;
}
-
-
+
+
}
--
Gitblit v1.9.2