From 77296816e6061534e65ea740347fbf9653c5ce3e Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Sun, 13 Jan 2019 15:48:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=AF=BC=E5=87=BA=20?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E8=A7=84=E5=88=99=E5=AF=BC=E5=85=A5=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=20=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/CommonEnumUtil.java  | 40 ++++++++++++++++++++++
 .../i3plus/pojo/base/enumutil/ImppEnumUtil.java    | 38 ++++++++++++++++++++
 .../estsh/i3plus/pojo/platform/bean/SysConfig.java |  5 +++
 .../i3plus/pojo/platform/bean/SysOrderNoRule.java  |  2 +-
 4 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index a6d494b..b6fa846 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@@ -142,6 +142,7 @@ public class CommonEnumUtil {
             return tmp;
         }
         public static String valueOfDescription(int val) {return valueOf(val);}
+        public static int descriptionOfValue(String desc) {return descOf(desc);}
 
     }
 
@@ -812,4 +813,43 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 数学表达式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MATH_SYMBOL {
+        GREATER(1, ">"),
+        GREATER_OR_EQUAL(2, ">="),
+        LESS(3, "<"),
+        LESS_OR_EQUAL(4, "<="),
+        EQUAL(5, "="),
+        NOT_EQUAL(6, "<>");
+
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private MATH_SYMBOL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
index 3c29a21..7ad3b72 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
@@ -1009,4 +1009,42 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 系统表达式组
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SYS_CONFIG_GROUP {
+        EXCEL(1, "excel导入导出"),
+        PASSWORD(2, "密码安全策略"),
+        MAIL(3, "邮件配置"),
+        CONTACT(4, "联系人"),
+        BASIS(5, "基础");
+
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private SYS_CONFIG_GROUP(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java
index ad87b86..6d42cd3 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java
@@ -41,6 +41,11 @@ public class SysConfig extends BaseBean {
     @ApiParam(value ="配置代码")
     private String configCode;
 
+    // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP
+    @Column(name="CONFIG_GROUP")
+    @ApiParam(value ="配置组")
+    private Integer configGroup;
+
     // 枚举 ImppEnumUtil.SYS_VALUE_TYPE
     @Column(name="CONFIG_VALUE_TYPE")
     @ApiParam(value ="配置值类型")
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java
index 085d58b..89e9d29 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java
@@ -78,7 +78,7 @@ public class SysOrderNoRule extends BaseBean {
 
     @Column(name = "ORDER_NO_RULE_STATUS")
     @ApiParam(value = "单号规则状态")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(hidden = true)
     private Integer orderNoRuleStatus;
 
     @Column(name="ORDER_NO_RULE_DESCRIPTION")