From 43363c1fcb8f1d482449393fff9834a5e6bfa1be Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 5 Jun 2023 17:36:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baz/controller/BazVisitInstanceController.java | 2 +- .../baz/controller/my/BazMyVisitInstanceController.java | 4 ++-- .../serve/modules/biz/controller/BizVisitController.java | 7 +++++++ .../qs/serve/modules/biz/controller/api/BizVisitApi.java | 8 +++++++- .../modules/biz/controller/my/BizVisitMyController.java | 8 +++++++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java b/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java index ead4a90c..60346d2c 100644 --- a/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java +++ b/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java @@ -50,7 +50,7 @@ public class BazVisitInstanceController { lqw.ge(BazVisitInstance::getCreateTime,param.getQueryStartDate()); } if(param.getQueryEndDate()!=null){ - lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate()); + lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate().atTime(23,59,59)); } PageUtil.startPage(); lqw.orderByDesc(BazVisitInstance::getCreateTime); diff --git a/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java b/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java index c3fa020d..397dd09f 100644 --- a/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java +++ b/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java @@ -56,7 +56,7 @@ public class BazMyVisitInstanceController { lqw.ge(BazVisitInstance::getCreateTime,param.getQueryStartDate()); } if(param.getQueryEndDate()!=null){ - lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate()); + lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate().atTime(23,59,59)); } PageUtil.startPage(); lqw.eq(BazVisitInstance::getVisitorId, AuthContextUtils.getSysUserId()); @@ -78,7 +78,7 @@ public class BazMyVisitInstanceController { lqw.ge(BazVisitInstance::getCreateTime,param.getQueryStartDate()); } if(param.getQueryEndDate()!=null){ - lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate()); + lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate().atTime(23,59,59)); } List userIds = postUserService.listByChildIds(AuthContextUtils.getSysUserId()); if(userIds.size()<1){ diff --git a/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java b/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java index ac30a565..38a531b6 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java @@ -8,6 +8,7 @@ import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.PageUtil; +import com.qs.serve.modules.baz.entity.BazVisitInstance; import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysUserSalesService; import lombok.AllArgsConstructor; @@ -65,6 +66,12 @@ public class BizVisitController { PageUtil.startPage(); LambdaQueryWrapper visitWrapper = new LambdaQueryWrapper<>(param); visitWrapper.orderByDesc(BizVisit::getId); + if(param.getQueryStartTime()!=null){ + visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime()); + } + if(param.getQueryEndTime()!=null){ + visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59)); + } List list = bizVisitService.list(visitWrapper); return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java b/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java index 73188481..617ba796 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java @@ -61,7 +61,7 @@ public class BizVisitApi { visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime()); } if(param.getQueryEndTime()!=null){ - visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime()); + visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59)); } visitWrapper.orderByDesc(BizVisit::getCreateTime); List list = bizVisitService.list(visitWrapper); @@ -86,6 +86,12 @@ public class BizVisitApi { } PageUtil.startPage(); LambdaQueryWrapper visitWrapper = new LambdaQueryWrapper<>(param); + if(param.getQueryStartTime()!=null){ + visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime()); + } + if(param.getQueryEndTime()!=null){ + visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59)); + } visitWrapper.in(BizVisit::getVisitorId,userIds); visitWrapper.orderByDesc(BizVisit::getCreateTime); List list = bizVisitService.list(visitWrapper); diff --git a/src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java b/src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java index 1ce074a2..12dd1e5d 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java @@ -51,7 +51,7 @@ public class BizVisitMyController { visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime()); } if(param.getQueryEndTime()!=null){ - visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime()); + visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59)); } visitWrapper.orderByDesc(BizVisit::getCreateTime); List list = bizVisitService.list(visitWrapper); @@ -74,6 +74,12 @@ public class BizVisitMyController { LambdaQueryWrapper visitWrapper = new LambdaQueryWrapper<>(param); visitWrapper.in(BizVisit::getVisitorId,userIds); visitWrapper.orderByDesc(BizVisit::getCreateTime); + if(param.getQueryStartTime()!=null){ + visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime()); + } + if(param.getQueryEndTime()!=null){ + visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59)); + } List list = bizVisitService.list(visitWrapper); return R.byPageHelperList(list); }