diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 41095a8..125f8ba 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -5428,8 +5428,8 @@ namespace APT.PP.WebApi.Controllers.Api DateTime minTime = dt.AddMinutes(0); DateTime maxTime = dt.AddMinutes(60); var shiftClassAll = this.GetEntities(s => s.DATE_TIME.Date == dt.Date && s.Nav_Team.ENABLE_STATUS == 0 && s.TEAM_ID != null, new BaseFilter(filter.OrgId), "Nav_DepartmentSchedulingDetail.Nav_Person").ToList(); - var shiftClassList = shiftClassAll.Where(s => s.START_TIME >= minTime && s.START_TIME <= maxTime).ToList(); - var teamIds = shiftClassList.Select(t => t.TEAM_ID).Distinct().ToList(); + var shiftClassList = shiftClassAll.Where(s => s.START_TIME >= minTime && s.START_TIME <= maxTime && s.START_TIME != s.END_TIME).ToList(); + var teamIds = shiftClassAll.Select(t => t.TEAM_ID).Distinct().ToList(); var teamInfos = this.GetEntities(t =>t.ENABLE_STATUS == 0 , new BaseFilter(filter.OrgId)); var teamDepartIds = teamInfos.Where(t=>teamIds.Contains(t.ID)).Select(m => m.DEPARTMENT_ID).Distinct().ToList(); var personIds = new List(); @@ -5603,10 +5603,10 @@ namespace APT.PP.WebApi.Controllers.Api } else { - var startTime = scheTemp.START_TIME.AddHours(-1.5); - if (scheTemp.START_TIME.Date != scheTemp.END_TIME.Date || (scheTemp.START_TIME.Date == scheTemp.END_TIME.Date && scheTemp.START_TIME == scheTemp.START_TIME.Date))//跨天 + if (scheTemp.START_TIME == scheTemp.END_TIME)//调休不触发 { - 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 == scheTemp.START_TIME.Date || t.CREATE_TIME.Value.Date == scheTemp.START_TIME.Date.AddDays(-1))); + send = false; + item.CheckPost = "不触发"; } } }