WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug51151,51153

Browse Source
This commit is contained in:
liyawei
2022-04-29 17:24:49 +08:00
parent 772273db08
commit 570a697a7e
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+13 -3
View File
@@ -83,6 +83,7 @@ import java.io.*;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.nio.file.StandardOpenOption; import java.nio.file.StandardOpenOption;
import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; 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+"_id", itemsMap.get(dbFieldName).toString());
itemsMap.put(dbFieldName, StringUtils.join(names,",")); 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; 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(); Date d = cell.getDateCellValue();
// 进行格式转换 // 进行格式转换
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
cellValue = formatter.format(d); 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 { } else {
//设置单元格类型 //设置单元格类型
cell.setCellType(CellType.STRING); cell.setCellType(CellType.STRING);