修改预警bug

src/main/java/com/unissoft/job/ToBeDoneJob.java

@@ -143,21 +143,21 @@ public class ToBeDoneJob implements Job, Serializable {
 
         Date startDate = null;
         if(timeType.equals(GrainConstant.STR_MINUTE)) {
-            startDate = DateUtil.getNextMinute();
+            startDate = DateUtil.getCurrMinute();
         } else if(timeType.equals(GrainConstant.STR_HOUR)) {
-            startDate = DateUtil.getNextHour();
+            startDate = DateUtil.getCurrHour();
         } else if(timeType.equals(GrainConstant.STR_DAY)) {
-            startDate = DateUtil.getNextDate();
+            startDate = DateUtil.getCurrDate();
         } else if(timeType.equals(GrainConstant.STR_WEEKDAY)) {
-            startDate = DateUtil.getNextWeekday();
+            startDate = DateUtil.getCurrDate();
         } else if(timeType.equals(GrainConstant.STR_WEEK)) {
-            startDate = DateUtil.getFirstDateOfNextWeek();
+            startDate = DateUtil.getFirstDateOfCurrWeek();
         } else if(timeType.equals(GrainConstant.STR_MONTH)) {
-            startDate = DateUtil.getFirstDateOfNextMonth();
+            startDate = DateUtil.getFirstDateOfCurrMonth();
         } else if(timeType.equals(GrainConstant.STR_SEASON)) {
-            startDate = DateUtil.getFirstDateOfNextSeason();
+            startDate = DateUtil.getFirstDateOfCurrSeason();
         } else if(timeType.equals(GrainConstant.STR_YEAR)) {
-            startDate = DateUtil.getFirstDateOfNextYear();
+            startDate = DateUtil.getFirstDateOfCurrYear();
         }
 
         return startDate;

src/main/java/com/unissoft/service/impl/SysEarlyWarningServiceImpl.java

@@ -402,19 +402,21 @@ public class SysEarlyWarningServiceImpl extends ServiceImpl<SysEarlyWarningMappe
     private static Date getStartAtDate4ToBeDone(String periodType) {
         Date startAt = null;
         if(periodType.equals(GrainConstant.STR_MINUTE)) {
-            startAt = DateUtil.getCurrMinute();
+            startAt = DateUtil.getNextMinute();
         } else if(periodType.equals(GrainConstant.STR_HOUR)) {
-            startAt = DateUtil.getCurrHour();
-        } else if(periodType.equals(GrainConstant.STR_DAY) || periodType.equals(GrainConstant.STR_WEEKDAY)) {
-            startAt = DateUtil.getCurrDate();
+            startAt = DateUtil.getNextHour();
+        } else if(periodType.equals(GrainConstant.STR_DAY)) {
+            startAt = DateUtil.getNextDate();
+        } else if(periodType.equals(GrainConstant.STR_WEEKDAY)) {
+            startAt = DateUtil.getNextWeekday();
         } else if(periodType.equals(GrainConstant.STR_WEEK)) {
-            startAt = DateUtil.getFirstDateOfCurrWeek();
+            startAt = DateUtil.getFirstDateOfNextWeek();
         } else if(periodType.equals(GrainConstant.STR_MONTH)) {
-            startAt = DateUtil.getFirstDateOfCurrMonth();
+            startAt = DateUtil.getFirstDateOfNextMonth();
         } else if(periodType.equals(GrainConstant.STR_SEASON)) {
-            startAt = DateUtil.getFirstDateOfCurrSeason();
+            startAt = DateUtil.getFirstDateOfNextSeason();
         } else if(periodType.equals(GrainConstant.STR_YEAR)) {
-            startAt = DateUtil.getFirstDateOfCurrYear();
+            startAt = DateUtil.getFirstDateOfNextYear();
         }
 
         return startAt;