班前会跑批优化
This commit is contained in:
parent
5654424588
commit
bfa5894be2
@ -96,9 +96,9 @@ namespace APT.PP.WebApi.Controllers.Api.PP
|
||||
shift.RUN_STATUS = true;
|
||||
//查出当前班组
|
||||
var currentTeam = shift.Nav_Team;
|
||||
var userAgent = userVacations.FirstOrDefault(t => t.USER_ID == currentTeam.Nav_ChargePerson.Nav_User.ID);
|
||||
var userId = userAgent != null && userAgent.AGENT_ID != null ? userAgent.AGENT_ID : currentTeam.Nav_ChargePerson.Nav_User.ID;
|
||||
var userName = userAgent != null && userAgent.AGENT_ID != null ? userAgent.Nav_Agent?.NAME : currentTeam.Nav_ChargePerson.Nav_User.NAME;
|
||||
var userAgent = userVacations.FirstOrDefault(t => t.USER_ID == currentTeam?.Nav_ChargePerson?.Nav_User?.ID);
|
||||
var userId = userAgent != null && userAgent.AGENT_ID != null ? userAgent.AGENT_ID : currentTeam?.Nav_ChargePerson?.Nav_User?.ID;
|
||||
var userName = userAgent != null && userAgent.AGENT_ID != null ? userAgent.Nav_Agent?.NAME : currentTeam?.Nav_ChargePerson?.Nav_User?.NAME;
|
||||
//当前班组的人员
|
||||
var currentTeamUsers = shift.Nav_DepartmentSchedulingDetail;
|
||||
T_FO_PRE_SHIFT_MEETING_RECORD record = new T_FO_PRE_SHIFT_MEETING_RECORD(); ;
|
||||
@ -244,9 +244,9 @@ namespace APT.PP.WebApi.Controllers.Api.PP
|
||||
var depart = departs.FirstOrDefault(t=>t.TEAM_ID == shift.TEAM_ID);
|
||||
//查出当前班组
|
||||
var currentTeam = shift.Nav_Team;
|
||||
var userAgent = userVacations.FirstOrDefault(t => t.USER_ID == currentTeam.Nav_ChargePerson.Nav_User.ID);
|
||||
var userId = userAgent != null && userAgent.AGENT_ID != null ? userAgent.AGENT_ID : currentTeam.Nav_ChargePerson.Nav_User.ID;
|
||||
var userName = userAgent != null && userAgent.AGENT_ID != null ? userAgent.Nav_Agent?.NAME : currentTeam.Nav_ChargePerson.Nav_User.NAME;
|
||||
var userAgent = userVacations.FirstOrDefault(t => t.USER_ID == currentTeam?.Nav_ChargePerson?.Nav_User?.ID);
|
||||
var userId = userAgent != null && userAgent.AGENT_ID != null ? userAgent.AGENT_ID : currentTeam?.Nav_ChargePerson?.Nav_User?.ID;
|
||||
var userName = userAgent != null && userAgent.AGENT_ID != null ? userAgent.Nav_Agent?.NAME : currentTeam?.Nav_ChargePerson?.Nav_User?.NAME;
|
||||
var isExsist = preShiftMeetings.FirstOrDefault(t=>t.TEAM_ID == shift.TEAM_ID && t.START_TIME.Date == shift.START_TIME.Date);
|
||||
if (isExsist != null)
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user