From 1b685f297cf20a79e284052eafb3d113bb8c7f31 Mon Sep 17 00:00:00 2001
From: wjn <xmwjn@qq.com>
Date: Fri, 5 Jul 2024 14:44:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=93=E6=9D=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FM/IFMNotificationTaskService.cs          |  8 ++++-
 .../Services/FM/FMNotificationTaskService.cs  | 33 +++++++++++++++++++
 .../Services/PF/PFApproveCallBackService.cs   |  5 ++-
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/APT.BaseData.Domain/IServices/FM/IFMNotificationTaskService.cs b/APT.BaseData.Domain/IServices/FM/IFMNotificationTaskService.cs
index c4d9405..3c10242 100644
--- a/APT.BaseData.Domain/IServices/FM/IFMNotificationTaskService.cs
+++ b/APT.BaseData.Domain/IServices/FM/IFMNotificationTaskService.cs
@@ -244,7 +244,13 @@ namespace APT.BaseData.Domain.IServices.FM
         /// <returns></returns>
         List<T_FM_NOTIFICATION_TASK> InsertUserNoticeTaskModels(List<string> Name, List<Guid> DataId, Guid? OrgId, List<Guid> UserId, List<string> userName,
   DateTime startTime, DateTime endTime, int noticeType, List<string> formCode);
-
+        /// <summary>
+        /// 发送新消息集合返回实体集合
+        /// </summary>
+        /// <param name="id">消息ID</param>
+        /// <returns></returns>
+        List<T_FM_NOTIFICATION_TASK> InsertUserNoticeTaskModels(List<string> Name, List<Guid> DataId, Guid? OrgId, List<Guid> UserId, List<string> userName,
+  DateTime startTime, List<DateTime> endTime, int noticeType, List<string> formCode);
         /// <summary>
         /// 发送新消息集合返回实体集合
         /// </summary>
diff --git a/APT.BaseData.Services/Services/FM/FMNotificationTaskService.cs b/APT.BaseData.Services/Services/FM/FMNotificationTaskService.cs
index d3c80d8..1b0a9d2 100644
--- a/APT.BaseData.Services/Services/FM/FMNotificationTaskService.cs
+++ b/APT.BaseData.Services/Services/FM/FMNotificationTaskService.cs
@@ -581,7 +581,40 @@ namespace APT.BaseData.Services.Services.FM
 
             return notices;
         }
+        /// <summary>
+        /// 插入新消息集合返回实体集合(wjn240705)
+        /// </summary>
+        /// <param name="id">消息ID</param>
+        /// <returns></returns>
+        public List<T_FM_NOTIFICATION_TASK> InsertUserNoticeTaskModels(List<string> Names, List<Guid> DataIds, Guid? OrgId, List<Guid> UserIds, List<string> UserNames,
+  DateTime startTime, List<DateTime> endTimes, int noticeType, List<string> formCode)
+        {
+            List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
+            if (UserIds.Count > 0)
+            {
+                var index = 0;
+                UserIds.ForEach(t =>
+                {
+                    T_FM_NOTIFICATION_TASK notice = new T_FM_NOTIFICATION_TASK();
+                    notice.CODE = DateTime.Now.ToString("yyyyMMddHHmmss");
+                    notice.NOTICE_TITLE = Names[index];
+                    notice.SOURCE_DATA_ID = DataIds[index];
+                    notice.ORG_ID = OrgId;
+                    notice.ID = Guid.NewGuid();
+                    notice.TASK_STARTDT = startTime;
+                    notice.TASK_ENDDT = endTimes[index];
+                    notice.NOTICE_TYPE = noticeType;
+                    notice.NOTICE_STATUS = (int)FMNoticeStatusEnum.未处理;
+                    notice.USER_ID = t;
+                    notice.USER_NAME = UserNames[index];
+                    notice.SOURCE_FORMCODE = formCode[index];
+                    notices.Add(notice);
+                    index++;
+                });
+            }
 
+            return notices;
+        }
         /// <summary>
         /// 插入新消息集合返回实体集合(wjn0513)
         /// </summary>
diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
index 3e05e62..6337e9f 100644
--- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
+++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
@@ -5406,6 +5406,7 @@ namespace APT.BaseData.Services.DomainServices
                 var noticeUserNames = new List<string>();
                 var noticeDataIds = new List<Guid>();
                 var noticeFormCodes = new List<string>();
+                var noticeEndTime = new List<DateTime>();
                 SystemCodeFilter riskCode = new SystemCodeFilter
                 {
                     CodeType = (int)PFCodeRuleType.风险辨识任务编号,
@@ -5510,6 +5511,7 @@ namespace APT.BaseData.Services.DomainServices
                     noticeUserIds.Add((Guid)riskDetail.CHARGE_USER_ID);
                     noticeUserNames.Add(user.NAME);
                     noticeFormCodes.Add("HM062");
+                    noticeEndTime.Add(DateTime.Parse(riskTask.END_TIME.ToShortDateString() + " 23:59:59"));
                     risks.Add(riskTask);
                 }
                 int hazardIndex = 0;
@@ -5571,9 +5573,10 @@ namespace APT.BaseData.Services.DomainServices
                     noticeUserIds.Add((Guid)hazardDetail.CHARGE_USER_ID);
                     noticeUserNames.Add(user.NAME);
                     noticeFormCodes.Add("HM102");
+                    noticeEndTime.Add(DateTime.Parse(hazardTask.END_TIME.ToShortDateString() + " 23:59:59"));
                     hazards.Add(hazardTask);
                 }
-                sendNoticeList = NotificationTaskService.InsertUserNoticeTaskModels(noticeTitles, noticeDataIds, entity.ORG_ID, noticeUserIds, noticeUserNames, DateTime.Now, DateTime.Parse(DateTime.Now.AddDays(1).ToShortDateString() + " 23:59:59"), (int)FMNoticeTypeEnum.消息, noticeFormCodes);
+                sendNoticeList = NotificationTaskService.InsertUserNoticeTaskModels( noticeTitles, noticeDataIds, entity.ORG_ID, noticeUserIds, noticeUserNames, DateTime.Now, noticeEndTime, (int)FMNoticeTypeEnum.消息, noticeFormCodes);
                 this.UnifiedCommit(() =>
                 {
                     if (entity != null)