From cce9e87c61e8c946baf3d21d18cd7295342dcfeb Mon Sep 17 00:00:00 2001
From: wangbing <Wb295490665>
Date: Fri, 6 Mar 2020 11:31:22 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81Excel=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: eb1d055835f73f309de5958bbb04ba07cf17c817
---
 .../modules/SpringBoot/java/frame/excel/WExcel.java        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/modules/SpringBoot/java/frame/excel/WExcel.java b/src/main/resources/modules/SpringBoot/java/frame/excel/WExcel.java
index 2899f875..aefcd03e 100644
--- a/src/main/resources/modules/SpringBoot/java/frame/excel/WExcel.java
+++ b/src/main/resources/modules/SpringBoot/java/frame/excel/WExcel.java
@@ -10,7 +10,6 @@ import org.apache.poi.ss.usermodel.DataValidationHelper;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
 import org.apache.poi.xssf.usermodel.XSSFComment;
 import org.apache.poi.xssf.usermodel.XSSFDataValidation;
@@ -18,6 +17,8 @@ import org.apache.poi.xssf.usermodel.XSSFDrawing;
 import org.apache.poi.xssf.usermodel.XSSFRichTextString;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.ss.util.NumberToTextConverter;
 import ${basePackage}.frame.excel.annotation.ColumnDescription;
 import ${basePackage}.frame.excel.annotation.ColumnList;
 import ${basePackage}.frame.excel.annotation.ColumnName;
@@ -655,9 +656,7 @@ public class WExcel<T> implements Serializable, Cloneable {
                     Date value = cell.getDateCellValue();
                     return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(value);
                 } else {
-                    double numericCellValue = cell.getNumericCellValue();
-                    String s = String.valueOf(numericCellValue);
-                    return s.replaceAll("\\.0$", "");
+                    return NumberToTextConverter.toText(cell.getNumericCellValue());
                 }
             default:
                 return cell.getStringCellValue();