From c8d9e3903a306c7139dd9eb943ed4f31dc468d8b Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Wed, 6 Aug 2025 09:53:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=BD=92=E6=A1=A3bug=EF=BC=8C=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E6=97=A0=E6=95=B0=E6=8D=AE=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PatrolTaskResultMainController.java | 3 +++ .../com/inspect/task/controller/PatrolTaskController.java | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java index 381e635..113efc7 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java @@ -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) { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 78ce4ef..a1d14b8 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -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 pageList = taskListEx.subList((pageNum - 1) * pageSize, toNum); + return getDataTable(0, pageList, taskListEx); } return getDataTable(taskList); }