Merge pull request #200 from…

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<DatasetTableField> fields) {
         String[] array = fields.stream().map(f -> {
             StringBuilder stringBuilder = new StringBuilder();
+            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);

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);
         }

backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java

@@ -894,11 +894,11 @@ public class ExtractDataService {
 
     private StepMeta udjc(List<DatasetTableField> 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<UserDefinedJavaClassMeta.FieldInfo> fields = new ArrayList<>();