From b31162c5d6fa8729b3e1ffc2e6e97adf18ea0be4 Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Wed, 18 Sep 2019 13:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B7=A5=E4=BD=8D=E6=94=BE?=
 =?UTF-8?q?=E8=A1=8C=EF=BC=8C=20=E5=AE=89=E7=81=AF=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: crish <570360737@qq.com>
---
 .../estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java  | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
index 0e53b60..17335f3 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@@ -211,9 +211,10 @@ public class AndonEnumUtil {
         SIGN(2,"20","响应"),
         RESOLVE(3,"30","解决"),
         CANCEL(4,"40", "撤销"),
-        COMMIT(5,"50","提交"),
-        PASS(6,"60","审批"),
-        REJECT(7,"70","驳回");
+        COMMIT(5,"50","解决待审"),// 20190917将“提交”更改为“解决待审”
+        PASS(6,"60","审批完成"), // 20190917将“审批”更改为“审批完成”
+        REJECT(7,"70","驳回"),
+        CONFIRMED_CANCEL(8,"80","撤销已确认"); // 20190917增加这个枚举
 
         private int value;
         private String code;
@@ -245,6 +246,16 @@ public class AndonEnumUtil {
             return tmp;
         }
 
+        public static String codeOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].code, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
         public static int descriptionOfValue(String val) {
             int tmp = -1;
             for (int i = 0; i < values().length; i++) {