Merge branch 'dev' into test

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","提交"),
+        COMMIT(5,"50","解决待审"),// 20190917将“提交”更改为“解决待审”
-        PASS(6,"60","审批"),
+        PASS(6,"60","审批完成"), // 20190917将“审批”更改为“审批完成”
-        REJECT(7,"70","驳回");
+        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++) {