提交 9de3b8fc authored 作者: junjie's avatar junjie

feat(backend):excel上传解析容错修复

上级 6e60a265
...@@ -719,10 +719,14 @@ public class DataSetTableService { ...@@ -719,10 +719,14 @@ public class DataSetTableService {
} else { } else {
rows = sheet0.getPhysicalNumberOfRows(); rows = sheet0.getPhysicalNumberOfRows();
} }
int columnNum = 0;
for (int i = 0; i < rows; i++) { for (int i = 0; i < rows; i++) {
HSSFRow row = sheet0.getRow(i); HSSFRow row = sheet0.getRow(i);
String[] r = new String[row.getPhysicalNumberOfCells()]; if (i == 0) {
for (int j = 0; j < row.getPhysicalNumberOfCells(); j++) { columnNum = row.getPhysicalNumberOfCells();
}
String[] r = new String[columnNum];
for (int j = 0; j < columnNum; j++) {
if (i == 0) { if (i == 0) {
TableFiled tableFiled = new TableFiled(); TableFiled tableFiled = new TableFiled();
tableFiled.setFieldType("TEXT"); tableFiled.setFieldType("TEXT");
...@@ -759,10 +763,14 @@ public class DataSetTableService { ...@@ -759,10 +763,14 @@ public class DataSetTableService {
} else { } else {
rows = sheet0.getPhysicalNumberOfRows(); rows = sheet0.getPhysicalNumberOfRows();
} }
int columnNum = 0;
for (int i = 0; i < rows; i++) { for (int i = 0; i < rows; i++) {
XSSFRow row = sheet0.getRow(i); XSSFRow row = sheet0.getRow(i);
String[] r = new String[row.getPhysicalNumberOfCells()]; if (i == 0) {
for (int j = 0; j < row.getPhysicalNumberOfCells(); j++) { columnNum = row.getPhysicalNumberOfCells();
}
String[] r = new String[columnNum];
for (int j = 0; j < columnNum; j++) {
if (i == 0) { if (i == 0) {
TableFiled tableFiled = new TableFiled(); TableFiled tableFiled = new TableFiled();
tableFiled.setFieldType("TEXT"); tableFiled.setFieldType("TEXT");
...@@ -828,6 +836,9 @@ public class DataSetTableService { ...@@ -828,6 +836,9 @@ public class DataSetTableService {
} }
private String readCell(Cell cell, boolean cellType, TableFiled tableFiled) { private String readCell(Cell cell, boolean cellType, TableFiled tableFiled) {
if (cell == null) {
return "";
}
CellType cellTypeEnum = cell.getCellTypeEnum(); CellType cellTypeEnum = cell.getCellTypeEnum();
if (cellTypeEnum.equals(CellType.STRING)) { if (cellTypeEnum.equals(CellType.STRING)) {
if (cellType) { if (cellType) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论