From 994f0fc53d576160edbe33ee490a6ad581b1f7d0 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 15 Oct 2024 16:01:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E8=B6=85=E8=BF=87100w=E6=97=B6=EF=BC=8C=E5=88=86=E5=A4=9A?= =?UTF-8?q?=E4=B8=AAsheet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/exportCenter/manage/ExportCenterManage.java | 6 +++--- 1 file changed, 3 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 45721cbf4d..d421ae7eb9 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 @@ -509,7 +509,7 @@ public class ExportCenterManage implements BaseExportApi { for (Long s = 1L; s < sheetCount + 1; s++) { Long sheetSize; if (s.equals(sheetCount)) { - sheetSize = totalCount - sheetCount * (s - 1) * sheetLimit; + sheetSize = totalCount - (s - 1) * sheetLimit; } else { sheetSize = sheetLimit; } @@ -590,8 +590,8 @@ public class ExportCenterManage implements BaseExportApi { } } exportTask.setExportStatus("IN_PROGRESS"); - double exportRogress2 = (double) ((double) s - 1 / (double) sheetCount); - double exportRogress = (double) ((double) p / (double) pageSize) * ((double) 1 / sheetCount); + double exportRogress2 = (double) ((double) s - 1) / ((double) sheetCount); + double exportRogress = (double) ((double) (p + 1) / (double) pageSize) * ((double) 1 / sheetCount); DecimalFormat df = new DecimalFormat("#.##"); String formattedResult = df.format((exportRogress + exportRogress2) * 100); exportTask.setExportProgress(formattedResult);