From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 13 八月 2024 13:38:19 +0800 Subject: [PATCH] 修复bug --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java index 5bbd244..a004435 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java @@ -269,7 +269,10 @@ pageWrap.getModel().getKeyWords()) .like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()), VisitEvent::getCarNo, - pageWrap.getModel().getKeyWords()) + pageWrap.getModel().getCarNo()) + .like(StringUtils.isNotBlank(pageWrap.getModel().getVisitorWorkUint()), + VisitEvent::getVisitorWorkUint, + pageWrap.getModel().getVisitorWorkUint()) .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), Company::getName, pageWrap.getModel().getCompanyName()) @@ -277,10 +280,10 @@ VisitEvent::getEventType, pageWrap.getModel().getEventType()) .ge(StringUtils.isNotBlank(pageWrap.getModel().getStartTime()), - VisitEvent::getHappenTime, + VisitEvent::getCreateDate, pageWrap.getModel().getStartTime()) .le(StringUtils.isNotBlank(pageWrap.getModel().getEndTime()), - VisitEvent::getHappenTime, + VisitEvent::getCreateDate, pageWrap.getModel().getEndTime()) .eq(VisitEvent::getIsdeleted,Constants.ZERO); queryWrapper.orderByDesc(VisitEvent::getHappenTime); -- Gitblit v1.9.3