diff --git a/build.gradle b/build.gradle index 88b5b05..9b648ed 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ uploadArchives { authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD) } pom.project { - version '1.1.31' + version '1.1.32' artifactId ARTIFACT_Id groupId GROUP_ID packaging TYPE diff --git a/src/main/java/com/taover/util/UtilExcel.java b/src/main/java/com/taover/util/UtilExcel.java index 4072c6d..6798271 100644 --- a/src/main/java/com/taover/util/UtilExcel.java +++ b/src/main/java/com/taover/util/UtilExcel.java @@ -402,7 +402,14 @@ public class UtilExcel { if(currCellType.compareTo(CellType.STRING) == 0){ dataRow.add(UtilString.trimCodePage(cell.getRichStringCellValue().getString())); }else if(currCellType.compareTo(CellType.NUMERIC) == 0){ - dataRow.add(df.format(cell.getNumericCellValue())); + //if (DateUtil.isCellDateFormatted(cell)) { + if (cell.getCellStyle().getDataFormat()==28||cell.getCellStyle().getDataFormat()==31 || cell.getCellStyle().getDataFormat() == 58) { + // 如果是date类型则 ,获取该cell的date值 + dataRow.add( new SimpleDateFormat("yyyy-MM-dd").format(DateUtil.getJavaDate(cell.getNumericCellValue()))); + } else { // 纯数字 + // return String.valueOf(cell.getNumericCellValue()); + dataRow.add( df.format(cell.getNumericCellValue())); + } }else if(currCellType.compareTo(CellType.BOOLEAN) == 0){ dataRow.add(cell.getBooleanCellValue()); -- libgit2 0.21.2