Merge remote-tracking branch 'origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -496,6 +496,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装double对象成大于等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberBiggerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装double对象成小于语句
      *
      * @param columnName 列名
@@ -508,6 +520,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装double对象成小于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberSmallerPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装double对象成小于等于语句
      *
      * @param columnName 列名
@@ -520,6 +544,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装double对象成小于等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberSmallerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " <= :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装long或者int的整数对象成equal语句(不等于)
      *
      * @param columnName 列名