diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 125f8ba..da2b3a7 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -5588,26 +5588,41 @@ namespace APT.PP.WebApi.Controllers.Api if (sche != null) { var startTime = sche.START_TIME.AddHours(-1.5); - if (sche.START_TIME.Date != sche.END_TIME.Date || (sche.START_TIME.Date == sche.END_TIME.Date && sche.START_TIME == sche.START_TIME.Date))//跨天 + if (sche.START_TIME.Date != sche.END_TIME.Date)//跨天 { exist = noticeExsiss.FirstOrDefault(t => t.APPLY_DEPARTMENT_ID == userInfo.DEPARTMENT_ID && t.DEPARTMENT_TYPE == item.DepartType && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle && t.CREATE_TIME >= startTime && (t.CREATE_TIME.Value.Date == sche.START_TIME.Date || t.CREATE_TIME.Value.Date == sche.START_TIME.Date.AddDays(-1))); } + if (sche.START_TIME == sche.END_TIME)//调休 + { + send = false; + item.CheckPost = "不触发"; + } } else { //查今天所有的排班班组,当前班组是否在里面,在里面说明有排班,有排班时间未到,则不触发 - var scheTemp = shiftClassAll.FirstOrDefault(t => t.TEAM_ID == teamFirst?.ID); + var scheTemp = shiftClassAll.FirstOrDefault(t => t.TEAM_ID == teamFirst?.ID);//未排班在8点触发 if (scheTemp == null) { send = false; } else { + //有排班 if (scheTemp.START_TIME == scheTemp.END_TIME)//调休不触发 { send = false; item.CheckPost = "不触发"; } + else if (scheTemp.START_TIME >= minTime && scheTemp.START_TIME <= maxTime)//在排班时间内才触发 + { + send = true; + } + else + { + send = false; + item.CheckPost = "不触发"; + } } } }