From b96cc19f216ccd7451a5d2758055a4f174587ba9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 16:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 7ea1135..7a192b0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -247,10 +247,12 @@
.and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
p-> p.like(Company::getName, pageWrap.getModel().getCompanyName())
.or().like(Member::getVisitCompanyName, pageWrap.getModel().getCompanyName()))
- .eq(Objects.nonNull(pageWrap.getModel().getCarType()),
- Retention::getCarType,pageWrap.getModel().getCarType())
+// .eq(Objects.nonNull(pageWrap.getModel().getCarType()),
+// Retention::getCarType,pageWrap.getModel().getCarType())
.like(Objects.nonNull(pageWrap.getModel().getCarNo()),
Retention::getCarNo,pageWrap.getModel().getCarNo())
+ .like(Objects.nonNull(pageWrap.getModel().getCategoryName()),
+ Retention::getCategoryName,pageWrap.getModel().getCategoryName())
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
Retention::getCreateDate,pageWrap.getModel().getStartTime())
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
--
Gitblit v1.9.3