From de21f15d5b96a714b012337cf8c5d6a53548590f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 10:23:53 +0800
Subject: [PATCH] 整理

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 9189ccb..0f2e09a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -252,17 +252,19 @@
         IPage<Retention> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         MPJLambdaWrapper<Retention> queryWrapper = new MPJLambdaWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
-        queryWrapper.leftJoin(Company.class,Company::getId,Retention::getId);
+        queryWrapper.leftJoin(Company.class,Company::getId,Retention::getCompanyId);
         queryWrapper.selectAll(Retention.class)
-                .selectAs(Company::getName,Retention::getCompanyName);
+                .selectAs(Company::getName,Retention::getCompanyName)
+                .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.like(number,Retention::getPhone,pageWrap.getModel().getKeyWords())
                 .like((b||hasWord),Retention::getName,pageWrap.getModel().getKeyWords())
                 .eq(Objects.nonNull(pageWrap.getModel().getType()),
                         Retention::getType,
                         pageWrap.getModel().getType())
-                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
-                        Company::getName,
-                        pageWrap.getModel().getCompanyName())
+                .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+                        p-> p.like(Company::getName, pageWrap.getModel().getCompanyName())
+                                .or()
+                                .exists(" select 1 from visits v where  v.member_id = t.member_id and v.company_name like '%"+pageWrap.getModel().getCompanyName()+"%' and v.status = "+Constants.VisitStatus.signin+""))
                 .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
                         Retention::getEventDate,pageWrap.getModel().getStartTime())
                 .le(Objects.nonNull(pageWrap.getModel().getEndTime()),

--
Gitblit v1.9.3