wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

检查通知触发修复

Browse Source
This commit is contained in:
何美荣 2026-05-07 09:13:44 +08:00
parent cbc96f56e2
commit cf2191cc7a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
View File

@ -5428,8 +5428,8 @@ namespace APT.PP.WebApi.Controllers.Api
DateTime minTime = dt.AddMinutes(0); DateTime minTime = dt.AddMinutes(0);
DateTime maxTime = dt.AddMinutes(60); DateTime maxTime = dt.AddMinutes(60);
var shiftClassAll = this.GetEntities<T_FM_DEPARTMENT_SCHEDULING>(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 shiftClassAll = this.GetEntities<T_FM_DEPARTMENT_SCHEDULING>(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 shiftClassList = shiftClassAll.Where(s => s.START_TIME >= minTime && s.START_TIME <= maxTime && s.START_TIME != s.END_TIME).ToList();
var teamIds = shiftClassList.Select(t => t.TEAM_ID).Distinct().ToList(); var teamIds = shiftClassAll.Select(t => t.TEAM_ID).Distinct().ToList();
var teamInfos = this.GetEntities<T_FM_TEAM>(t =>t.ENABLE_STATUS == 0 , new BaseFilter(filter.OrgId)); var teamInfos = this.GetEntities<T_FM_TEAM>(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 teamDepartIds = teamInfos.Where(t=>teamIds.Contains(t.ID)).Select(m => m.DEPARTMENT_ID).Distinct().ToList();
var personIds = new List<Guid>(); var personIds = new List<Guid>();
@ -5603,10 +5603,10 @@ namespace APT.PP.WebApi.Controllers.Api
} }
else else
{ {
var startTime = scheTemp.START_TIME.AddHours(-1.5); if (scheTemp.START_TIME == scheTemp.END_TIME)//调休不触发
if (scheTemp.START_TIME.Date != scheTemp.END_TIME.Date || (scheTemp.START_TIME.Date == scheTemp.END_TIME.Date && scheTemp.START_TIME == scheTemp.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 == scheTemp.START_TIME.Date || t.CREATE_TIME.Value.Date == scheTemp.START_TIME.Date.AddDays(-1))); send = false;
item.CheckPost = "不触发";
} }
} }
} }