'commit'

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -503,13 +503,19 @@ public class CollectModel {
                         }
                         writeRecord.set(colName, value);
                     } else {
-                        if (colType.equals("Integer"))
+                        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"))
+                        } else if (colType.equals("String")) {
-                            writeRecord.set(colName, PoiUtil.getValue(cell).toString());
+                            if (StrKit.isBlank(PoiUtil.getValue(cell))) writeRecord.set(colName, null);
-                        else if (colType.equals("Double"))
+                            else writeRecord.set(colName, PoiUtil.getValue(cell).toString());
-                            writeRecord.set(colName, Double.parseDouble(PoiUtil.getValue(cell).toString()));
+                        } else if (colType.equals("Double")) {
-                        else if (colType.equals("Date")) {
+                            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);
@@ -517,6 +523,7 @@ public class CollectModel {
                             }
                         }
                     }
+                }
                 writeList.add(writeRecord);
             }
         }

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();