From b0f68c57f7699d083818b9837289e4fb5b7cb25c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 五月 2025 09:14:52 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 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 855db4f..e4c6ad1 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()),
@@ -308,8 +310,11 @@
         queryWrapper.selectAll(Retention.class)
                 .selectAs(Company::getName,Retention::getCompanyName)
                 .selectAs(Company::getType,Retention::getCompanyType)
-                .select(" ( SELECT v.company_name FROM visits v WHERE v.member_id = t.member_id and v.status = "+Constants.VisitStatus.signin+" ORDER BY create_date DESC limit 1 ) as visitCompanyName ");
-        queryWrapper.eq(Retention::getIsdeleted,Constants.ZERO)
+                .select(" ( SELECT v.company_name FROM visits v WHERE v.member_id = t.member_id and v.status = "+Constants.VisitStatus.signin+" ORDER BY create_date DESC limit 1 ) as visitCompanyName ")
+                .selectAs(Category::getBizType,Retention::getBizType)
+                .leftJoin(Category.class,Category::getId,Retention::getCategoryId)
+                .eq(Retention::getIsdeleted,Constants.ZERO)
+//                        .eq(Company::getIsdeleted,Constants.ZERO)
                 .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->{
                     w.like( Retention::getPhone,pageWrap.getModel().getKeyWords())
                             .or().like( Retention::getName,pageWrap.getModel().getKeyWords()); })
@@ -319,9 +324,11 @@
                 .isNull(Objects.nonNull(pageWrap.getModel().getQueryUserType())&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ZERO),
                        Retention::getCompanyId)
                 .eq(Objects.nonNull(pageWrap.getModel().getQueryUserType())&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ONE),
-                        Company::getType,Constants.ZERO)
+                        Retention::getType,Constants.FOUR)
                 .eq(Objects.nonNull(pageWrap.getModel().getQueryUserType())&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.TWO),
-                        Company::getType,Constants.ONE)
+                        Retention::getType,Constants.TWO)
+                .eq(Objects.nonNull(pageWrap.getModel().getBizType()),
+                        Category::getBizType,pageWrap.getModel().getBizType())
                 //杩囨护杞﹁締鏁版嵁
                 .ne(Retention::getType,3)
                 .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),

--
Gitblit v1.9.3