diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs index 7b4b865..1439864 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs @@ -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 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 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); if (nextClassTemp != null) { @@ -756,6 +757,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP currentClassRecord.CLASS_TEAM_ID = (Guid)shiftClass.TEAM_ID; currentClassRecord.SUPPLIES_STATUS = (int)FOShiftRecordStatusEnum.正常; currentClassRecord.SUPPLIES_USED = (int)WFDisableStatusEnum.是; + currentClassRecord.IS_HANDOVER = is_handover; listRecord.Add(currentClassRecord); 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 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 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); if (nextClassTemp != null) { @@ -871,7 +874,8 @@ namespace APT.PP.WebApi.Controllers.Api.PP currentClassRecord.NEXT_CLASS_TEAM_ID = nextClassID; currentClassRecord.CLASS_TEAM_ID = (Guid)shiftClass.TEAM_ID; currentClassRecord.SUPPLIES_STATUS = (int)FOShiftRecordStatusEnum.正常; - currentClassRecord.SUPPLIES_USED = (int)WFDisableStatusEnum.是; + currentClassRecord.SUPPLIES_USED = (int)WFDisableStatusEnum.是; + currentClassRecord.IS_HANDOVER = is_handover; listRecord.Add(currentClassRecord); foreach (var post in postUsers) {