修改阅片人筛选事件触发

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));
         }