在场人员信息

lishuai

2023-12-13 30b2d11d595dbb99853541c8f86be5220daf58d0

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

@@ -319,10 +319,10 @@
                                                pageWrap.getModel().getEventType())
                    .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
                                                DeviceEvent::getCreateDate,
                                                Utils.Date.getStart(pageWrap.getModel().getStartTime()))
                                                pageWrap.getModel().getStartTime() == null?null:pageWrap.getModel().getStartTime()+" 00:00:00")
                    .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
                                                DeviceEvent::getCreateDate,
                                                Utils.Date.getDayEnd(pageWrap.getModel().getEndTime()));
                                                pageWrap.getModel().getEndTime() == null?"":pageWrap.getModel().getEndTime()+" 23:59:59");
        queryWrapper.orderByDesc(DeviceEvent::getHappenTime);
        IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper);
        return PageData.from(deviceEventDTOIPage);