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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
wyw 2026-04-22 11:07:33 +08:00
commit d20870f47f
1 changed files with 8 additions and 2 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

@ -5422,7 +5422,8 @@ namespace APT.PP.WebApi.Controllers.Api
DateTime minTime = dt.AddMinutes(0);
DateTime maxTime = dt.AddMinutes(60);
var shiftClassList = this.GetEntities<T_FM_DEPARTMENT_SCHEDULING>(s => s.START_TIME >= minTime && s.START_TIME <= maxTime && s.START_TIME != s.END_TIME && 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.START_TIME != s.END_TIME && 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 teamInfos = this.GetEntities<T_FM_TEAM>(t => teamIds.Contains(t.ID), new BaseFilter(filter.OrgId));
var teamDepartIds = teamInfos.Select(m => m.DEPARTMENT_ID).Distinct().ToList();
@ -5589,7 +5590,12 @@ namespace APT.PP.WebApi.Controllers.Api
}
else
{
send = false;
//查今天所有的排班班组，当前班组是否在里面，在里面说明有排班，有排班时间未到，则不触发
var scheTemp = shiftClassAll.FirstOrDefault(t => t.TEAM_ID == teamFirst?.ID);
if (scheTemp == null)
{
send = false;
}
}
}
if ((!send && exist == null && item.CheckPost == "班组负责人" && dt.Hour == 8) || (send && exist == null && item.CheckPost == "班组负责人") || (send && exist == null && item.CheckPost != "班组负责人" && setTime != null && dt.Hour == setTime.CHECKTIME.Value.Hour))