From 570a697a7efdb64472fb4b60d63dc0e72165000c Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 29 Apr 2022 17:24:49 +0800
Subject: [PATCH] bug51151,51153

---
 .../impl/FileSplitItemsEOServiceImpl.java        | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index a36600081..8d1642928 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -83,6 +83,7 @@ import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -917,6 +918,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString());
                         itemsMap.put(dbFieldName, StringUtils.join(names,","));
 
+                    } else { // TODO 可能是只有机构id, 也可能是错误数据
+                        itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString());
+                        itemsMap.put(dbFieldName, null);
                     }
                 }
             }
@@ -1731,12 +1735,18 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     }
                     String cellValue = null;
 
-                    if (cell.getCellTypeEnum().equals("NUMERIC") && HSSFDateUtil.isCellDateFormatted(cell)) {
+                    if (HSSFCell.CELL_TYPE_NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell)) {
                         // 获取日期类型的单元格的值
                         Date d = cell.getDateCellValue();
                         // 进行格式转换
-                        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-                        cellValue = formatter.format(d);
+                        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+                        cellValue = df.format(d);
+                        map.put(dbfieldList.get(y), cellValue);
+                        if (map.get(dbfieldList.get(y)) == null || "".equals(map.get(dbfieldList.get(y)))) {
+                            a++;
+                        }
+                        continue;
+
                     } else {
                         //设置单元格类型
                         cell.setCellType(CellType.STRING);