jiangping
2023-12-18 c18b8f0f12f9c3965fee72ea2ae668c2fc89d908
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -23,6 +23,7 @@
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
/**
 * 停车场事件推送记录表Service实现
@@ -263,7 +264,7 @@
    }
    @Override
    public PageData<CarEventDTO> findVisitCarPage(PageWrap<VisitEventQuery> pageWrap) {
    public PageData<CarEventDTO> findVisitCarPage(PageWrap<CarEvent> pageWrap) {
        //是否是数字
        boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
        //是否包含中文
@@ -284,24 +285,28 @@
                    .selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode)
                    .selectAs(Member::getName,CarEventDTO::getPersonName)
                    .selectAs(Company::getName,CarEventDTO::getPersonCompanyName);
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
                                CarEvent::getCardNo,
                                pageWrap.getModel().getCarNo())
                .like(number,
                        Member::getPhone,
                        pageWrap.getModel().getKeyWords())
                .like((b || hasWord),
                        Member::getPhone,
                        pageWrap.getModel().getKeyWords())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
                        Company::getName,
                        pageWrap.getModel().getCompanyName())
                .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()),
                        Member::getType,
                        pageWrap.getModel().getMemberType())
                .eq(StringUtils.isNotBlank(pageWrap.getModel().getSrcType()),
                        CarEvent::getSrcType,
                        pageWrap.getModel().getSrcType());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()),
                                CarEvent::getPlateNos,
                                pageWrap.getModel().getPlateNos())
                    .like(number,
                            Member::getPhone,
                            pageWrap.getModel().getKeyWords())
                    .like((b || hasWord),
                            Member::getPhone,
                            pageWrap.getModel().getKeyWords())
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
                            Company::getName,
                            pageWrap.getModel().getCompanyName())
                    .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()),
                            Member::getType,
                            pageWrap.getModel().getMemberType())
                    .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
                            CarEvent::getEventType,
                            pageWrap.getModel().getEventType())
                    .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
                            CarEvent::getCreateDate, pageWrap.getModel().getStartTime())
                    .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
                            CarEvent::getCreateDate, pageWrap.getModel().getEndTime());
        IPage<CarEventDTO> carEventDTOIPage = carEventJoinMapper.selectJoinPage(page, CarEventDTO.class, queryWrapper);
        return PageData.from(carEventDTOIPage);