From 60f4f11d5040b6a6ddea55fa21213c448f65dc80 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 9 Jul 2021 17:28:28 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8A=BD=E5=8F=96=E6=95=B0=E6=8D=AE):=20?= =?UTF-8?q?=E5=A4=84=E7=90=86kettle=20tinyint=20=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/provider/mysql/MysqlQueryProvider.java | 6 +++++- .../dataease/service/dataset/DataSetTableService.java | 2 ++ .../dataease/service/dataset/ExtractDataService.java | 10 +++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java index d7a6155664..feb7612cd6 100644 --- a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java @@ -376,7 +376,11 @@ public class MysqlQueryProvider extends QueryProvider { public String createRawQuerySQL(String table, List fields) { String[] array = fields.stream().map(f -> { StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append("`").append(f.getOriginName()).append("` AS ").append(f.getDataeaseName()); + if(f.getDeExtractType() == 4){ // 处理 tinyint + stringBuilder.append("concat(`").append(f.getOriginName()).append("`,'') AS ").append(f.getDataeaseName()); + }else { + stringBuilder.append("`").append(f.getOriginName()).append("` AS ").append(f.getDataeaseName()); + } return stringBuilder.toString(); }).toArray(String[]::new); return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), table); 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 9146ccc54d..afdb254598 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -112,6 +112,8 @@ public class DataSetTableService { datasetTableTask.setType("all_scope"); datasetTableTask.setName(datasetTable.getName() + " 更新设置"); datasetTableTask.setEnd("0"); + datasetTableTask.setStatus(TaskStatus.Underway.name()); + datasetTableTask.setStartTime(System.currentTimeMillis()); dataSetTaskRequest.setDatasetTableTask(datasetTableTask); dataSetTableTaskService.save(dataSetTaskRequest); } diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 6df0a0c908..c39911ff4f 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -894,11 +894,11 @@ public class ExtractDataService { private StepMeta udjc(List datasetTableFields, boolean isExcel) { String needToChangeColumnType = ""; - for (DatasetTableField datasetTableField : datasetTableFields) { - if (datasetTableField.getDeExtractType() != null && datasetTableField.getDeExtractType() == 4) { - needToChangeColumnType = needToChangeColumnType + alterColumnTypeCode.replace("FILED", datasetTableField.getDataeaseName()); - } - } +// for (DatasetTableField datasetTableField : datasetTableFields) { +// if (datasetTableField.getDeExtractType() != null && datasetTableField.getDeExtractType() == 4) { +// needToChangeColumnType = needToChangeColumnType + alterColumnTypeCode.replace("FILED", datasetTableField.getDataeaseName()); +// } +// } UserDefinedJavaClassMeta userDefinedJavaClassMeta = new UserDefinedJavaClassMeta(); List fields = new ArrayList<>();