From 2e3152d0de5846469f23304a23135400f1008d26 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 31 Aug 2021 18:01:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=A1=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/service/dataset/DataSetTableTaskService.java | 5 +++++
 backend/src/main/resources/i18n/messages_en_US.properties    | 3 ++-
 backend/src/main/resources/i18n/messages_zh_CN.properties    | 1 +
 backend/src/main/resources/i18n/messages_zh_TW.properties    | 3 ++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
index 5cffd5e742..96f44d4c22 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
@@ -191,6 +191,11 @@ public class DataSetTableTaskService {
             if(dataSetTaskDTOS.get(0).getNextExecTime() == null || dataSetTaskDTOS.get(0).getNextExecTime() <= 0){
                 datasetTableTask.setStatus(TaskStatus.Stopped.name());
                 update(datasetTableTask);
+                return;
+            }
+            if(dataSetTaskDTOS.get(0).getNextExecTime() > datasetTableTask.getEndTime()){
+                datasetTableTask.setStatus(TaskStatus.Stopped.name());
+                update(datasetTableTask);
             }
         }
     }
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index c1735c6cb2..9ad714f65d 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -280,4 +280,5 @@ i18n_datasource_connect_error=Data source connection exception:
 i18n_check_sql_error=Check incremental SQL exception,
 i18n_change_task_status_error=Suspension is not allowed. The task status is：
 i18n_Stopped=END
-i18n_Exec=Running
\ No newline at end of file
+i18n_Exec=Running
+i18n_no_trigger=The current setting does not trigger task generation.
\ No newline at end of file
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index 9ccd5e60bf..ac52f22368 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -280,4 +280,5 @@ i18n_check_sql_error=校验增量 SQL 异常,
 i18n_change_task_status_error=不允许暂停，任务状态为：
 i18n_Stopped=执行结束
 i18n_Exec=运行中
+i18n_no_trigger=当前设置没有触发任务生成
 
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 9e79137c74..de243c1861 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -282,4 +282,5 @@ i18n_datasource_connect_error=數據源連接異常:
 i18n_check_sql_error=校驗增量SQL異常,
 i18n_change_task_status_error=不允許暫停，任務狀態為：
 i18n_Stopped=執行結束
-i18n_Exec=運行中
\ No newline at end of file
+i18n_Exec=運行中
+i18n_no_trigger=当前设置没有触发任务生成 當前設置沒有觸發任務生成.
\ No newline at end of file