河南郸城调度计划 计算时间bug修复

src/main/java/com/shkpr/service/aimodelpower/bizmgr/WODispatchPlanTmDoBizFun.java

@@ -690,21 +690,21 @@ public class WODispatchPlanTmDoBizFun {
                         nextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusMonths(-1).withHour(localTime.getHour())
                                 .withMinute(localTime.getMinute())
                                 .withSecond(localTime.getSecond()));
-                        limitNextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusWeeks(-1).withHour(localTimeLimit.getHour())
+                        limitNextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusMonths(-1).withHour(localTimeLimit.getHour())
                                 .withMinute(localTimeLimit.getMinute())
                                 .withSecond(localTimeLimit.getSecond()));
                     } else if (model.getDispatchLeadTime() > 0) {
                         nextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusMonths(-1).withHour(localTime.getHour())
                                 .withMinute(localTime.getMinute())
                                 .withSecond(localTime.getSecond()).minusMinutes(-model.getDispatchLeadTime()));
-                        limitNextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusWeeks(-1).withHour(localTimeLimit.getHour())
+                        limitNextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusMonths(-1).withHour(localTimeLimit.getHour())
                                 .withMinute(localTimeLimit.getMinute())
                                 .withSecond(localTimeLimit.getSecond()));
                     } else if (model.getDispatchLeadTime() < 0) {
                         nextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusMonths(-1).withHour(localTime.getHour())
                                 .withMinute(localTime.getMinute())
                                 .withSecond(localTime.getSecond()).minusMinutes(Math.abs(model.getDispatchLeadTime())));
-                        limitNextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusWeeks(-1).withHour(localTimeLimit.getHour())
+                        limitNextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusMonths(-1).withHour(localTimeLimit.getHour())
                                 .withMinute(localTimeLimit.getMinute())
                                 .withSecond(localTimeLimit.getSecond()));
                     }
@@ -761,21 +761,21 @@ public class WODispatchPlanTmDoBizFun {
                         nextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusYears(-1).withHour(localTime.getHour())
                                 .withMinute(localTime.getMinute())
                                 .withSecond(localTime.getSecond()));
-                        limitNextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusWeeks(-1).withHour(localTimeLimit.getHour())
+                        limitNextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusYears(-1).withHour(localTimeLimit.getHour())
                                 .withMinute(localTimeLimit.getMinute())
                                 .withSecond(localTimeLimit.getSecond()));
                     } else if (model.getDispatchLeadTime() > 0) {
                         nextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusYears(-1).withHour(localTime.getHour())
                                 .withMinute(localTime.getMinute())
                                 .withSecond(localTime.getSecond()).minusMinutes(-model.getDispatchLeadTime()));
-                        limitNextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusWeeks(-1).withHour(localTimeLimit.getHour())
+                        limitNextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusYears(-1).withHour(localTimeLimit.getHour())
                                 .withMinute(localTimeLimit.getMinute())
                                 .withSecond(localTimeLimit.getSecond()));
                     } else if (model.getDispatchLeadTime() < 0) {
                         nextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusYears(-1).withHour(localTime.getHour())
                                 .withMinute(localTime.getMinute())
-                                .withSecond(localTime.getSecond()));
-                        limitNextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusWeeks(-1).withHour(localTimeLimit.getHour())
+                                .withSecond(localTime.getSecond()).minusMinutes(-model.getDispatchLeadTime()));
+                        limitNextTakeTime = reloadLocalDateTimeToLong(nextDateTime.minusYears(-1).withHour(localTimeLimit.getHour())
                                 .withMinute(localTimeLimit.getMinute())
                                 .withSecond(localTimeLimit.getSecond()));
                     }