From 292c0ad945164a954a14e5e447b16d10c83e47a6 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 15 十月 2024 19:08:42 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 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 5ed41e0..75a1043 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 @@ -262,6 +262,7 @@ queryWrapper.leftJoin(Company.class,Company::getId,Retention::getCompanyId); 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) .like(number,Retention::getPhone,pageWrap.getModel().getKeyWords()) @@ -269,6 +270,12 @@ .eq(Objects.nonNull(pageWrap.getModel().getType()), Retention::getType, pageWrap.getModel().getType()) + .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) + .eq(Objects.nonNull(pageWrap.getModel().getQueryUserType())&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.TWO), + Company::getType,Constants.ONE) //杩囨护杞﹁締鏁版嵁 .ne(Retention::getType,3) .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), -- Gitblit v1.9.3