报告列表返回生成报告字段标识

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/report/query/QueryReportPageListService.java

@@ -17,6 +17,7 @@ import com.tuoheng.admin.utils.CurrentUserUtil;
 import com.tuoheng.admin.vo.ReportPageListVo;
 import com.tuoheng.common.core.utils.JsonResult;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -161,7 +162,13 @@ public class QueryReportPageListService {
      * @return
      */
     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) {
             List<InspectionFile> inspectionFileList = inspectionFileMapper.selectList(Wrappers.<InspectionFile>lambdaQuery()
                     .eq(InspectionFile::getInspectionId, reportPageListVo.getInspectionId())