From e0da3a1694058e321a6ea680bb929dc3597318f8 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Wed, 21 May 2025 09:23:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=8F=91=E9=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/BIController.cs           | 39 ++++++++++++++-----
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/BIController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/BIController.cs
index 5dfa60f..999fdb8 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/BIController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/BIController.cs
@@ -303,6 +303,9 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                     {
                         sendSMSs = GetEntities<T_FM_NOTIFICATION_TASK>(t => t.NOTICE_STATUS == 0 && t.TASK_ENDDT >= now && t.CREATE_TIME > now.AddDays(-10) && !t.SOURCE_FORMCODE.Contains("FO005") && t.SENDTIME == DateTime.MinValue, new BaseFilter(filter.GetOrgId())).ToList();//未超期的进行提醒
                         var sendSMSs2 = sendSMSs.Where(t => t.TASK_ENDDT < now.AddHours(1) && t.TASK_ENDDT > t.TASK_STARTDT);
+                        //var listSendID = sendSMSs2.Select(e => e.ID);
+                        List<Guid> listSendID = new List<Guid>();
+                        List<T_FM_NOTIFICATION_TASK> listSend = new List<T_FM_NOTIFICATION_TASK>();
                         foreach (var send in sendSMSs2)//1个小时以内 临超时提醒
                         {
                             List<string> phoneNumbers = new List<string>();
@@ -317,15 +320,23 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                                 var result = tencentSendSMS.sendSMS("2428711", phoneNumbers.ToArray(), null);
                                 if (result.SendStatusSet[0].Code.Equals("Ok"))
                                 {
-                                    UnifiedCommit(() =>
-                                    {
-                                        UpdateEntityNoCommit(send);
-                                    });
+                                    listSend.Add(send);
+                                    listSendID.Add(send.ID);
+                                    //UnifiedCommit(() =>
+                                    //{
+                                    //    UpdateEntityNoCommit(send);
+                                    //});
                                 }
                             }
                         }
-                        //&& t.NOTICE_TITLE.Contains("审批")
-                        var sendSMSs1 = sendSMSs.Where(t => userIds.Contains(t.USER_ID) && t.CREATE_TIME > now.AddHours(-8));
+
+                        Func<T_FM_NOTIFICATION_TASK, bool> exp = t => userIds.Contains(t.USER_ID) && t.CREATE_TIME > now.AddHours(-8);
+                        if (listSendID.Count > 0)
+                        {
+                            exp = t => userIds.Contains(t.USER_ID) && t.CREATE_TIME > now.AddHours(-8) && !listSendID.Contains(t.ID);
+                        }
+
+                        var sendSMSs1 = sendSMSs.Where(exp);
                         foreach (var send in sendSMSs1)
                         {
                             List<string> phoneNumbers = new List<string>();
@@ -341,14 +352,22 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                                 var result = tencentSendSMS.sendSMS("2428708", phoneNumbers.ToArray(), null);
                                 if (result.SendStatusSet[0].Code.Equals("Ok"))
                                 {
-                                    UnifiedCommit(() =>
-                                    {
-                                        UpdateEntityNoCommit(send);
-                                    });
+                                    listSend.Add(send);
+                                    //UnifiedCommit(() =>
+                                    //{
+                                    //    UpdateEntityNoCommit(send);
+                                    //});
                                 }
                             }
                         }
 
+                        if (listSend.Count > 0)
+                        {
+                            UnifiedCommit(() =>
+                            {
+                                BantchUpdateEntityNoCommit(listSend);
+                            });
+                        }
                     }
                 }
                 return true;