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

Compare commits

base: wyw:7257b3469f14f31abf624d9e93850049b72209e1
Branches Tags
wyw:master
..
compare: wyw:5f0c17aaf6092d0fcdf13b797cbe993e133c67ae
Branches Tags
wyw:master

No commits in common. "7257b3469f14f31abf624d9e93850049b72209e1" and "5f0c17aaf6092d0fcdf13b797cbe993e133c67ae" have entirely different histories.
7257b3469f ... 5f0c17aaf6

1 changed files with 3 additions and 29 deletions
Show Stats Expand all files Collapse all files

32
APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs
View File

@ -327,11 +327,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
} }
if (taskId != Guid.Empty) if (taskId != Guid.Empty)
{ {
finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, eye); finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, eye);
if (finishNotice.NOTICE_STATUS != 1)
{
entity.OVERTIME = FOISOVERTIME.超时;//班长提交的时候就已经超期了
}
} }
} }
entity.Nav_User = null; entity.Nav_User = null;
@ -526,29 +522,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
if (t.Nav_DealMeasures != null && t.Nav_DealMeasures.Any()) if (t.Nav_DealMeasures != null && t.Nav_DealMeasures.Any())
jobMeasures.AddRange(t.Nav_DealMeasures); jobMeasures.AddRange(t.Nav_DealMeasures);
}); });
} }
#region wyw 如果 超期 model.OVERTIME = FOISOVERTIME.超时; 如果是最后一个人签到 未超时
if (task != null)
{
if (task.NOTICE_STATUS == 2)
{
if (model == null)
{
model = GetEntity<T_FO_PRE_SHIFT_MEETING_RECORD>(entity.ID.ToString());
}
model.OVERTIME = FOISOVERTIME.超时;
}
else if (model != null && model.PRE_MEETING_STATUS == FOPreMeetingStatusEnum.归档)
{
model.OVERTIME = FOISOVERTIME.未超时;
}
}
#endregion
UnifiedCommit(() => UnifiedCommit(() =>
{ {
if (currUsers != null && currUsers.Any() && task != null) if (currUsers != null && currUsers.Any() && task != null)
@ -558,7 +532,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
} }
if (model != null) if (model != null)
{ {
UpdateEntityNoCommit(model, "PRE_MEETING_STATUS", "IS_RUN", "OVERTIME"); UpdateEntityNoCommit(model, "PRE_MEETING_STATUS", "IS_RUN");
} }
if (eventRecords != null && eventRecords.Any()) if (eventRecords != null && eventRecords.Any())
BantchSaveEntityNoCommit(eventRecords); BantchSaveEntityNoCommit(eventRecords);