k94314517
2025-05-07 457571f9c87f14c39c1e30678aefe981dea908af
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()),