Merge remote-tracking branch 'origin/master'

rk

2025-09-29 218e84d2264e413f31a2f3957f05bb7b8ad42d5d

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java

@@ -235,8 +235,10 @@
                .leftJoin(Member.class,Member::getId,Retention::getMemberId)
                .leftJoin(Member.class,Member::getId,Retention::getMemberId)
                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .leftJoin(Category.class,Category::getId,Retention::getCategoryId)
                .selectAs(Company::getCompanyNamePath,Retention::getCompanyName)
                .selectAs(Member::getName,Retention::getName)
                .selectAs(Category::getName,Retention::getCategoryName)
                .selectAs(Member::getPhone,Retention::getPhone)
                .selectAs(Member::getVisitCompanyName,Retention::getVisitCompanyName)
                .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->{
@@ -247,10 +249,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 +312,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 +326,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()),