Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Helper/HangfireJobHelper.cs

@@ -20,12 +20,12 @@ namespace IRaCIS.Core.Application.Helper
         //添加 或者更新定时任务  Id 要唯一标识一个定义任务
         public static void AddOrUpdateCronJob<T>(string jobId, Expression<Action<T>> methodCall, string cron, string queueName = "default")
         {
-            RecurringJob.AddOrUpdate<T>(jobId, queueName, methodCall, cron);
+            RecurringJob.AddOrUpdate<T>(jobId, queueName, methodCall, cron, new RecurringJobOptions() { TimeZone = TimeZoneInfo.Local });
         }
 
         public static void AddOrUpdateInitCronJob<T>(string jobId, Expression<Action<T>> methodCall, string cron)
         {
-            RecurringJob.AddOrUpdate<T>(jobId, "sys_init", methodCall, cron);
+            RecurringJob.AddOrUpdate<T>(jobId, "sys_init", methodCall, cron, new RecurringJobOptions() { TimeZone = TimeZoneInfo.Local });
         }
 
         public static void RemoveCronJob(string jobId)

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -17022,7 +17022,7 @@
             SystemDocumentService
             </summary>	
         </member>
-        <member name="M:IRaCIS.Core.Application.Services.SystemDocumentService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},MassTransit.Mediator.IScopedMediator,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocumentAttachment},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocConfirmedIdentityUser},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Services.SystemDocumentService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},MassTransit.Mediator.IScopedMediator,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocumentAttachment},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocConfirmedIdentityUser},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
             <summary>
             SystemDocumentService
             </summary>	

IRaCIS.Core.Domain/_DomainEvent/ReUploadEvent.cs

@@ -0,0 +1,65 @@
+using IRaCIS.Core.Domain.BaseModel;
+using IRaCIS.Core.Domain.Share;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Domain._DomainEvent
+{
+    /// <summary>
+    ///  直接申请流程 IQC申请，PM/APM审批，通知IQC和CRC；CRC申请，PM/APM审批，通知CRC； SubjectVisitImageBackRecord表
+    /// </summary>
+    public class DirectApplyReupdloadEvent : DomainEvent
+    {
+
+        /// <summary>
+        /// 影像回退记录Id
+        /// </summary>
+        public Guid SubjectVisitImageBackRecordId { get; set; }
+
+        public Guid SubjectVisitId { get; set; }
+
+
+        public ImageBackApplyEnum ApplyUserRole { get; set; }
+
+    }
+
+    /// <summary>
+    /// 正常业务流程申请重传审批     一致性核查  CRC申请 （CRC申请，PM/APM审批，通知CRC；） SubjectVisit表
+    /// </summary>
+    public class CheckReuploadApprovalEvent : DomainEvent
+    {
+        public Guid SubjectVisitId { get; set; }
+
+        [Comment("一致性核查 回退")]
+        public RequestBackStateEnum RequestBackState { get; set; }
+    }
+
+    /// <summary>
+    ///正常业务流程申请重传审批    质疑CRC 申请  (CRC申请，IQC审批，通知CRC；)  QCChallenge表
+    /// </summary>
+    public class QCChanllengeReuploadApprovalEvent : DomainEvent
+    {
+        public Guid SubjectVisitId { get; set; }
+        public QCChanllengeReuploadEnum ReuploadEnum { get; set; }
+    }
+
+
+    /// <summary>
+    ///针对于未阅的任务   PM直接退回，通知CRC 
+    /// </summary>
+    public class UnReadVisitTaskReReadingApproval : DomainEvent
+    {
+        public Guid VisitTaskId { get; set; }
+    }
+
+    /// <summary>
+    ///针对于已阅的任务  PM 申请， SPM/CPM审批，通知PM/阅片人
+    /// </summary>
+    public class HaveReadVisitTaskReReadingApproval : DomainEvent
+    {
+        public Guid VisitTaskId { get; set; }
+    }
+}

IRaCIS.Core.Domain/_DomainEvent/ReviewerEvent.cs

@@ -0,0 +1,24 @@
+using IRaCIS.Core.Domain.BaseModel;
+using IRaCIS.Core.Domain.Share;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Domain._DomainEvent
+{
+
+    /// <summary>
+    ///  SPM审批通过，通知PM； (在消费者中判断项目是否配置了SPM 并且有SPM,有的话才发邮件,因为没有SPM的时候，状态会跳的 ) Enroll表
+    /// </summary>
+    public class ReviewerSPMApprovedEvent : DomainEvent
+    {
+        List<Guid> EnrollIdList { get; set; }
+
+        /// <summary>
+        ///  有SPM 会从  EnrollStatus.HasCommittedToCRO ->   InviteIntoGroup
+        /// </summary>
+        public EnrollStatus EnrollStatus { get; set; }
+    }
+}