jiangping
2023-12-14 9fc3cec0d40c86b8b4a8e34dcf7a82645ccbd192
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -286,7 +286,7 @@
    }
    @Override
    public PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEventQuery> pageWrap) {
    public PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEvent> pageWrap) {
        IPage<DeviceEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<DeviceEvent> queryWrapper = new MPJLambdaWrapper<>();
@@ -298,19 +298,16 @@
        boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
        //是否包含英文
        boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
        queryWrapper.leftJoin(Member.class,Member::getId,DeviceEvent::getExtEventPersonNo)
        queryWrapper.leftJoin(Member.class,Member::getHkId,DeviceEvent::getExtEventPersonNo)
                    .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                    .selectAll(DeviceEvent.class)
                    .selectAs(Member::getName,DeviceEventDTO::getPersonName)
                    .selectAs(Member::getType,DeviceEventDTO::getPersonType)
                    .selectAs(Member::getPhone,DeviceEventDTO::getPersonPhone)
                    .selectAs(Member::getIdcardDecode,DeviceEventDTO::getPersonIdcardDecode)
                    .selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName);
        queryWrapper.like(number,
                            Member::getPhone,
                            pageWrap.getModel().getKeyWords())
                    .like((b||hasWord),
                            Member::getName,
                            pageWrap.getModel().getKeyWords())
        queryWrapper.like(number, Member::getPhone, pageWrap.getModel().getKeyWords())
                    .like((b||hasWord),Member::getName, pageWrap.getModel().getKeyWords())
                    .eq(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()),
                                                Member::getType,
                                                pageWrap.getModel().getPersonType())
@@ -319,10 +316,10 @@
                                                pageWrap.getModel().getEventType())
                    .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
                                                DeviceEvent::getCreateDate,
                                                pageWrap.getModel().getStartTime() == null?null:pageWrap.getModel().getStartTime()+" 00:00:00")
                                                pageWrap.getModel().getStartTime())
                    .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
                                                DeviceEvent::getCreateDate,
                                                pageWrap.getModel().getEndTime() == null?"":pageWrap.getModel().getEndTime()+" 23:59:59");
                                                pageWrap.getModel().getEndTime());
        queryWrapper.orderByDesc(DeviceEvent::getHappenTime);
        IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper);
        return PageData.from(deviceEventDTOIPage);