From 877a4d2211543eef2d49dabd2538e30d68d75813 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 9 Jan 2025 17:18:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E3=80=91=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AF=BC=E5=87=BA=E8=BE=83?=
 =?UTF-8?q?=E5=A4=A7=E5=80=BC=E4=B8=BA=E7=A7=91=E5=AD=A6=E8=AE=A1=E6=95=B0?=
 =?UTF-8?q?=E6=B3=95=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=8F=8C=E5=87=BB=E5=90=8E?=
 =?UTF-8?q?=E5=8F=98=E4=B8=BA=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/server/ChartDataServer.java         | 39 +++++++++++++++++--
 1 file changed, 35 insertions(+), 4 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 f36cbc8f59..1fa799f390 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
@@ -317,7 +317,7 @@ public class ChartDataServer implements ChartDataApi {
             for (ChartViewFieldDTO xAxi : xAxis) {
                 if (xAxi.getDeType().equals(DeTypeConstants.DE_INT) || xAxi.getDeType().equals(DeTypeConstants.DE_FLOAT)) {
                     FormatterCfgDTO formatterCfgDTO = xAxi.getFormatterCfg() == null ? new FormatterCfgDTO() : xAxi.getFormatterCfg();
-                    CellStyle formatterCellStyle = createCellStyle(wb, formatterCfgDTO);
+                    CellStyle formatterCellStyle = createCellStyle(wb, formatterCfgDTO, null);
                     styles.add(formatterCellStyle);
                 } else {
                     styles.add(null);
@@ -408,12 +408,13 @@ public class ChartDataServer implements ChartDataApi {
                             //设置列的宽度
                             detailsSheet.setColumnWidth(j, 255 * 20);
                         } else if (cellValObj != null) {
+                            System.out.println(cellValObj.toString());
                             try {
                                 if (xAxis != 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")) {
-
+                                            row.getCell(j).setCellStyle(createCellStyle(wb, formatterCfgDTO, cellValue(formatterCfgDTO, new BigDecimal(cellValObj.toString()))));
                                         }
                                         if (styles.get(j) != null) {
                                             row.getCell(j).setCellStyle(styles.get(j));
@@ -439,16 +440,46 @@ public class ChartDataServer implements ChartDataApi {
 
     private static String cellValue(FormatterCfgDTO formatterCfgDTO, BigDecimal value) {
         if (formatterCfgDTO.getType().equalsIgnoreCase("percent")) {
-            return value.multiply(BigDecimal.valueOf(100)).toString();
+            return value.toString();
         } else {
             return value.divide(BigDecimal.valueOf(formatterCfgDTO.getUnit())).toString();
         }
     }
 
-    private static CellStyle createCellStyle(Workbook workbook, FormatterCfgDTO formatter) {
+    private static CellStyle createCellStyle(Workbook workbook, FormatterCfgDTO formatter, String value) {
         CellStyle cellStyle = workbook.createCellStyle();
         DataFormat format = workbook.createDataFormat();
         String formatStr = "";
+        if (formatter.getType().equals("auto")) {
+            String[] valueSplit = String.valueOf(value).split(".");
+            if (StringUtils.isEmpty(value) || !value.contains(".")) {
+                formatStr = "0";
+            } else {
+                formatStr = "0." + new String(new char[valueSplit.length]).replace('\0', '0');
+            }
+            switch (formatter.getUnit()) {
+                case 1000:
+                    formatStr = formatStr + "千";
+                    break;
+                case 10000:
+                    formatStr = formatStr + "万";
+                    break;
+                case 1000000:
+                    formatStr = formatStr + "百万";
+                    break;
+                case 100000000:
+                    formatStr = formatStr + "'亿'";
+                    break;
+                default:
+                    break;
+            }
+            if (formatter.getThousandSeparator()) {
+                formatStr = "#,##" + formatStr;
+            }
+            if (StringUtils.isNotEmpty(formatter.getSuffix())) {
+                formatStr = formatStr + formatter.getSuffix();
+            }
+        }
         if (formatter.getType().equals("value")) {
             if (formatter.getDecimalCount() > 0) {
                 formatStr = "0." + new String(new char[formatter.getDecimalCount()]).replace('\0', '0');