From 932772f8c8c56f2d41387dbde3f45eaebed8ea4a Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 6 May 2025 10:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=98=85=E7=89=87=E4=BA=BA?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E4=BA=8B=E4=BB=B6=E8=A7=A6=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_DomainEvent/ReUploadEvent.cs             | 18 +++++++-------
 .../_DomainEvent/ReviewerEvent.cs             | 10 +++++++-
 .../Interceptor/AddDomainExt.cs               | 24 +++++++++++++++----
 3 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/IRaCIS.Core.Domain/_DomainEvent/ReUploadEvent.cs b/IRaCIS.Core.Domain/_DomainEvent/ReUploadEvent.cs
index b42a75765..bcaeb2779 100644
--- a/IRaCIS.Core.Domain/_DomainEvent/ReUploadEvent.cs
+++ b/IRaCIS.Core.Domain/_DomainEvent/ReUploadEvent.cs
@@ -44,15 +44,7 @@ namespace IRaCIS.Core.Domain._DomainEvent
     }
 
 
-    /// <summary>
-    ///针对于未阅的任务   PM直接退回，通知CRC 
-    /// </summary>
-    public class UnReadVisitTaskReReadingApproval : DomainEvent
-    {
-        public Guid SubjectVisitId { get; set; }
 
-       
-    }
 
     /// <summary>
     ///针对于已阅的任务  PM 申请， SPM/CPM审批，通知PM/阅片人
@@ -63,4 +55,14 @@ namespace IRaCIS.Core.Domain._DomainEvent
 
         public ReReadingApplyState ReReadingApplyState { get; set; }
     }
+
+    /// <summary>
+    ///针对于未阅的任务   PM直接退回，通知CRC --这里废弃 ，没有审批流程，不做
+    /// </summary>
+    public class UnReadVisitTaskReReadingApproval : DomainEvent
+    {
+        public Guid SubjectVisitId { get; set; }
+
+
+    }
 }
diff --git a/IRaCIS.Core.Domain/_DomainEvent/ReviewerEvent.cs b/IRaCIS.Core.Domain/_DomainEvent/ReviewerEvent.cs
index 02d21fbdf..f300d86ca 100644
--- a/IRaCIS.Core.Domain/_DomainEvent/ReviewerEvent.cs
+++ b/IRaCIS.Core.Domain/_DomainEvent/ReviewerEvent.cs
@@ -10,7 +10,7 @@ namespace IRaCIS.Core.Domain._DomainEvent
 {
 
     /// <summary>
-    ///  SPM审批通过，通知PM； (在消费者中判断项目是否配置了SPM 并且有SPM,有的话才发邮件,因为没有SPM的时候，状态会跳的 ) Enroll表
+    ///  SPM审批通过，通知PM；  Enroll表
     /// </summary>
     public class ReviewerSPMApprovedEvent : DomainEvent
     {
@@ -21,4 +21,12 @@ namespace IRaCIS.Core.Domain._DomainEvent
         /// </summary>
         //public EnrollStatus EnrollStatus { get; set; }
     }
+
+    /// <summary>
+    /// PM 申请审批  Enroll表
+    /// </summary>
+    public class ReviewerPMApplyEvent : DomainEvent
+    {
+        public List<Guid> EnrollIdList { get; set; }
+    }
 }
diff --git a/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs b/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs
index 1ee430871..656a0e0d3 100644
--- a/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs
+++ b/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs
@@ -425,7 +425,8 @@ public static class DBContext_Ext
 
         #region 阅片人筛选
 
-        var enrollIdList = new List<Guid>();
+        var spmApproveEnrollIdList = new List<Guid>();
+        var pmApplyEnrollIdList = new List<Guid>();
         Enroll lastEnroll = null;
         foreach (var entry in changeTracker.Entries<Enroll>())
         {
@@ -435,15 +436,30 @@ public static class DBContext_Ext
 
             if (originEnrollStatus == EnrollStatus.HasCommittedToCRO && enroll.EnrollStatus == EnrollStatus.InviteIntoGroup)
             {
-                enrollIdList.Add(enroll.Id);
+                spmApproveEnrollIdList.Add(enroll.Id);
 
                 lastEnroll = enroll;
             }
+
+            if (originEnrollStatus == EnrollStatus.HasApplyDownloadResume && enroll.EnrollStatus == EnrollStatus.HasCommittedToCRO)
+            {
+                pmApplyEnrollIdList.Add(enroll.Id);
+
+                lastEnroll = enroll;
+            }
+
+
         }
 
-        if (enrollIdList.Count > 0)
+        if (spmApproveEnrollIdList.Count > 0)
         {
-            lastEnroll.AddDomainEvent(new ReviewerSPMApprovedEvent() { EnrollIdList = enrollIdList });
+            lastEnroll.AddDomainEvent(new ReviewerSPMApprovedEvent() { EnrollIdList = spmApproveEnrollIdList });
+
+            eventStoreList.AddRange(GetStoreEvents(lastEnroll.DomainEvents));
+        }
+        if (pmApplyEnrollIdList.Count > 0)
+        {
+            lastEnroll.AddDomainEvent(new ReviewerPMApplyEvent() { EnrollIdList = spmApproveEnrollIdList });
 
             eventStoreList.AddRange(GetStoreEvents(lastEnroll.DomainEvents));
         }