From e4b16b33c30749e18c739242834bac8625454602 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 3 Aug 2021 18:30:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B2=A1=E6=9C=89=E7=BB=8F=E8=BF=87?=
 =?UTF-8?q?=E5=85=A8=E9=87=8F=E6=9B=B4=E6=96=B0=E4=B8=8D=E8=83=BD=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E5=A2=9E=E9=87=8F=E6=9B=B4=E6=96=B0=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/ExtractDataService.java       | 15 ++++++++++-----
 .../src/views/system/task/DatasetTaskList.vue     |  3 ++-
 2 files changed, 12 insertions(+), 6 deletions(-)

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 d49469e0e7..ccdfda18bd 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -297,6 +297,7 @@ public class ExtractDataService {
                     saveErrorLog(datasetTableId, taskId, e);
                     msg = false;
                     lastExecStatus = JobStatus.Error;
+                    execTime = null;
                 } finally {
                     try { deleteFile("all_scope", datasetTableId); }catch (Exception ignore){ System.out.println(ignore.getMessage());}
                     try { sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog, msg); }catch (Exception ignore){ System.out.println(ignore.getMessage());}
@@ -316,14 +317,17 @@ public class ExtractDataService {
                         return;
                     }
 
-                    if (datasetTable.getLastUpdateTime() == 0 || datasetTable.getLastUpdateTime() == null) {
-                        updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, null);
-                        return;
-                    }
-
                     if (datasetTableTask == null ) {
                         datasetTableTaskLog = writeDatasetTableTaskLog(datasetTableId, taskId);
                     }
+
+                    if (datasetTable.getLastUpdateTime() == null || datasetTable.getLastUpdateTime() == 0) {
+                        updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, null);
+                        saveErrorLog(datasetTableId, taskId, new Exception("未进行全量同步"));
+                        lastExecStatus = JobStatus.Error;
+                        return;
+                    }
+
                     execTime = System.currentTimeMillis();
                     if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd().replace(" ", ""))) {// 增量添加
                         String sql = datasetTableIncrementalConfig.getIncrementalAdd().replace(lastUpdateTime, datasetTable.getLastUpdateTime().toString())
@@ -348,6 +352,7 @@ public class ExtractDataService {
                     saveErrorLog(datasetTableId, taskId, e);
                     msg = false;
                     lastExecStatus = JobStatus.Error;
+                    execTime = null;
                 } finally {
                     try { deleteFile("incremental_add", datasetTableId); deleteFile("incremental_delete", datasetTableId); }catch (Exception ignore){}
                     try { sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog, msg); }catch (Exception ignore){}
diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index 53cd99bdf9..ef53ae2cca 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -417,7 +417,8 @@ export default {
     },
     changeTaskStatus(task) {
       let param = JSON.parse(JSON.stringify(task));
-      post('/dataset/task/updateStatus', task).then(response => {
+      param.status = task.status === 'Underway' ? 'Pending' : 'Underway'
+      post('/dataset/task/updateStatus', param).then(response => {
         if(response.success){
           task.status = param.status
           this.$message({