Browse Source

fix:归档bug,报告无数据情况

master
wangguangyuan 4 months ago
parent
commit
c8d9e3903a
2 changed files with 9 additions and 2 deletions
  1. +3
    -0
      inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java
  2. +6
    -2
      inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

+ 3
- 0
inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java View File

@ -735,6 +735,9 @@ public class PatrolTaskResultMainController extends BaseController {
inspectionReportDataService.selectInspectionReportDataList(inspectionReportData);
if (!inspectionReportDataList.isEmpty()) {
inspectionReport.setReportDatalist(inspectionReportDataList);
} else {
logger.info("--exportExcelWordAndZip------report lineId:{},filter:{} no report data!", lineId, inspectionReport.getFilter());
return;
}
for (InspectionReportData reportData : inspectionReportDataList) {


+ 6
- 2
inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java View File

@ -154,8 +154,12 @@ public class PatrolTaskController extends BaseController {
taskListEx.add(task);
}
}
return getDataTable(taskListEx);
PageDomain pageDomain = TableSupport.buildPageRequest();
int pageNum = pageDomain.getPageNum();
int pageSize = pageDomain.getPageSize();
int toNum = Math.min(taskListEx.size(), pageNum * pageSize);
List<PatrolTask> pageList = taskListEx.subList((pageNum - 1) * pageSize, toNum);
return getDataTable(0, pageList, taskListEx);
}
return getDataTable(taskList);
}


Loading…
Cancel
Save