dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(数据集): 补全Excel 数据

Browse Source
This commit is contained in:
taojinlong 2024-01-31 12:13:18 +08:00
parent 19fb459d65
commit 822cf16139
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java
View File

@ -331,6 +331,11 @@ public class ExcelXlsReader implements HSSFListener {
if (flag && curRow != 0) { //该行不为空行且该行不是第一行，发送（第一行为列名，不需要）
if (!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)) {
if(cellList.size() < fields.size()){
for (int i = 0; i < fields.size() - cellList.size(); i++) {
cellList.add("");
}
}
ExcelSheetData excelSheetData = new ExcelSheetData();
excelSheetData.setData(new ArrayList<>(data));
excelSheetData.setExcelLabel(sheetName);

2
core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlDDLProvider.java
View File

@ -78,7 +78,7 @@ public class MysqlDDLProvider extends DDLProviderImpl {
}
private String createDorisTableColumnSql(final List<DatasetTableField> datasetTableFields) {
StringBuilder Column_Fields = new StringBuilder("`");
StringBuilder Column_Fields = new StringBuilder("dataease_uuid varchar(50), `");
for (DatasetTableField datasetTableField : datasetTableFields) {
Column_Fields.append(datasetTableField.getDataeaseName()).append("` ");
Integer size = datasetTableField.getSize() * 4;