diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs index 40b4a7c..8314472 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs @@ -327,7 +327,11 @@ namespace APT.FO.WebApi.Controllers.Api.FO } 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; @@ -522,7 +526,29 @@ namespace APT.FO.WebApi.Controllers.Api.FO if (t.Nav_DealMeasures != null && t.Nav_DealMeasures.Any()) jobMeasures.AddRange(t.Nav_DealMeasures); }); - } + } + + + #region wyw 如果 超期 model.OVERTIME = FOISOVERTIME.超时; 如果是最后一个人签到 未超时 + + if (task != null) + { + if (task.NOTICE_STATUS == 2) + { + if (model == null) + { + model = GetEntity(entity.ID.ToString()); + } + model.OVERTIME = FOISOVERTIME.超时; + } + else if (model != null && model.PRE_MEETING_STATUS == FOPreMeetingStatusEnum.归档) + { + model.OVERTIME = FOISOVERTIME.未超时; + } + } + + #endregion + UnifiedCommit(() => { if (currUsers != null && currUsers.Any() && task != null) @@ -532,7 +558,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO } if (model != null) { - UpdateEntityNoCommit(model, "PRE_MEETING_STATUS", "IS_RUN"); + UpdateEntityNoCommit(model, "PRE_MEETING_STATUS", "IS_RUN", "OVERTIME"); } if (eventRecords != null && eventRecords.Any()) BantchSaveEntityNoCommit(eventRecords);