From 25c8333466177f3573738d2bf5e536701c0fdd4f Mon Sep 17 00:00:00 2001
From: zhangye <654600784@qq.com>
Date: Wed, 20 Jul 2022 19:02:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9excel=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ccsens/util/ExcelUtil.java  | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/util/src/main/java/com/ccsens/util/ExcelUtil.java b/util/src/main/java/com/ccsens/util/ExcelUtil.java
index 331b8fe..6ff8987 100644
--- a/util/src/main/java/com/ccsens/util/ExcelUtil.java
+++ b/util/src/main/java/com/ccsens/util/ExcelUtil.java
@@ -54,7 +54,17 @@ public class ExcelUtil {
 //        return ret;
 //    }
 
-    public static String getCellValue(Cell cell) {
+    public static String getCellValue(Cell cell){
+        return getCellValue(cell,false);
+    }
+
+    /**
+     *
+     * @param cell 单元格
+     * @param strAsDate 是否将String优先作为日期解析
+     * @return
+     */
+    public static String getCellValue(Cell cell,boolean strAsDate) {
         String ret;
         if(ObjectUtil.isNull(cell)){
             return "";
@@ -74,7 +84,7 @@ public class ExcelUtil {
                 Workbook wb = cell.getSheet().getWorkbook();
                 CreationHelper crateHelper = wb.getCreationHelper();
                 FormulaEvaluator evaluator = crateHelper.createFormulaEvaluator();
-                ret = getCellValue(evaluator.evaluateInCell(cell));
+                ret = getCellValue(evaluator.evaluateInCell(cell),strAsDate);
                 break;
             case NUMERIC:
                 if (org.apache.poi.ss.usermodel.DateUtil.isCellDateFormatted(cell)) {
@@ -89,9 +99,13 @@ public class ExcelUtil {
                     ret = cell.getStringCellValue();
                     break;
                 }
-                try {
-                    ret = String.valueOf(cn.hutool.core.date.DateUtil.parse(cell.getStringCellValue()).getTime());
-                }catch (DateException e){
+                if(strAsDate){
+                    try {
+                        ret = String.valueOf(cn.hutool.core.date.DateUtil.parse(cell.getStringCellValue()).getTime());
+                    }catch (DateException e){
+                        ret = cell.getRichStringCellValue().getString();
+                    }
+                }else {
                     ret = cell.getRichStringCellValue().getString();
                 }
                 break;