From fd8a3db54843237cc6c7875315ae2c55854cefbd Mon Sep 17 00:00:00 2001 From: wisonic-s <51065359+wisonic-s@users.noreply.github.com> Date: Fri, 20 Jun 2025 11:26:09 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E8=A1=A8=E5=A4=B4=E5=88=86=E7=BB=84?= =?UTF-8?q?=E5=90=8E=E5=AF=BC=E5=87=BA=E8=A1=A8=E5=A4=B4=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/chart/server/ChartDataServer.java | 4 ++-- .../exportCenter/manage/ExportCenterDownLoadManage.java | 6 +++--- 2 files changed, 5 insertions(+), 5 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 bbb0327df2..6e34d41bfd 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 @@ -359,7 +359,7 @@ public class ChartDataServer implements ChartDataApi { Map customAttr = viewInfo.getCustomAttr(); Map tableHeaderMap = (Map) customAttr.get("tableHeader"); - if (tableHeaderMap.get("headerGroup") != null && Boolean.valueOf(tableHeaderMap.get("headerGroup").toString())) { + if (tableHeaderMap.get("headerGroup") != null && Boolean.parseBoolean(tableHeaderMap.get("headerGroup").toString())) { tableHeader = JsonUtil.parseObject((String) JsonUtil.toJSONString(customAttr.get("tableHeader")), TableHeader.class); for (TableHeader.ColumnInfo column : tableHeader.getHeaderGroupConfig().getColumns()) { totalDepth = Math.max(totalDepth, getDepth(column, 1)); @@ -581,7 +581,7 @@ public class ChartDataServer implements ChartDataApi { private static String getDeFieldName(List xAxis, String key) { for (ChartViewFieldDTO xAxi : xAxis) { if (xAxi.getDataeaseName().equals(key)) { - return xAxi.getName(); + return StringUtils.isNotBlank(xAxi.getChartShowName()) ? xAxi.getChartShowName() : xAxi.getName(); } } return ""; diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java index 39665c2fed..9ea702eb0a 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java @@ -485,15 +485,15 @@ public class ExportCenterDownLoadManage { xAxis.addAll(request.getViewInfo().getYAxisExt()); xAxis.addAll(request.getViewInfo().getExtStack()); xAxis.addAll(request.getViewInfo().getDrillFields()); - header = Arrays.stream(request.getHeader()).filter(item -> xAxis.stream().map(DatasetTableFieldDTO::getName).collect(Collectors.toList()).contains(item)).collect(Collectors.toList()).toArray(); + header = Arrays.stream(request.getHeader()).filter(item -> xAxis.stream().map(d -> StringUtils.isNotBlank(d.getChartShowName()) ? d.getChartShowName() : d.getName()).toList().contains(item)).toArray(); details.add(0, header); ChartDataServer.setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, request.getViewInfo(), wb); sheetIndex++; details.clear(); exportTask.setExportStatus("IN_PROGRESS"); - double exportRogress = (double) (i / (chartViewDTO.getTotalPage() + 1)); + double exportProgress = (double) (i / (chartViewDTO.getTotalPage() + 1)); DecimalFormat df = new DecimalFormat("#.##"); - String formattedResult = df.format((exportRogress) * 100); + String formattedResult = df.format((exportProgress) * 100); exportTask.setExportProgress(formattedResult); exportTaskMapper.updateById(exportTask); }