From 7063e0b0b55bb547303badaeef8054874541460c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 23 Sep 2021 16:51:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=BC=E5=85=A5excel=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/commons/utils/ExcelXlsxReader.java | 6 +----- .../io/dataease/service/dataset/DataSetTableService.java | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java index 63f8950914..b77f582877 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java @@ -337,7 +337,7 @@ public class ExcelXlsxReader extends DefaultHandler { formatString = style.getDataFormatString(); short format = this.formatIndex; 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) || (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; } diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 62ab5a1707..e4050f543b 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -594,12 +594,8 @@ public class DataSetTableService { QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false, ds)); map.put("sql", datasourceRequest.getQuery()); - System.out.println(datasourceRequest.getQuery()); try { data.addAll(jdbcProvider.getData(datasourceRequest)); - for(int i=0;i< data.size(); i++){ - System.out.println(data.get(i)[2]); - } } catch (Exception e) { e.printStackTrace(); DEException.throwException(e.getMessage());