龚焕茏
2024-04-30 36e5600e3497d97b42376c5f096d85891f1ad94b
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -116,48 +116,8 @@
     */
    @Override
    public Result page(ReportQuery query) {
        if (StringUtils.isNotBlank(query.getPointId())) {
            LambdaQueryWrapper<YwPoint> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.like(YwPoint::getPointName, query.getPointId());
            query.setPointIdList(ywpointMapper.selectList(queryWrapper).stream().map(YwPoint::getId).collect(Collectors.toList()));
            if(CollectionUtils.isEmpty(query.getPointIdList())) {
                return Result.ok();
            }
        }
        if (StringUtils.isNotBlank(query.getPeopleId())) {
            LambdaQueryWrapper<YwPeople> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.like(YwPeople::getYwPersonName, query.getPeopleId());
            query.setPeopleIdList(peopleMapper.selectList(queryWrapper).stream().map(YwPeople::getId).collect(Collectors.toList()));
            if(CollectionUtils.isEmpty(query.getPeopleIdList())) {
                return Result.ok();
            }
        }
        IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType())
                .le(Objects.nonNull(query.getBeginCreateTime()), Report::getBeginCreateTime, query.getBeginCreateTime())
                .ge(Objects.nonNull(query.getEndCreateTime()), Report::getEndCreateTime, query.getEndCreateTime())
                .in(!CollectionUtils.isEmpty(query.getPointIdList()), Report::getPointId, query.getPointIdList())
                .in(!CollectionUtils.isEmpty(query.getPeopleIdList()), Report::getPeopleId, query.getPeopleIdList())
                .orderByDesc(Report::getCreateTime)
                .page(PageUtil.getPage(query, Report.class));
        List<ReportVO> vos = page.getRecords().stream()
                .map(
                        entity -> {
                            ReportVO vo = ReportVO.getVoByEntity(entity, null);
                            YwUnit unit = unitMapper.selectById(vo.getUnitId());
                            vo.setUnitName(unit.getUnitName());
                            YwPeople ywPeople = peopleMapper.selectById(vo.getPeopleId());
                            vo.setPeopleName(ywPeople.getYwPersonName());
                            YwPoint ywPoint = ywpointMapper.selectById(vo.getPointId());
                            vo.setPointName(ywPoint.getPointName());
                            return vo;
                        }
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos).total(page.getTotal());
        List<ReportVO> page = baseMapper.page(query);
        return Result.ok().data(page).total(page.size());
    }
    /**