Merge branch 'main' of github.com:dataease/dataease into main

backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java

@@ -73,13 +73,18 @@ public class ScheduleManager {
 
             triggerBuilder.withIdentity(triggerKey);
 
+            Date nTimeByCron = getNTimeByCron(cron);
             if (startTime.before(new Date())) {
-                triggerBuilder.startAt(getNTimeByCron(cron));
+                triggerBuilder.startAt(nTimeByCron);
             }
 
             if (endTime != null) {
+                if (endTime.before(nTimeByCron)) {
+                    triggerBuilder.endAt(nTimeByCron);
+                } else {
                     triggerBuilder.endAt(endTime);
                 }
+            }
 
             triggerBuilder.withSchedule(CronScheduleBuilder.cronSchedule(cron));
 
@@ -151,13 +156,18 @@ public class ScheduleManager {
 
             triggerBuilder.withIdentity(triggerKey);// 触发器名,触发器组
 
+            Date nTimeByCron = getNTimeByCron(cron);
             if (startTime.before(new Date())) {
-                triggerBuilder.startAt(getNTimeByCron(cron));
+                triggerBuilder.startAt(nTimeByCron);
             }
 
             if (endTime != null) {
+                if (endTime.before(nTimeByCron)) {
+                    triggerBuilder.endAt(nTimeByCron);
+                } else {
                     triggerBuilder.endAt(endTime);
                 }
+            }
 
             triggerBuilder.withSchedule(CronScheduleBuilder.cronSchedule(cron));// 触发器时间设定
 

frontend/src/views/dataset/add/AddCustom.vue

@@ -281,7 +281,7 @@ export default {
   }
 
   .span-number{
-    color: #f18126;
+    color: #0a7be0;
   }
   .table-count{
     color: #606266;

frontend/src/views/dataset/add/AddSQL.vue

@@ -335,7 +335,7 @@ export default {
     font-size: 14px;
   }
   .span-number{
-    color: #f18126;
+    color: #0a7be0;
   }
   .table-count{
     color: #606266;