Merge remote-tracking branch 'origin/dev' into dev

backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java

 package io.dataease.base.mapper.ext;
 
-import io.dataease.base.domain.DatasetTableTaskLog;
 import io.dataease.base.mapper.ext.query.GridExample;
 import io.dataease.dto.dataset.DataSetTaskDTO;
 import io.dataease.dto.dataset.DataSetTaskLogDTO;

backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java

@@ -7,7 +7,6 @@ import io.dataease.commons.utils.PageUtils;
 import io.dataease.commons.utils.Pager;
 import io.dataease.controller.request.dataset.DataSetTaskRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
-import io.dataease.controller.sys.response.SysUserGridResponse;
 import io.dataease.dto.dataset.DataSetTaskDTO;
 import io.dataease.service.dataset.DataSetTableTaskLogService;
 import io.dataease.service.dataset.DataSetTableTaskService;

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

@@ -6,7 +6,6 @@ import io.dataease.base.mapper.DatasetTableMapper;
 import io.dataease.base.mapper.DatasetTableTaskMapper;
 import io.dataease.base.mapper.DatasourceMapper;
 import io.dataease.base.mapper.ext.ExtChartViewMapper;
-import io.dataease.base.mapper.ext.UtilMapper;
 import io.dataease.commons.constants.*;
 import io.dataease.commons.model.AuthURD;
 import io.dataease.commons.utils.*;
@@ -90,8 +89,6 @@ public class ExtractDataService {
     private DatasourceService datasourceService;
     @Resource
     private ExtChartViewMapper extChartViewMapper;
-    @Resource
-    private UtilMapper utilMapper;
 
     private static String lastUpdateTime = "${__last_update_time__}";
     private static String currentUpdateTime = "${__current_update_time__}";
@@ -872,13 +869,18 @@ public class ExtractDataService {
         textFileOutputMeta.setExtension(extention);
 
         if (datasource.getType().equalsIgnoreCase(DatasourceTypes.oracle.name())) {
-            TextFileField[] outputFields = new TextFileField[datasetTableFields.size()];
+            TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1];
             for(int i=0;i< datasetTableFields.size();i++){
                 TextFileField textFileField = new TextFileField();
                 textFileField.setName(datasetTableFields.get(i).getOriginName());
                 textFileField.setType("String");
                 outputFields[i] = textFileField;
             }
+            TextFileField textFileField = new TextFileField();
+            textFileField.setName("dataease_uuid");
+            textFileField.setType("String");
+            outputFields[datasetTableFields.size()] = textFileField;
+
             textFileOutputMeta.setOutputFields(outputFields);
         }else {
             textFileOutputMeta.setOutputFields(new TextFileField[0]);