From ebbfd1096e24fbe26101cc4eb7792ca6bd68eb7a Mon Sep 17 00:00:00 2001
From: CrazyAirhead <l4qiang@gmail.com>
Date: Sat, 27 Apr 2024 08:31:39 +0800
Subject: [PATCH] =?UTF-8?q?feat():=20QueryColumn=20=E7=9A=84=20between=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E7=BB=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatisflex/core/query/Conditional.java   | 30 ++++++++++++++++
 .../mybatisflex/core/query/QueryColumn.java   | 36 +++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Conditional.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Conditional.java
index a210e994..2c85c924 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Conditional.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Conditional.java
@@ -387,6 +387,21 @@ public interface Conditional<R> {
      */
     R notIn(QueryWrapper queryWrapper, BooleanSupplier isEffective);
 
+    /**
+     * {@code BETWEEN values[0] AND values[1]}
+     *
+     * @param values 范围值
+     */
+    R between(Object[] values);
+
+    /**
+     * {@code BETWEEN values[0] AND values[1]}
+     *
+     * @param values 值
+     * @param isEffective 是否有效
+     */
+    R between(Object[] values, boolean isEffective);
+
     /**
      * {@code BETWEEN start AND end}
      *
@@ -422,6 +437,21 @@ public interface Conditional<R> {
      */
     <S, E> R between(S start, E end, BiPredicate<S, E> isEffective);
 
+    /**
+     * {@code NOT BETWEEN values[0] AND values[1]}
+     *
+     * @param values 范围值
+     */
+    R notBetween(Object[] values);
+
+    /**
+     * {@code NOT BETWEEN values[0] AND values[1]}
+     *
+     * @param values 值
+     * @param isEffective 是否有效
+     */
+    R notBetween(Object[] values, boolean isEffective);
+
     /**
      * {@code NOT BETWEEN start AND end}
      *
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java
index d5d22804..b9d78036 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java
@@ -578,6 +578,24 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
         return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_IN, queryWrapper).when(isEffective));
     }
 
+    @Override
+    public QueryCondition between(Object[] values) {
+        if (QueryColumnBehavior.shouldIgnoreValue(values) || values.length < 2) {
+            return QueryCondition.createEmpty();
+        }
+
+       return between(values[0], values[1]);
+    }
+
+    @Override
+    public QueryCondition between(Object[] values, boolean isEffective) {
+        if (QueryColumnBehavior.shouldIgnoreValue(values) || values.length < 2) {
+            return QueryCondition.createEmpty();
+        }
+
+        return between(values[0], values[1], isEffective);
+    }
+
     @Override
     public QueryCondition between(Object start, Object end) {
         if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
@@ -610,6 +628,24 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
         return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.BETWEEN, new Object[]{start, end}).when(isEffective.test(start, end)));
     }
 
+    @Override
+    public QueryCondition notBetween(Object[] values) {
+        if (QueryColumnBehavior.shouldIgnoreValue(values) || values.length < 2) {
+            return QueryCondition.createEmpty();
+        }
+
+        return notBetween(values[0], values[1]);
+    }
+
+    @Override
+    public QueryCondition notBetween(Object[] values, boolean isEffective) {
+        if (QueryColumnBehavior.shouldIgnoreValue(values) || values.length < 2) {
+            return QueryCondition.createEmpty();
+        }
+
+        return notBetween(values[0], values[1], isEffective);
+    }
+
     @Override
     public QueryCondition notBetween(Object start, Object end) {
         if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {