center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 导入excel失败

Browse Source
This commit is contained in:
taojinlong 2021-09-23 16:51:59 +08:00
parent c8dcd383ec
commit 7063e0b0b5
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
View File

@ -337,7 +337,7 @@ public class ExcelXlsxReader extends DefaultHandler {
formatString = style.getDataFormatString(); formatString = style.getDataFormatString();
short format = this.formatIndex; short format = this.formatIndex;
if (format == 14 || format == 31 || format == 57 ||format == 59|| if (format == 14 || format == 31 || format == 57 ||format == 59||
format == 58 || (176 <= format && format < 178) format == 58 || (176 < format && format < 178)
|| (182 <= format && format <= 196) || || (182 <= format && format <= 196) ||
(210 <= format && format <= 213) || (208 == format)) (210 <= format && format <= 213) || (208 == format))
{ // 日期 { // 日期
@ -440,10 +440,6 @@ public class ExcelXlsxReader extends DefaultHandler {
} }
} }
} }
if(curCol==1){
System.out.println(type);
System.out.println(nextDataType);
}
return thisStr; return thisStr;
} }

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

@ -594,12 +594,8 @@ public class DataSetTableService {
QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false, ds)); datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false, ds));
map.put("sql", datasourceRequest.getQuery()); map.put("sql", datasourceRequest.getQuery());
System.out.println(datasourceRequest.getQuery());
try { try {
data.addAll(jdbcProvider.getData(datasourceRequest)); data.addAll(jdbcProvider.getData(datasourceRequest));
for(int i=0;i< data.size(); i++){
System.out.println(data.get(i)[2]);
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
DEException.throwException(e.getMessage()); DEException.throwException(e.getMessage());