From e76d80c3221d0b463742159f8c4bd6cfd115133e Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Wed, 20 May 2026 16:40:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E5=89=8D=E4=BC=9A=20=E7=8F=AD?=
 =?UTF-8?q?=E9=95=BF=20=E8=B6=85=E6=97=B6=20=E6=95=B4=E5=8D=95=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=20=20=E7=AD=BE=E5=88=B0=EF=BC=9A=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E6=9F=90=E5=8D=95=E8=B6=85=E6=97=B6=20=E6=95=B4=E5=8D=95?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=20=E5=A6=82=E6=9E=9C=E6=98=AF=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E4=B8=80=E4=B8=AA=E7=AD=BE=E5=88=B0=20=E5=B0=B1?=
 =?UTF-8?q?=E6=98=AF=E6=9C=AA=E8=B6=85=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PreShiftMeetingRecordController.cs        | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

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<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(() =>
                 {
                     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);