From cd2156b2b0b00da98a1cfbc998041f8dfc581102 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 12 Sep 2025 09:51:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20QueryType.BETWEEN=E3=80=81?= =?UTF-8?q?QueryType.NOT=5FBETWEEN=20=E6=9F=A5=E8=AF=A2=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/java/com/jeesite/test/DaoMapperTest.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java index f761019d..3ecf3273 100644 --- a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java +++ b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java @@ -9,6 +9,7 @@ import com.jeesite.common.collect.SetUtils; import com.jeesite.common.entity.DataScope; import com.jeesite.common.entity.Page; import com.jeesite.common.idgen.IdGen; +import com.jeesite.common.lang.DateUtils; import com.jeesite.common.mybatis.mapper.query.QueryType; import com.jeesite.common.tests.BaseSpringContextTests; import com.jeesite.modules.file.dao.FileUploadDao; @@ -166,6 +167,7 @@ public class DaoMapperTest extends BaseSpringContextTests { company.setCompanyName("a"); company.setCreateDate_gte(new Date()); company.setCreateDate_lte(new Date()); + company.setUpdateDate_between("2025-09-11 ~ 2025-09-12"); company.setArea(areaList.get(0)); company.getArea().setCreateDate_gte(company.getCreateDate_gte()); company.getArea().setCreateDate_lte(company.getCreateDate_gte()); @@ -302,6 +304,18 @@ public class DaoMapperTest extends BaseSpringContextTests { b = "a.`status` != #{STATUS_DELETE} AND a.`post_code` = #{sqlMap.where#post_code#EQ1}"; System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(b, a); + System.out.println("============ BETWEEN、NOT BETWEEN 测试 ============"); + Date[] ds = DateUtils.parseDateBetweenString("2025-09-11 ~ 2025-09-12"); + a = new Post("1").sqlMap().getWhere() + .and("create_date", QueryType.BETWEEN, ds) + .and("update_date", QueryType.NOT_BETWEEN, ds).toSql(); + b = "a.`status` != #{STATUS_DELETE} AND a.`post_code` = #{sqlMap.where#post_code#EQ1}" + + " AND a.create_date BETWEEN #{sqlMap.where.create_date#BETWEEN1.val[0]}" + + " AND #{sqlMap.where.create_date#BETWEEN1.val[1]}" + + " AND a.update_date NOT BETWEEN #{sqlMap.where.update_date#NOT_BETWEEN1.val[0]}" + + " AND #{sqlMap.where.update_date#NOT_BETWEEN1.val[1]}"; + System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(b, a); + System.out.println("============ 带括号测试 ============"); a = new Post("1").sqlMap().getWhere() .andBracket("name", QueryType.EQ, "abc", 1)