From a2249025fd18d48ac51669e0c9f91b669c2a7649 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Wed, 17 Jun 2026 10:48:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E5=BD=92=E6=A1=A3=20=E6=8A=8A=E7=AD=BE=E5=88=B0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E5=A4=84=E7=90=86=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/SEController/6SETrainRecordController.cs    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 8d1b836..f8e9d16 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
@@ -2086,6 +2086,19 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                         allSendUserNames.Add(data.Nav_Notify.Nav_LaunchUser.NAME);
                         sendNoticeTask.AddRange(NotificationTaskService.InsertUserNoticeTaskModels(allSendUserTitles, allSendDataIds, filter.GetOrgId(), allSendUserIds, allSendUserNames, DateTime.Now, DateTime.Now.AddDays(1).Date, (int)FMNoticeTypeEnum.今日提醒, "PF135"));
                     }
+                    //归档 把签到待办处理掉
+                    var taskEndMore = GetEntities<T_FM_NOTIFICATION_TASK>(e => e.SOURCE_DATA_ID == finishNotice.SOURCE_DATA_ID && e.NOTICE_STATUS == 0 && e.SOURCE_FORMCODE == "SE017_SHOWPRINT", null);
+                    if (taskEndMore != null && taskEndMore.Count() > 0)
+                    {
+                        foreach (var item in taskEndMore)
+                        {
+                            item.NOTICE_STATUS = 4;
+                            item.TASK_DT = DateTime.Now;
+                            item.MODIFIER_ID = finishNotice.MODIFIER_ID;
+                            item.MODIFY_TIME = DateTime.Now;
+                        }
+                        sendNoticeTask.AddRange(taskEndMore);
+                    }
                 }
                 else
                 {

From 0e902ab30e2f3f0d0cbfb965eb8e1d88e811cbaf Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Wed, 17 Jun 2026 13:49:17 +0800
Subject: [PATCH 2/2] 2134

---
 .../Api/SEController/6SETrainRecordController.cs       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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 f8e9d16..0fb8ffb 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
@@ -1952,6 +1952,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                 List<T_SE_TRAIN_NOTIFY_CONTENT_REL> transferNotifyContents = new List<T_SE_TRAIN_NOTIFY_CONTENT_REL>();
                 List<T_SE_TRAIN_NOTIFY_FILE> transferNotifyFiles = new List<T_SE_TRAIN_NOTIFY_FILE>();
                 List<T_FM_NOTIFICATION_TASK> sendNoticeTask = new List<T_FM_NOTIFICATION_TASK>();
+                IEnumerable<T_FM_NOTIFICATION_TASK> EndTaskSign = null;
                 List<T_SE_TRAIN_NOTIFY_COURSEWEARLIBRARY> ListCour = null;
                 if (data.STATUS == SETrainRecordStatus.审阅中)
                 {
@@ -2087,17 +2088,16 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                         sendNoticeTask.AddRange(NotificationTaskService.InsertUserNoticeTaskModels(allSendUserTitles, allSendDataIds, filter.GetOrgId(), allSendUserIds, allSendUserNames, DateTime.Now, DateTime.Now.AddDays(1).Date, (int)FMNoticeTypeEnum.今日提醒, "PF135"));
                     }
                     //归档 把签到待办处理掉
-                    var taskEndMore = GetEntities<T_FM_NOTIFICATION_TASK>(e => e.SOURCE_DATA_ID == finishNotice.SOURCE_DATA_ID && e.NOTICE_STATUS == 0 && e.SOURCE_FORMCODE == "SE017_SHOWPRINT", null);
-                    if (taskEndMore != null && taskEndMore.Count() > 0)
+                    EndTaskSign = GetEntities<T_FM_NOTIFICATION_TASK>(e => e.SOURCE_DATA_ID == finishNotice.SOURCE_DATA_ID && e.NOTICE_STATUS == 0 && e.SOURCE_FORMCODE == "SE017_SHOWPRINT" && e.NOTICE_TITLE.Contains("签到"), null);
+                    if (EndTaskSign != null && EndTaskSign.Count() > 0)
                     {
-                        foreach (var item in taskEndMore)
+                        foreach (var item in EndTaskSign)
                         {
                             item.NOTICE_STATUS = 4;
                             item.TASK_DT = DateTime.Now;
                             item.MODIFIER_ID = finishNotice.MODIFIER_ID;
                             item.MODIFY_TIME = DateTime.Now;
                         }
-                        sendNoticeTask.AddRange(taskEndMore);
                     }
                 }
                 else
@@ -2119,6 +2119,8 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                         BantchAddEntityNoCommit(sendNoticeTask);
                     if (ListCour != null && ListCour.Any())
                         BantchSaveEntityNoCommit(ListCour);
+                    if (EndTaskSign != null && EndTaskSign.Any())
+                        BantchSaveEntityNoCommit(EndTaskSign);
 
                 });
                 return true;