diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java index dc74123e..81d1e793 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java @@ -233,11 +233,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl { - if((yesterday.equals(item.getReceiveTime()) || twodaysAgo.equals(item.getReceiveTime())) && !"5".equals(item.getPlanStatus())){ + if((yesterday.equals(item.getReceiveTime()) || twodaysAgo.equals(item.getReceiveTime())) && !"5".equals(item.getPlanStatus()) && !"3".equals(item.getPlanStatus())){ item.setRemindStatus("1"); } try { - if(DateUtils.parseDate(threeDaysAgo,"yyyy-MM-dd").compareTo(DateUtils.parseDate(item.getReceiveTime(),"yyyy-MM-dd")) > 0 && !"5".equals(item.getPlanStatus())){ + if(DateUtils.parseDate(threeDaysAgo,"yyyy-MM-dd").compareTo(DateUtils.parseDate(item.getReceiveTime(),"yyyy-MM-dd")) > 0 && !"5".equals(item.getPlanStatus()) && !"3".equals(item.getPlanStatus())){ item.setRemindStatus("2"); } } catch (ParseException e) {