Merge remote-tracking branch 'origin/master'

xuhy

4 天以前 9cb78a5414cdbfdd59931b14759bf9800d275448

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectionReportServiceImpl.java

@@ -1,10 +1,20 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TInspectionReportMapper;
import com.ruoyi.system.model.TInspectionReport;
import com.ruoyi.system.model.TProjectTeamStaff;
import com.ruoyi.system.query.TInspectionReportQuery;
import com.ruoyi.system.service.TInspectionReportService;
import com.ruoyi.system.vo.TInspectionReportVO;
import com.ruoyi.system.vo.TProjectTeamVO;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -17,4 +27,11 @@
@Service
public class TInspectionReportServiceImpl extends ServiceImpl<TInspectionReportMapper, TInspectionReport> implements TInspectionReportService {

    @Override
    public PageInfo<TInspectionReportVO> pageList(TInspectionReportQuery query) {
        PageInfo<TInspectionReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TInspectionReportVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}