diff --git a/WebRoot/Excel/3033ead5-5b8f-4b1e-92d6-2afda4c0d461.xlsx b/WebRoot/Excel/3033ead5-5b8f-4b1e-92d6-2afda4c0d461.xlsx new file mode 100644 index 00000000..7b369238 Binary files /dev/null and b/WebRoot/Excel/3033ead5-5b8f-4b1e-92d6-2afda4c0d461.xlsx differ diff --git a/WebRoot/Excel/5753056b-6c37-47bd-b952-67b19924d760.xlsx b/WebRoot/Excel/5753056b-6c37-47bd-b952-67b19924d760.xlsx new file mode 100644 index 00000000..f4d07e35 Binary files /dev/null and b/WebRoot/Excel/5753056b-6c37-47bd-b952-67b19924d760.xlsx differ diff --git a/WebRoot/Excel/7637d23a-be8d-4366-80b2-69f086cfc5c7.xlsx b/WebRoot/Excel/7637d23a-be8d-4366-80b2-69f086cfc5c7.xlsx new file mode 100644 index 00000000..4b74d626 Binary files /dev/null and b/WebRoot/Excel/7637d23a-be8d-4366-80b2-69f086cfc5c7.xlsx differ diff --git a/WebRoot/Excel/7ba8262d-ff51-4492-8b4a-229d9961458e.xlsx b/WebRoot/Excel/7ba8262d-ff51-4492-8b4a-229d9961458e.xlsx new file mode 100644 index 00000000..3cbd56ce Binary files /dev/null and b/WebRoot/Excel/7ba8262d-ff51-4492-8b4a-229d9961458e.xlsx differ diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index 7e8a9928..a8306210 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -503,17 +503,24 @@ public class CollectModel { } writeRecord.set(colName, value); } else { - if (colType.equals("Integer")) - writeRecord.set(colName, (int) Double.parseDouble(PoiUtil.getValue(cell).toString())); - else if (colType.equals("String")) - writeRecord.set(colName, PoiUtil.getValue(cell).toString()); - else if (colType.equals("Double")) - writeRecord.set(colName, Double.parseDouble(PoiUtil.getValue(cell).toString())); - else if (colType.equals("Date")) { - String dateString = PoiUtil.getValue(cell).toString(); - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - Date date = dateFormat.parse(dateString); - writeRecord.set(colName, date); + if (colType.equals("Integer")) { + if (StrKit.isBlank(PoiUtil.getValue(cell))) writeRecord.set(colName, null); + else + writeRecord.set(colName, (int) Double.parseDouble(PoiUtil.getValue(cell).toString())); + } else if (colType.equals("String")) { + if (StrKit.isBlank(PoiUtil.getValue(cell))) writeRecord.set(colName, null); + else writeRecord.set(colName, PoiUtil.getValue(cell).toString()); + } else if (colType.equals("Double")) { + if (StrKit.isBlank(PoiUtil.getValue(cell))) writeRecord.set(colName, null); + else writeRecord.set(colName, Double.parseDouble(PoiUtil.getValue(cell).toString())); + } else if (colType.equals("Date")) { + if (StrKit.isBlank(PoiUtil.getValue(cell))) writeRecord.set(colName, null); + else { + String dateString = PoiUtil.getValue(cell).toString(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date date = dateFormat.parse(dateString); + writeRecord.set(colName, date); + } } } } diff --git a/src/main/java/com/dsideal/QingLong/Util/PoiUtil.java b/src/main/java/com/dsideal/QingLong/Util/PoiUtil.java index 692f2ac7..64070f86 100644 --- a/src/main/java/com/dsideal/QingLong/Util/PoiUtil.java +++ b/src/main/java/com/dsideal/QingLong/Util/PoiUtil.java @@ -216,7 +216,6 @@ public class PoiUtil { break; case CellType.BOOLEAN: // Boolean cellValue = cell.getBooleanCellValue() + ""; - ; break; case CellType.FORMULA: // 公式 cellValue = cell.getCellFormula();