|
@@ -532,8 +532,7 @@ public class WODispatchPlanTmDoBizFun {
|
|
|
.collect(Collectors.toList()).get(0).getHandleStartTimeLimit()));
|
|
|
LocalDateTime dateTime1 = endTime.atZone(ZoneId.systemDefault()).toLocalDateTime();
|
|
|
LocalDateTime dateTimeNow = Instant.now().atZone(ZoneId.systemDefault()).toLocalDateTime();
|
|
|
- if(Instant.now().isBefore(nowTime)||Instant.now().equals(nowTime)
|
|
|
- ||Instant.now().isBefore(endTime)||Instant.now().equals(endTime)){
|
|
|
+ if(Instant.now().isBefore(nowTime)||Instant.now().equals(nowTime)){
|
|
|
isToDay = true;
|
|
|
if(model.getDispatchLeadTime()==0) {
|
|
|
nextTakeTime = nowTime.toEpochMilli();
|
|
@@ -596,7 +595,7 @@ public class WODispatchPlanTmDoBizFun {
|
|
|
){
|
|
|
//TODO 连续时需考虑
|
|
|
//TODO 如果传递了对比值, 则说明当前计算的时间与old不符合条件,则再加一算一次
|
|
|
- nextTakeTime = localNext.minusDays(-1).minusMinutes(-model.getDispatchLeadTime())
|
|
|
+ nextTakeTime = oldTm.minusDays(-1).minusMinutes(-model.getDispatchLeadTime())
|
|
|
.atZone(ZoneId.systemDefault())
|
|
|
.toInstant()
|
|
|
.toEpochMilli();
|