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:
何美荣 2026-05-20 16:45:30 +08:00
commit 9517766e46
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,6 +328,10 @@ 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;
@ -523,6 +527,28 @@ namespace APT.FO.WebApi.Controllers.Api.FO
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)
@ -532,7 +558,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
} }
if (model != null) if (model != null)
{ {
UpdateEntityNoCommit(model, "PRE_MEETING_STATUS", "IS_RUN"); UpdateEntityNoCommit(model, "PRE_MEETING_STATUS", "IS_RUN", "OVERTIME");
} }
if (eventRecords != null && eventRecords.Any()) if (eventRecords != null && eventRecords.Any())
BantchSaveEntityNoCommit(eventRecords); BantchSaveEntityNoCommit(eventRecords);