From cfcbe04cae6ebb41a573601af6fb7521798de461 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 1 Aug 2022 17:21:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=8F=91=E9=80=81=E8=A7=86=E5=9B=BE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8C=85=E5=90=AB=E6=97=A0=E6=95=88=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/service/chart/ViewExportExcel.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java b/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
index 67f830aee8..ee7cd97324 100644
--- a/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
+++ b/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
@@ -104,7 +104,7 @@ public class ViewExportExcel {
             Object val = row.get(key);
             if (ObjectUtils.isEmpty(val))
                 return StringUtils.EMPTY;
-            return val.toString();
+            return filterInvalidDecimal(val.toString());
         }).collect(Collectors.toList())).collect(Collectors.toList());
         result.setHeads(heads);
         result.setDatas(details);
@@ -112,4 +112,12 @@ public class ViewExportExcel {
         result.setSheetName(title);
         return result;
     }
+
+    private String filterInvalidDecimal(String sourceNumberStr) {
+        if (StringUtils.isNotBlank(sourceNumberStr) && StringUtils.contains(sourceNumberStr, ".")) {
+            sourceNumberStr = sourceNumberStr.replaceAll("0+?$", "");
+            sourceNumberStr = sourceNumberStr.replaceAll("[.]$", "");
+        }
+        return sourceNumberStr;
+    }
 }