From caf2d48eb3957628ec07aea04c385f40ada9c144 Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Tue, 24 Jun 2025 19:54:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/controller/PatrolTaskController.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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 76adf83..e473988 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 @@ -2426,21 +2426,29 @@ public class PatrolTaskController extends BaseController { } } } + item.setFilterDesc(item.getDesc()); + item.setDesc(""); } newList.addAll(filterList); if (StringUtils.isNotEmpty(resultAnalysis.getAlgName())) { - newList = newList.stream().filter((element) -> element.getAlgName().equals(resultAnalysis.getAlgName())).collect(Collectors.toList()); + newList = newList.stream().filter((element) -> resultAnalysis.getAlgName().equals(element.getAlgName())).collect(Collectors.toList()); } if (StringUtils.isNotEmpty(resultAnalysis.getFilterDesc())) { - newList = newList.stream().filter((element) -> element.getFilterDesc().equals(resultAnalysis.getFilterDesc())).collect(Collectors.toList()); + newList = newList.stream().filter((element) -> resultAnalysis.getFilterDesc().equals(element.getFilterDesc())).collect(Collectors.toList()); } + PageDomain pageDomain = TableSupport.buildPageRequest(); + int pageNum = pageDomain.getPageNum(); + int pageSize = pageDomain.getPageSize(); + int toNum = Math.min(newList.size(), pageNum * pageSize); + List pageList = newList.subList((pageNum - 1) * pageSize, toNum); + if (newList.size() > maxNum) { return ResponseEntity.ok("超过最大导出数量:" + maxNum + "条,请结合查询条件减少导出的数量！"); } else { - exportExcel(response, newList); + exportExcel(response, pageList); logger.info("任务详情导出耗时: {} ms", (System.currentTimeMillis() - start)); return ResponseEntity.ok("数据导出成功！"); }