|
|
|
|
|
|
|
|
import com.tuoheng.admin.vo.ReportPageListVo; |
|
|
import com.tuoheng.admin.vo.ReportPageListVo; |
|
|
import com.tuoheng.common.core.utils.JsonResult; |
|
|
import com.tuoheng.common.core.utils.JsonResult; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
|
import org.springframework.beans.BeanUtils; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* @return |
|
|
* @return |
|
|
*/ |
|
|
*/ |
|
|
private List<ReportPageListVo> buildReportPageListVoList(List<Report> reportList) { |
|
|
private List<ReportPageListVo> buildReportPageListVoList(List<Report> reportList) { |
|
|
List<ReportPageListVo> reportPageListVoList = ReportConverMapper.INSTANCE.fromReportListToReportPageListList(reportList); |
|
|
|
|
|
|
|
|
//List<ReportPageListVo> reportPageListVoList = ReportConverMapper.INSTANCE.fromReportListToReportPageListList(reportList); |
|
|
|
|
|
List<ReportPageListVo> reportPageListVoList = new ArrayList<>(); |
|
|
|
|
|
ReportPageListVo vo = new ReportPageListVo(); |
|
|
|
|
|
for (Report report : reportList) { |
|
|
|
|
|
BeanUtils.copyProperties(report,vo); |
|
|
|
|
|
reportPageListVoList.add(vo); |
|
|
|
|
|
} |
|
|
for (ReportPageListVo reportPageListVo : reportPageListVoList) { |
|
|
for (ReportPageListVo reportPageListVo : reportPageListVoList) { |
|
|
List<InspectionFile> inspectionFileList = inspectionFileMapper.selectList(Wrappers.<InspectionFile>lambdaQuery() |
|
|
List<InspectionFile> inspectionFileList = inspectionFileMapper.selectList(Wrappers.<InspectionFile>lambdaQuery() |
|
|
.eq(InspectionFile::getInspectionId, reportPageListVo.getInspectionId()) |
|
|
.eq(InspectionFile::getInspectionId, reportPageListVo.getInspectionId()) |