From a97c271f09c239510747af29ddd0bbecc2cf2bf7 Mon Sep 17 00:00:00 2001 From: xiyoufang <951868171@qq.com> Date: Sat, 22 Jul 2017 19:37:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BCyyyyMMdd=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E6=97=B6=E5=80=99=E4=BD=BF=E7=94=A8=20cell.getDateCel?= =?UTF-8?q?lValue()=20=E8=A7=A3=E6=9E=90=E5=87=BA=E7=9A=84=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../easypoi/excel/imports/CellValueServer.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/CellValueServer.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/CellValueServer.java index 5914704..9107dde 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/CellValueServer.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/CellValueServer.java @@ -28,7 +28,9 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -68,12 +70,21 @@ public class CellValueServer { if ("class java.util.Date".equals(xclass) || "class java.sql.Date".equals(xclass) || ("class java.sql.Time").equals(xclass) || ("class java.sql.Timestamp").equals(xclass)) { + /* if (Cell.CELL_TYPE_NUMERIC == cell.getCellType()) { // 日期格式 result = cell.getDateCellValue(); } else { cell.setCellType(Cell.CELL_TYPE_STRING); result = getDateData(entity, cell.getStringCellValue()); + }*/ + //FIX: 单元格yyyyMMdd数字时候使用 cell.getDateCellValue() 解析出的日期错误 + if (HSSFDateUtil.isCellDateFormatted(cell)){ + result = HSSFDateUtil.getJavaDate(cell.getNumericCellValue()); + } + else { + cell.setCellType(CellType.STRING); + result = getDateData(entity, cell.getStringCellValue()); } if (("class java.sql.Date").equals(xclass)) { result = new java.sql.Date(((Date) result).getTime());