From 4f7e77f44130793a9d16123d96390401b114d9eb Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期六, 28 十月 2023 16:03:48 +0800 Subject: [PATCH] 111 --- server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java index 89030a6..b1737da 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java @@ -635,8 +635,12 @@ } } QueryWrapper<Refund> queryWrapper2 = new QueryWrapper<>(); - queryWrapper2.lambda().ge(param.getStartDate() !=null,Refund::getDoneDate,Utils.Date.getStart(param.getStartDate())); - queryWrapper2.lambda().le(param.getEndDate() !=null,Refund::getDoneDate,Utils.Date.getEnd(param.getEndDate())); + if(Objects.nonNull(param.getStartDate())) { + queryWrapper2.lambda().ge(Refund::getDoneDate, Utils.Date.getStart(param.getStartDate())); + } + if(Objects.nonNull(param.getEndDate())) { + queryWrapper2.lambda().le(Refund::getDoneDate, Utils.Date.getEnd(param.getEndDate())); + } queryWrapper2.lambda().eq(Refund::getIsdeleted, Constants.ZERO); queryWrapper2.select( "count(id) as count_num" ,"sum(money) as money" ); -- Gitblit v1.9.3