From 6c40e04eb7c2060feb2533735cd3089d438965e5 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 19 三月 2024 17:19:36 +0800
Subject: [PATCH] 整理
---
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