From 6c6013958e501c92541f659e99200157474caf5e Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 15 Nov 2024 18:27:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=95=B0=E5=80=BC?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/chart/server/ChartDataServer.java | 7 +++++-- .../io/dataease/extensions/view/dto/FormatterCfgDTO.java | 2 +- 2 files changed, 6 insertions(+), 3 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 3f1d231ab5..8522d05089 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 @@ -17,6 +17,7 @@ import io.dataease.exception.DEException; import io.dataease.exportCenter.manage.ExportCenterManage; import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; import io.dataease.extensions.view.dto.ChartViewDTO; +import io.dataease.extensions.view.dto.ChartViewFieldBaseDTO; import io.dataease.extensions.view.dto.ChartViewFieldDTO; import io.dataease.extensions.view.dto.FormatterCfgDTO; import io.dataease.license.manage.F2CLicLimitedManage; @@ -129,12 +130,14 @@ public class ChartDataServer implements ChartDataApi { request.setExcelTypes(dsTypes); } if (CollectionUtils.isNotEmpty(tableRow)) { + FormatterCfgDTO formatterCfgDTO = new FormatterCfgDTO(); for (Object[] objects : tableRow) { for (int i = 0; i < viewDTO.getXAxis().size(); i++) { if (viewDTO.getXAxis().get(i).getDeType().equals(DeTypeConstants.DE_INT) || viewDTO.getXAxis().get(i).getDeType().equals(DeTypeConstants.DE_FLOAT)) { try { - objects[i] = valueFormatter(BigDecimal.valueOf(Double.valueOf(objects[i].toString())), viewDTO.getXAxis().get(i).getFormatterCfg()); + objects[i] = valueFormatter(new BigDecimal(String.valueOf(objects[i])), viewDTO.getXAxis().get(i).getFormatterCfg() == null ? formatterCfgDTO : viewDTO.getXAxis().get(i).getFormatterCfg()); } catch (Exception ignore) { + ignore.printStackTrace(); } } } @@ -149,7 +152,7 @@ public class ChartDataServer implements ChartDataApi { } public static String valueFormatter(BigDecimal value, FormatterCfgDTO formatter) { - if (value == null || formatter == null) { + if (value == null) { return null; } String result; diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FormatterCfgDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FormatterCfgDTO.java index 33ad371814..47fe03247b 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FormatterCfgDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FormatterCfgDTO.java @@ -11,5 +11,5 @@ public class FormatterCfgDTO { private Integer unit = 1; // 换算单位 private String suffix = ""; // 单位后缀 private Integer decimalCount = 2; // 小数位数 - private Boolean thousandSeparator = true; // 千分符 + private Boolean thousandSeparator = false; // 千分符 }