From 131eb3e3538c7796ca345dfd2d88e7c878fcf3d9 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Mon, 12 Jul 2021 18:57:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=B5=AE=E7=82=B9=E8=BD=AC=E6=95=B4=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/provider/doris/DorisQueryProvider.java  |  3 +++
 .../dataease/provider/mysql/MysqlQueryProvider.java  |  2 ++
 .../provider/oracle/OracleQueryProvider.java         |  2 ++
 frontend/src/views/dataset/add/AddExcel.vue          | 12 ++++++------
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
index cf3335a766..6d93e4d8b3 100644
--- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
@@ -7,6 +7,7 @@ import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.QueryProvider;
 import io.dataease.provider.SQLConstants;
+import io.dataease.provider.mysql.MySQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -114,6 +115,8 @@ public class DorisQueryProvider extends QueryProvider {
                     if (f.getDeType() == 1) {
                         String cast = String.format(DorisConstants.CAST, originField, DorisConstants.DEFAULT_INT_FORMAT) + "/1000";
                         fieldName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
+                    } else if (f.getDeType() == 2) {
+                        fieldName = String.format(DorisConstants.CAST, originField, DorisConstants.DEFAULT_INT_FORMAT);
                     } else {
                         fieldName = originField;
                     }
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 fcf55c760f..7a3e858797 100644
--- a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
@@ -113,6 +113,8 @@ public class MysqlQueryProvider extends QueryProvider {
                     if (f.getDeType() == 1) {
                         String cast = String.format(MySQLConstants.CAST, originField, MySQLConstants.DEFAULT_INT_FORMAT) + "/1000";
                         fieldName = String.format(MySQLConstants.FROM_UNIXTIME, cast, MySQLConstants.DEFAULT_DATE_FORMAT);
+                    } else if (f.getDeType() == 2) {
+                        fieldName = String.format(MySQLConstants.CAST, originField, MySQLConstants.DEFAULT_INT_FORMAT);
                     } else {
                         fieldName = originField;
                     }
diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
index ccee4b8c3f..bea2950ef1 100644
--- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
@@ -125,6 +125,8 @@ public class OracleQueryProvider extends QueryProvider {
                     if (f.getDeType() == 1) {
                         String cast = String.format(OracleConstants.CAST, originField, OracleConstants.DEFAULT_INT_FORMAT) + "/1000";
                         fieldName = String.format(OracleConstants.FROM_UNIXTIME, cast, OracleConstants.DEFAULT_DATE_FORMAT);
+                    } else if (f.getDeType() == 2) {
+                        fieldName = String.format(OracleConstants.CAST, originField, OracleConstants.DEFAULT_INT_FORMAT);
                     } else {
                         fieldName = originField;
                     }
diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
index b12d8bbe3f..a447221c59 100644
--- a/frontend/src/views/dataset/add/AddExcel.vue
+++ b/frontend/src/views/dataset/add/AddExcel.vue
@@ -81,7 +81,7 @@
 <script>
 import { post } from '@/api/dataset/dataset'
 import { getToken } from '@/utils/auth'
-import i18n from "@/lang";
+import i18n from '@/lang'
 
 const token = getToken()
 
@@ -106,7 +106,7 @@ export default {
       mode: '1',
       height: 600,
       fileList: [],
-      headers: { Authorization: token , 'Accept-Language': i18n.locale.replace('_', '-')},
+      headers: { Authorization: token, 'Accept-Language': i18n.locale.replace('_', '-') },
       baseUrl: process.env.VUE_APP_BASE_API,
       path: '',
       uploading: false
@@ -123,7 +123,7 @@ export default {
   },
   created() {
     if (!this.param.tableId) {
-      this.param.tableId = ""
+      this.param.tableId = ''
     }
   },
   methods: {
@@ -143,9 +143,9 @@ export default {
       this.uploading = true
     },
     uploadFail(response, file, fileList) {
-      let myError=response.toString();
-      myError=myError.replace("Error: ","")
-      const errorMessage = JSON.parse(myError).message + ", " + this.$t('dataset.parse_error');
+      let myError = response.toString()
+      myError = myError.replace('Error: ', '')
+      const errorMessage = JSON.parse(myError).message + ', ' + this.$t('dataset.parse_error')
 
       this.path = ''
       this.fields = []