From 9900cef43599d13fff8c20edbb77b64f2d2801e3 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Fri, 24 Jul 2026 09:20:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E7=AD=BE=E5=88=B0=20?=
 =?UTF-8?q?=EF=BC=8C=E9=87=8D=E6=96=B0=E8=A7=A6=E5=8F=91=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SEController/6SETrainRecordController.cs  | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
index ccb072c..bc8583f 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
@@ -95,15 +95,18 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                         throw new Exception("该用户已有此签到单，请勿重复触发签到通知！");
                     }
                 }
-                DateTime dtEnd = ru.Nav_Record.Nav_Notify.TRAIN_END_TIME.HasValue ? ru.Nav_Record.Nav_Notify.TRAIN_END_TIME.Value : DateTime.Now.AddHours(12);
-                T_FM_NOTIFICATION_TASK notice = NotificationTaskService.InsertUserNoticeTaskModel("培训记录签到-" + ru.Nav_Record.Nav_Notify.NAME, ru.RECORD_ID, ru.ORG_ID, ru.USER_ID, ru.Nav_User.NAME, DateTime.Now, dtEnd, 1, "SE017_SHOWPRINT");
-                ru.IS_RESEND = true;
-                //ru.Nav_Record = null;//有这句会报错
-                UnifiedCommit(() =>
+                else
                 {
-                    AddEntityNoCommit(notice);
-                    UpdateEntityNoCommit(ru);
-                });
+                    DateTime dtEnd = ru.Nav_Record.Nav_Notify.TRAIN_END_TIME.HasValue ? ru.Nav_Record.Nav_Notify.TRAIN_END_TIME.Value : DateTime.Now.AddHours(12);
+                    T_FM_NOTIFICATION_TASK notice = NotificationTaskService.InsertUserNoticeTaskModel("培训记录签到-" + ru.Nav_Record.Nav_Notify.NAME, ru.RECORD_ID, ru.ORG_ID, ru.USER_ID, ru.Nav_User.NAME, DateTime.Now, dtEnd, 1, "SE017_SHOWPRINT");
+                    ru.IS_RESEND = true;
+                    //ru.Nav_Record = null;//有这句会报错
+                    UnifiedCommit(() =>
+                    {
+                        AddEntityNoCommit(notice);
+                        UpdateEntityNoCommit(ru);
+                    });
+                }
                 return true;
             });
         }
@@ -146,6 +149,18 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                 }
                 if (model.ISSTOPSIGN != true)
                 {
+
+                    var listTaskCancle = GetEntities<T_FM_NOTIFICATION_TASK>(e => e.SOURCE_DATA_ID == RecordID && e.SOURCE_FORMCODE == "SE017_SHOWPRINT" && e.NOTICE_STATUS == 0 && e.NOTICE_TITLE.StartsWith("培训记录签到-"), null, null);
+                    if (listTaskCancle != null && listTaskCancle.Count() > 0)
+                    {
+                        listTaskCancle.ForEach(e =>
+                        {
+                            e.TASK_DT = DateTime.Now;
+                            e.NOTICE_STATUS = 4;
+                            e.MODIFY_TIME = DateTime.Now;
+                            e.MODIFIER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
+                        });
+                    }
                     model.ISSTOPSIGN = true;
                     model.MODIFY_TIME = DateTime.Now;
 
@@ -170,6 +185,8 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                         UpdateEntityNoCommit(model);
                         if (listNotSign != null && listNotSign.Count() > 0)
                             BantchSaveEntityNoCommit(listNotSign);
+                        if (listTaskCancle != null && listTaskCancle.Count() > 0)
+                            BantchSaveEntityNoCommit(listTaskCancle);
                     });
                 }
                 return true;