1.拆分的结束时间将毫秒置0；2.安全检查任务的ymddate使用整个周期的开始时间

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/TaskCreatingServiceImplBase.java

@@ -346,7 +346,10 @@ public abstract class TaskCreatingServiceImplBase<M extends BaseMapper<T>, T> ex
         Map<Short, StartEndTime> r = new HashMap<>();
         for (short i = 1; i <= frequency; i++) {
             if (dateField == DateField.DAY_OF_YEAR) {
-                segStart.setField(DateField.HOUR, 0).setField(DateField.MINUTE, 0).setField(DateField.SECOND, 0);
+                segStart.setField(DateField.HOUR, 0)
+                        .setField(DateField.MINUTE, 0)
+                        .setField(DateField.SECOND, 0)
+                        .setField(DateField.MILLISECOND, 0);
             }
             DateTime nextStart = DateUtil.offset(segStart, dateField, (int) (seg));
             StartEndTime et = new StartEndTime();
@@ -355,7 +358,7 @@ public abstract class TaskCreatingServiceImplBase<M extends BaseMapper<T>, T> ex
             if (i == frequency) {
                 segEnd = new DateTime(end);
             } else {
-                segEnd=nextStart;
+                segEnd = nextStart;
 
                 if (dateField == DateField.DAY_OF_YEAR) {
                     segEnd = DateUtil.offset(nextStart, DateField.SECOND, -1);
@@ -365,7 +368,7 @@ public abstract class TaskCreatingServiceImplBase<M extends BaseMapper<T>, T> ex
                     segEnd = new DateTime(end);
                 }
             }
-
+            segEnd.setField(DateField.MILLISECOND, 0);
             et.setEndTime(segEnd);
             segStart = nextStart;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -468,8 +468,8 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
 
         List<CoreSafetyTask> ats = new ArrayList<>();
         Map<Long, Long> hashMap = new HashMap<>();
+        DateHelper dateHelper = new DateHelper(start);
         for (PlanTaskBuildVo taskPlan : tasks) {
-            DateHelper dateHelper = new DateHelper(taskPlan.getStartTime());
             CoreSafetyTask checkTask = new CoreSafetyTask();
             checkTask.setTitle(taskPlan.getPlanName());
             checkTask.setExceptionCount(0L);
@@ -482,7 +482,7 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
             checkTask.setCount(taskPlan.getCount());
             checkTask.setCheckType(0L);
             checkTask.setCheckCycle(Long.valueOf(taskPlan.getPlanCycle()));
-            checkTask.setYmdDate(taskPlan.getStartTime());
+            checkTask.setYmdDate(start);
             checkTask.setYmdDay((long) dateHelper.getDay());
             checkTask.setYmdMonth((long) dateHelper.getMonth());
             checkTask.setYmdQuarter((long) dateHelper.getQuarter());