From fa0003551564dd4e3923a656820bcf417217a75e Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 14 Oct 2024 16:01:44 +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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 002f5256ed..45721cbf4d 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 @@ -42,6 +42,7 @@ import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeObj; import io.dataease.i18n.Translator; import io.dataease.license.config.XpackInteract; import io.dataease.license.manage.F2CLicLimitedManage; +import io.dataease.license.utils.LicenseUtil; import io.dataease.model.ExportTaskDTO; import io.dataease.system.manage.CoreUserManage; import io.dataease.system.manage.SysParameterManage; @@ -422,6 +423,7 @@ public class ExportCenterManage implements BaseExportApi { TokenUserBO tokenUserBO = AuthUtils.getUser(); Future future = scheduledThreadPoolExecutor.submit(() -> { + LicenseUtil.validate(); AuthUtils.setUser(tokenUserBO); try { exportTask.setExportStatus("IN_PROGRESS"); @@ -588,7 +590,7 @@ public class ExportCenterManage implements BaseExportApi { } } exportTask.setExportStatus("IN_PROGRESS"); - double exportRogress2 = (double) ((double) s / (double) sheetCount); + double exportRogress2 = (double) ((double) s - 1 / (double) sheetCount); double exportRogress = (double) ((double) p / (double) pageSize) * ((double) 1 / sheetCount); DecimalFormat df = new DecimalFormat("#.##"); String formattedResult = df.format((exportRogress + exportRogress2) * 100);