Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe
This commit is contained in:
commit
f36cc40f71
@ -5583,7 +5583,7 @@ 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)//跨天
|
||||
if (sche.START_TIME.Date != sche.END_TIME.Date || (sche.START_TIME.Date == sche.END_TIME.Date && sche.START_TIME == sche.START_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)));
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user