diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 592245d..6dd13e1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -881,7 +881,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -2831,7 +2831,7 @@ public class WmsEnumUtil { // 根据枚举编号获取语言代码 public static String getCodeByIndex(Integer index) { for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) { - if (languageType.getValue() == index.intValue()) { + if (languageType.getValue() == index) { return languageType.getDescription(); } } @@ -3298,7 +3298,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -3381,7 +3381,7 @@ public class WmsEnumUtil { } public static Map getEnumByName(String enumName) throws Exception { - Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类 + Class[] innerClazz = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类 Class clazz; Enum[] enumConstants; @@ -3479,7 +3479,7 @@ public class WmsEnumUtil { public static String getDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == code) { + if (values()[i].value.equals(code)) { tmp = values()[i].description; } } @@ -3727,7 +3727,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -3767,7 +3767,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -3901,7 +3901,7 @@ public class WmsEnumUtil { public static String getDes(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -6655,6 +6655,11 @@ public class WmsEnumUtil { return tmp; } + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -6665,8 +6670,8 @@ public class WmsEnumUtil { return tmp; } - public static int descriptionOfValue(String desc) { - return descOf(desc); + public static String valueOfDescription(int val) { + return valueOf(val); } }