public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-20 11:38:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: excel 数据集

Browse Source
This commit is contained in:
taojinlong
2021-05-18 17:28:12 +08:00
parent 9124a9213d
commit 41deddbbfa
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@@ -661,13 +661,15 @@ public class DataSetTableService {
for (int j = 0; j < row.getPhysicalNumberOfCells(); j++) {
if (i == 0) {
TableFiled tableFiled = new TableFiled();
tableFiled.setFieldName(readCell(row.getCell(j)));
tableFiled.setRemarks(readCell(row.getCell(j)));
tableFiled.setFieldType("TEXT");
tableFiled.setFieldSize(1024);
if(StringUtils.isEmpty(tableFiled.getFieldName())){
continue;
String columnName = readCell(row.getCell(j));
if(StringUtils.isEmpty(columnName)){
columnName = "NONE_" + String.valueOf(j);
}
tableFiled.setFieldName(columnName);
tableFiled.setRemarks(columnName);
fields.add(tableFiled);
} else {
r[j] = readCell(row.getCell(j));
@@ -695,13 +697,14 @@ public class DataSetTableService {
for (int j = 0; j < row.getPhysicalNumberOfCells(); j++) {
if (i == 0) {
TableFiled tableFiled = new TableFiled();
tableFiled.setFieldName(readCell(row.getCell(j)));
tableFiled.setRemarks(readCell(row.getCell(j)));
tableFiled.setFieldType("TEXT");
tableFiled.setFieldSize(1024);
if(StringUtils.isEmpty(tableFiled.getFieldName())){
continue;
String columnName = readCell(row.getCell(j));
if(StringUtils.isEmpty(columnName)){
columnName = "NONE_" + String.valueOf(j);
}
tableFiled.setFieldName(columnName);
tableFiled.setRemarks(columnName);
fields.add(tableFiled);
} else {
r[j] = readCell(row.getCell(j));