From 70eb3e35114d35580290aeb2a1aabd5c721d0ef1 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 15 Jan 2025 18:58:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E3=80=91=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BAexcel=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=81=9A=E7=A9=BA=E5=80=BC=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E6=8C=89=E7=85=A7=E5=A4=84=E7=90=86=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/chart/server/ChartDataServer.java | 8 ++++---- .../dataease/exportCenter/manage/ExportCenterManage.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java index ea5d72e6dc..b23d2938c2 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java +++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java @@ -265,7 +265,7 @@ public class ChartDataServer implements ChartDataApi { ViewDetailField[] detailFields = request.getDetailFields(); Object[] header = request.getHeader(); Sheet detailsSheet = wb.createSheet("数据"); - setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, null, null); + setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, request.getViewInfo(), null); } else { for (int i = 0; i < request.getMultiInfo().size(); i++) { ChartExcelRequestInner requestInner = request.getMultiInfo().get(i); @@ -275,7 +275,7 @@ public class ChartDataServer implements ChartDataApi { ViewDetailField[] detailFields = requestInner.getDetailFields(); Object[] header = requestInner.getHeader(); Sheet detailsSheet = wb.createSheet("数据 " + (i + 1)); - setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, null, null); + setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, request.getViewInfo(), null); } } } @@ -410,7 +410,7 @@ public class ChartDataServer implements ChartDataApi { detailsSheet.setColumnWidth(j, 255 * 20); } else if (cellValObj != null) { try { - if (viewInfo != null && (xAxis.get(j).getDeType().equals(DeTypeConstants.DE_INT) || xAxis.get(j).getDeType().equals(DeTypeConstants.DE_FLOAT))) { + if (wb != null && (xAxis.get(j).getDeType().equals(DeTypeConstants.DE_INT) || xAxis.get(j).getDeType().equals(DeTypeConstants.DE_FLOAT))) { try { FormatterCfgDTO formatterCfgDTO = xAxis.get(j).getFormatterCfg() == null ? new FormatterCfgDTO() : xAxis.get(j).getFormatterCfg(); if (formatterCfgDTO.getType().equalsIgnoreCase("auto")) { @@ -438,7 +438,7 @@ public class ChartDataServer implements ChartDataApi { } else { if (!viewInfo.getType().equalsIgnoreCase("circle-packing")) { Map senior = viewInfo.getSenior(); - ChartSeniorFunctionCfgDTO functionCfgDTO = JsonUtil.parseObject((String) JsonUtil.toJSONString(senior.get("assistLineCfg")), ChartSeniorFunctionCfgDTO.class); + ChartSeniorFunctionCfgDTO functionCfgDTO = JsonUtil.parseObject((String) JsonUtil.toJSONString(senior.get("functionCfg")), ChartSeniorFunctionCfgDTO.class); if (StringUtils.isNotEmpty(functionCfgDTO.getEmptyDataStrategy()) && functionCfgDTO.getEmptyDataStrategy().equalsIgnoreCase("setZero") && functionCfgDTO.getEmptyDataFieldCtrl().contains(xAxis.get(j).getDataeaseName())) { cell.setCellValue(0); } 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 02e08642bf..d935b7d5e9 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 @@ -739,7 +739,7 @@ public class ExportCenterManage implements BaseExportApi { if (request.getViewInfo().getType().equalsIgnoreCase("table-normal")) { ChartDataServer.setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, request.getViewInfo(), wb); } else { - ChartDataServer.setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, null, null); + ChartDataServer.setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, request.getViewInfo(), null); } } } else { @@ -754,7 +754,7 @@ public class ExportCenterManage implements BaseExportApi { Object[] header = requestInner.getHeader(); //明细sheet Sheet detailsSheet = wb.createSheet("数据 " + (i + 1)); - ChartDataServer.setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, null, null); + ChartDataServer.setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, request.getViewInfo(), null); } } }