From 3f6ac97d9dd8876262806301f0b7f31f8fe36d53 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 29 Jan 2024 17:36:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=8A=E4=BC=A0Excel=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../provider/query/mysql/MysqlQueryProvider.java     |  2 ++
 .../dataease/service/dataset/ExtractDataService.java | 12 ++++++++----
 core/frontend/src/views/dataset/add/AddApi.vue       |  1 +
 core/frontend/src/views/dataset/add/AddExcel.vue     |  1 +
 core/frontend/src/views/dataset/add/AddSQL.vue       |  1 +
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
index 6fa4e26026..50b3ffe3a8 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
@@ -70,6 +70,8 @@ public class MysqlQueryProvider extends QueryProvider {
             case "TIME":
             case "YEAR":
             case "DATETIME":
+            case "DATEV2":
+            case "DATETIMEV2":
             case "TIMESTAMP":
                 return 1;// 时间
             case "INT":
diff --git a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 78dff6de7a..09a8f23ebf 100644
--- a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -1158,14 +1158,13 @@ public class ExtractDataService {
         for (ExcelSheetData excelSheetData : excelSheetDataList) {
             StepMeta fromStep = null;
             String suffix = excelSheetData.getPath().substring(excelSheetDataList.get(0).getPath().lastIndexOf(".") + 1);
-
+            Integer fileInputFields = isSetKey ? datasetTableFields.size() : datasetTableFields.size() - 1;
             if (StringUtils.equalsIgnoreCase(suffix, "csv")) {
                 CsvInputMeta csvInputMeta = new CsvInputMeta();
                 csvInputMeta.setFilename(excelSheetData.getPath());
                 csvInputMeta.setHeaderPresent(true);
                 csvInputMeta.setBufferSize("10000");
                 csvInputMeta.setDelimiter(",");
-                Integer fileInputFields = isSetKey ? datasetTableFields.size() : datasetTableFields.size() - 1;
                 TextFileInputField[] fields = new TextFileInputField[fileInputFields];
 
                 for (int i = 0; i < datasetTableFields.size(); i++) {
@@ -1209,8 +1208,11 @@ public class ExtractDataService {
                 excelInputMeta.setFileRequired(filesRequired.toArray(new String[filesRequired.size()]));
                 excelInputMeta.setStartsWithHeader(true);
                 excelInputMeta.setIgnoreEmptyRows(true);
-                ExcelInputField[] fields = new ExcelInputField[datasetTableFields.size()];
+                ExcelInputField[] fields = new ExcelInputField[fileInputFields];
                 for (int i = 0; i < datasetTableFields.size(); i++) {
+                    if(datasetTableFields.get(i).getDataeaseName().equalsIgnoreCase("dataease_uuid")){
+                        continue;
+                    }
                     ExcelInputField field = new ExcelInputField();
                     field.setName(datasetTableFields.get(i).getDataeaseName());
                     if (datasetTableFields.get(i).getDeExtractType() == 1) {
@@ -1295,11 +1297,13 @@ public class ExtractDataService {
         String excelCompletion = "";
 
         for (DatasetTableField datasetTableField : datasetTableFields) {
+            if(isSetKey && datasetTableField.getDataeaseName().equals("dataease_uuid")){
+                continue;
+            }
             if (datasetTableField.getDeExtractType().equals(DeTypeConstants.DE_BINARY) || datasetTableField.getType().equalsIgnoreCase("blob")) {
                 handleBinaryTypeCode.append("\n").append(handleBinaryType.replace("FIELD", datasetTableField.getDataeaseName()));
             }
         }
-
         UserDefinedJavaClassMeta userDefinedJavaClassMeta = new UserDefinedJavaClassMeta();
         List<UserDefinedJavaClassMeta.FieldInfo> fields = new ArrayList<>();
         if (!isSetKey) {
diff --git a/core/frontend/src/views/dataset/add/AddApi.vue b/core/frontend/src/views/dataset/add/AddApi.vue
index 75ca84e062..02086d80de 100644
--- a/core/frontend/src/views/dataset/add/AddApi.vue
+++ b/core/frontend/src/views/dataset/add/AddApi.vue
@@ -163,6 +163,7 @@
 
           <el-select
               size="small"
+              style="margin-left: 12px;width: 315px"
               v-model="activeTable.keys"
               v-if="engineMode !== 'simple'"
               multiple
diff --git a/core/frontend/src/views/dataset/add/AddExcel.vue b/core/frontend/src/views/dataset/add/AddExcel.vue
index bebe0ad3b4..259190b5dc 100644
--- a/core/frontend/src/views/dataset/add/AddExcel.vue
+++ b/core/frontend/src/views/dataset/add/AddExcel.vue
@@ -141,6 +141,7 @@
           <el-checkbox  v-model="sheetObj.setKey">{{ $t('dataset.set_key') }}</el-checkbox>
           <el-select
               size="small"
+              style="margin-left: 12px;width: 315px"
               v-model="sheetObj.keys"
               v-if="mode === '1'"
               multiple
diff --git a/core/frontend/src/views/dataset/add/AddSQL.vue b/core/frontend/src/views/dataset/add/AddSQL.vue
index ff3029e0d5..6c91d75b69 100644
--- a/core/frontend/src/views/dataset/add/AddSQL.vue
+++ b/core/frontend/src/views/dataset/add/AddSQL.vue
@@ -65,6 +65,7 @@
 
           <el-select
               size="small"
+              style="margin-left: 12px;width: 315px"
               v-model="param.keys"
               v-if="mode === '1' && engineMode !== 'simple'"
               multiple