jiangping
2024-08-13 6765787baa5e0b771d71f865c4deb776367410c4
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
@@ -269,7 +269,10 @@
                        pageWrap.getModel().getKeyWords())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
                        VisitEvent::getCarNo,
                        pageWrap.getModel().getKeyWords())
                        pageWrap.getModel().getCarNo())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getVisitorWorkUint()),
                        VisitEvent::getVisitorWorkUint,
                        pageWrap.getModel().getVisitorWorkUint())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
                        Company::getName,
                        pageWrap.getModel().getCompanyName())
@@ -277,10 +280,10 @@
                        VisitEvent::getEventType,
                        pageWrap.getModel().getEventType())
                .ge(StringUtils.isNotBlank(pageWrap.getModel().getStartTime()),
                        VisitEvent::getHappenTime,
                        VisitEvent::getCreateDate,
                        pageWrap.getModel().getStartTime())
                .le(StringUtils.isNotBlank(pageWrap.getModel().getEndTime()),
                        VisitEvent::getHappenTime,
                        VisitEvent::getCreateDate,
                        pageWrap.getModel().getEndTime())
                .eq(VisitEvent::getIsdeleted,Constants.ZERO);
        queryWrapper.orderByDesc(VisitEvent::getHappenTime);