From f56d1338fccb2a998e0419a6b2c6d85fcd0dbdf7 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Mon, 31 Jul 2023 16:29:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lihongjie/coal/dto/CommonQuery.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/dto/CommonQuery.java b/src/main/java/cn/lihongjie/coal/dto/CommonQuery.java index 229143bd..d22ea54e 100644 --- a/src/main/java/cn/lihongjie/coal/dto/CommonQuery.java +++ b/src/main/java/cn/lihongjie/coal/dto/CommonQuery.java @@ -1,6 +1,5 @@ package cn.lihongjie.coal.dto; -import io.vavr.Function3; import io.vavr.Function4; import io.vavr.Tuple; import io.vavr.Tuple2; @@ -359,11 +358,23 @@ public class CommonQuery { return criteriaBuilder.greaterThanOrEqualTo(root.get(x.key), c.convert(x.value, LocalDate.class)); }); map.put(Tuple.of("ge", LocalDateTime.class), (Root root, CriteriaBuilder criteriaBuilder, QueryItem x, ConversionService c) -> { + return criteriaBuilder.greaterThanOrEqualTo(root.get(x.key), c.convert(x.value, LocalDateTime.class)); }); + map.put(Tuple.of("empty", List.class), (Root root, CriteriaBuilder criteriaBuilder, QueryItem x, + ConversionService c) -> { + return criteriaBuilder.isEmpty(root.get(x.key)); + }); + + + map.put(Tuple.of("nempty", List.class), (Root root, CriteriaBuilder criteriaBuilder, QueryItem x, + ConversionService c) -> { + + return criteriaBuilder.isNotEmpty(root.get(x.key)); + }); @@ -496,7 +507,7 @@ public class CommonQuery { Function4 function4 = map.get(Tuple.of(x.opt, javaType)); if (function4 == null) { - throw new RuntimeException("无法识别的查询 " + x.toString()); + throw new RuntimeException("无法识别的查询 " + x); } return function4.apply(root, criteriaBuilder, x, conversionService);