From 8262ddffbf39016b7782daa9d2bbfee10cef7119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Tue, 3 Mar 2026 11:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=80=9A=E7=9F=A5=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../APT.PP.WebApi/Controllers/Api/SKController.cs   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
index 947f894..e97ce22 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
@@ -3471,7 +3471,8 @@ namespace APT.PP.WebApi.Controllers.Api
                                                     {
                                                         endtime = DateTime.Now.AddMonths(3);
                                                     }
-                                                    var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CHECK_TYPE.GetDescription() + "安全检查通知" + date + item.Nav_CheckType?.NAME, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
+                                                    var checkType = checkTypes.FirstOrDefault(t => t.ID == item.CHECK_TYPE_ID);
+                                                    var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CHECK_TYPE.GetDescription() + checkType?.NAME + date + item.Nav_CheckType?.NAME, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
                                                     notices.Add(notice);
                                                 }
                                             }
@@ -3547,7 +3548,8 @@ namespace APT.PP.WebApi.Controllers.Api
                                                 {
                                                     endtime = DateTime.Now.AddMonths(3);
                                                 }
-                                                var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CHECK_TYPE.GetDescription() + "安全检查通知" + date + item.Nav_CheckType?.NAME, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
+                                                var checkType = checkTypes.FirstOrDefault(t => t.ID == item.CHECK_TYPE_ID);
+                                                var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CHECK_TYPE.GetDescription() + checkType?.NAME + date + item.Nav_CheckType?.NAME, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
                                                 notices.Add(notice);
                                             }
                                         }
@@ -5584,7 +5586,8 @@ namespace APT.PP.WebApi.Controllers.Api
                                         {
                                             endtime = DateTime.Now.AddMonths(3);
                                         }
-                                        var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CheckCycle + "安全检查通知" + date, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
+                                        var checkType = checkTypes.FirstOrDefault(t => t.ID == item.CheckTypeId);
+                                        var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CheckCycle + checkType?.NAME + date, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
                                         notices.Add(notice);
                                         j++;
                                     }
@@ -5838,6 +5841,7 @@ namespace APT.PP.WebApi.Controllers.Api
                     {
                         dt = DateTime.Parse(filter.Parameter1);
                     }
+                    var checkTypes = GetEntities<T_SK_CHECK_TYPE>(i => !i.IS_DELETED, new BaseFilter(filter.OrgId)).ToList();
                     List<T_SK_SECURITY_INSPECTION_NOTICE> notices = new List<T_SK_SECURITY_INSPECTION_NOTICE>();
                     List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL> details = new List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>();
                     List<T_FM_NOTIFICATION_TASK> tasks = new List<T_FM_NOTIFICATION_TASK>();
@@ -5915,7 +5919,8 @@ namespace APT.PP.WebApi.Controllers.Api
                                         {
                                             endtime = DateTime.Now.AddMonths(3);
                                         }
-                                        var task = NotificationTaskService.InsertUserNoticeTaskModel(set.CHECK_CYCLE.GetDescription() + "安全检查通知" + date, notice.ID, set.ORG_ID, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
+                                        var checkType = checkTypes.FirstOrDefault(t => t.ID == set.CHECK_TYPE_ID);
+                                        var task = NotificationTaskService.InsertUserNoticeTaskModel(set.CHECK_CYCLE.GetDescription() + checkType?.NAME + date, notice.ID, set.ORG_ID, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
                                         tasks.Add(task);
                                         j++;
                                     }