硬件类型 批量删除

硬件管理     分页，排序
字典         列表查询

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -699,71 +699,4 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
-
-    /**
-     * 通用状态
-     * 1.ENABLE：启用
-     * 2.DISABLE：禁用
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum COMM_STATUS{
-
-        ENABLE(1,"启用","fa fa-success cell-fa fa-check"),
-        DISABLE(2,"禁用","fa fa-disabled cell-fa fa-times-circle");
-
-        private int value;
-        private String name;
-        private String description;
-
-        COMM_STATUS() {
-        }
-
-        COMM_STATUS(int value, String name, String description) {
-            this.value = value;
-            this.name = name;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfCode(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].name;
-                }
-            }
-            return tmp;
-        }
-
-        public static String valueOfDescription(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-
-        public static String codeOfDescription(String code) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].name.equals(code)) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -164,4 +164,22 @@ public class CoreHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 硬件复杂查询
+     * @param tool
+     * @return
+     */
+    public static String packHqlTool(Tool tool) {
+        StringBuffer result = new StringBuffer();
+
+        // hql拼接
+        HqlPack.getStringLikerPack(tool.getName(),"name",result);
+        HqlPack.getNumEqualPack(tool.getToolTypeId(),"toolTypeId",result);
+        HqlPack.getNumEqualPack(tool.getToolStatusId(),"toolStatusId",result);
+        HqlPack.getStringLikerPack(tool.getName(),"name",result);
+        HqlPack.getStringLikerPack(tool.getName(),"name",result);
+
+        return result.toString();
+    }
 }