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-06-10 10:27:02 +08:00
parent d3308727ef
commit ef691c2d53
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs
View File

@ -706,10 +706,11 @@ namespace APT.PP.WebApi.Controllers.Api.PP
var teamPostIdAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post.ID).Distinct().ToList(); var teamPostIdAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post.ID).Distinct().ToList();
var teamPostAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post).ToList(); var teamPostAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post).ToList();
var is_handover = false;
//判断is_handover,true的话记录下个班班组的id //判断is_handover,true的话记录下个班班组的id
if (shiftClass != null && shiftClass.Nav_DepartmentCalendarConfig != null && shiftClass.Nav_DepartmentCalendarConfig.IS_HANDOVER) if (shiftClass != null && shiftClass.Nav_DepartmentCalendarConfig != null && shiftClass.Nav_DepartmentCalendarConfig.IS_HANDOVER)
{ {
is_handover = true;
var nextClassTemp = shiftClassListAll.FirstOrDefault(t => t.DEPARTMENT_ID == shiftClass.DEPARTMENT_ID && t.START_TIME >= shiftClass.END_TIME && t.Nav_DepartmentCalendarConfig.IS_HANDOVER == true && t.Nav_DepartmentCalendarConfig.CALENDAR_ID == shiftClass.Nav_DepartmentCalendarConfig.CALENDAR_ID); var nextClassTemp = shiftClassListAll.FirstOrDefault(t => t.DEPARTMENT_ID == shiftClass.DEPARTMENT_ID && t.START_TIME >= shiftClass.END_TIME && t.Nav_DepartmentCalendarConfig.IS_HANDOVER == true && t.Nav_DepartmentCalendarConfig.CALENDAR_ID == shiftClass.Nav_DepartmentCalendarConfig.CALENDAR_ID);
if (nextClassTemp != null) if (nextClassTemp != null)
{ {
@ -756,6 +757,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
currentClassRecord.CLASS_TEAM_ID = (Guid)shiftClass.TEAM_ID; currentClassRecord.CLASS_TEAM_ID = (Guid)shiftClass.TEAM_ID;
currentClassRecord.SUPPLIES_STATUS = (int)FOShiftRecordStatusEnum.正常; currentClassRecord.SUPPLIES_STATUS = (int)FOShiftRecordStatusEnum.正常;
currentClassRecord.SUPPLIES_USED = (int)WFDisableStatusEnum.是; currentClassRecord.SUPPLIES_USED = (int)WFDisableStatusEnum.是;
currentClassRecord.IS_HANDOVER = is_handover;
listRecord.Add(currentClassRecord); listRecord.Add(currentClassRecord);
foreach (var post in postUsers) foreach (var post in postUsers)
{ {
@ -822,10 +824,11 @@ namespace APT.PP.WebApi.Controllers.Api.PP
var teamPostIdAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post.ID).Distinct().ToList(); var teamPostIdAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post.ID).Distinct().ToList();
var teamPostAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post).ToList(); var teamPostAll = teamUsers.Where(i => i.Nav_Person.POST_ID != null).Select(i => i.Nav_Person.Nav_Post).ToList();
var is_handover = false;
//判断is_handover,true的话记录下个班班组的id //判断is_handover,true的话记录下个班班组的id
if (shiftClass != null && shiftClass.Nav_DepartmentCalendarConfig != null && shiftClass.Nav_DepartmentCalendarConfig.IS_HANDOVER) if (shiftClass != null && shiftClass.Nav_DepartmentCalendarConfig != null && shiftClass.Nav_DepartmentCalendarConfig.IS_HANDOVER)
{ {
is_handover = true;
var nextClassTemp = shiftClassListAll.FirstOrDefault(t => t.DEPARTMENT_ID == shiftClass.DEPARTMENT_ID && t.START_TIME >= shiftClass.END_TIME && t.Nav_DepartmentCalendarConfig.IS_HANDOVER == true && t.Nav_DepartmentCalendarConfig.CALENDAR_ID == shiftClass.Nav_DepartmentCalendarConfig.CALENDAR_ID); var nextClassTemp = shiftClassListAll.FirstOrDefault(t => t.DEPARTMENT_ID == shiftClass.DEPARTMENT_ID && t.START_TIME >= shiftClass.END_TIME && t.Nav_DepartmentCalendarConfig.IS_HANDOVER == true && t.Nav_DepartmentCalendarConfig.CALENDAR_ID == shiftClass.Nav_DepartmentCalendarConfig.CALENDAR_ID);
if (nextClassTemp != null) if (nextClassTemp != null)
{ {
@ -872,6 +875,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
currentClassRecord.CLASS_TEAM_ID = (Guid)shiftClass.TEAM_ID; currentClassRecord.CLASS_TEAM_ID = (Guid)shiftClass.TEAM_ID;
currentClassRecord.SUPPLIES_STATUS = (int)FOShiftRecordStatusEnum.正常; currentClassRecord.SUPPLIES_STATUS = (int)FOShiftRecordStatusEnum.正常;
currentClassRecord.SUPPLIES_USED = (int)WFDisableStatusEnum.是; currentClassRecord.SUPPLIES_USED = (int)WFDisableStatusEnum.是;
currentClassRecord.IS_HANDOVER = is_handover;
listRecord.Add(currentClassRecord); listRecord.Add(currentClassRecord);
foreach (var post in postUsers) foreach (var post in postUsers)
{ {