From b4e170db2c9970825432dcf01b7723b35f58753c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 18 Nov 2024 12:32:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=B8=AD=E5=BF=83=E3=80=91=E8=B6=85=E5=87=BA100w?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=9C=A8=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=9C=A8=E6=96=B0sheet=E9=A1=B5=E4=B8=AD?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/exportCenter/manage/ExportCenterManage.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java index f0e138d4e3..760bf05bb1 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java @@ -525,7 +525,8 @@ public class ExportCenterManage implements BaseExportApi { Sheet detailsSheet = null; List> details = new ArrayList<>(); for (Long p = 0L; p < pageSize; p++) { - String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, false, p.intValue() * extractPageSize, extractPageSize); + int beforeCount = (int) ((s - 1) * sheetLimit); + String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, false, beforeCount + p.intValue() * extractPageSize, extractPageSize); if (pageSize == 1) { querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, false, 0, sheetSize.intValue()); } @@ -655,9 +656,9 @@ public class ExportCenterManage implements BaseExportApi { cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); if (CollectionUtils.isEmpty(request.getMultiInfo())) { - if(request.getViewInfo().getType().equalsIgnoreCase("chart-mix-dual-line")){ + if (request.getViewInfo().getType().equalsIgnoreCase("chart-mix-dual-line")) { - }else { + } else { List details = request.getDetails(); Integer[] excelTypes = request.getExcelTypes(); details.add(0, request.getHeader());