From 99ee8c47574498e0379df3df2a88132a0f9f07e1 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 21 Apr 2025 17:00:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=82=AE=E4=BB=B6=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Management/UserService.cs | 2 +- .../_DomainEvent/ReUploadEvent.cs | 65 +++++++++++++++++++ .../_DomainEvent/ReviewerEvent.cs | 24 +++++++ 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 IRaCIS.Core.Domain/_DomainEvent/ReUploadEvent.cs create mode 100644 IRaCIS.Core.Domain/_DomainEvent/ReviewerEvent.cs diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 337802fea..2666bbfa2 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -514,7 +514,7 @@ namespace IRaCIS.Core.Application.Service .WhereIf(inQuery.UserState != null, t => t.Status == inQuery.UserState) .WhereIf(inQuery.IsTestUser != null, t => t.IsTestUser == inQuery.IsTestUser) .WhereIf(inQuery.IsZhiZhun != null, t => t.IsZhiZhun == inQuery.IsZhiZhun) - .WhereIf(inQuery.UserCeateSource != null, t => t.UserCeateSource == inQuery.UserCeateSource) + .WhereIf(inQuery.UserCeateSource != null, t => t.UserCeateSource == inQuery.UserCeateSource) .ProjectTo(_mapper.ConfigurationProvider); return await userQueryable.ToPagedListAsync(inQuery); diff --git a/IRaCIS.Core.Domain/_DomainEvent/ReUploadEvent.cs b/IRaCIS.Core.Domain/_DomainEvent/ReUploadEvent.cs new file mode 100644 index 000000000..553635865 --- /dev/null +++ b/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 +{ + /// + /// 直接申请流程 IQC申请,PM/APM审批,通知IQC和CRC;CRC申请,PM/APM审批,通知CRC; SubjectVisitImageBackRecord表 + /// + public class DirectApplyReupdloadEvent : DomainEvent + { + + /// + /// 影像回退记录Id + /// + public Guid SubjectVisitImageBackRecordId { get; set; } + + public Guid SubjectVisitId { get; set; } + + + public ImageBackApplyEnum ApplyUserRole { get; set; } + + } + + /// + /// 正常业务流程申请重传审批 一致性核查 CRC申请 (CRC申请,PM/APM审批,通知CRC;) SubjectVisit表 + /// + public class CheckReuploadApprovalEvent : DomainEvent + { + public Guid SubjectVisitId { get; set; } + + [Comment("一致性核查 回退")] + public RequestBackStateEnum RequestBackState { get; set; } + } + + /// + ///正常业务流程申请重传审批 质疑CRC 申请 (CRC申请,IQC审批,通知CRC;) QCChallenge表 + /// + public class QCChanllengeReuploadApprovalEvent : DomainEvent + { + public Guid SubjectVisitId { get; set; } + public QCChanllengeReuploadEnum ReuploadEnum { get; set; } + } + + + /// + ///针对于未阅的任务 PM直接退回,通知CRC + /// + public class UnReadVisitTaskReReadingApproval : DomainEvent + { + public Guid VisitTaskId { get; set; } + } + + /// + ///针对于已阅的任务 PM 申请, SPM/CPM审批,通知PM/阅片人 + /// + public class HaveReadVisitTaskReReadingApproval : DomainEvent + { + public Guid VisitTaskId { get; set; } + } +} diff --git a/IRaCIS.Core.Domain/_DomainEvent/ReviewerEvent.cs b/IRaCIS.Core.Domain/_DomainEvent/ReviewerEvent.cs new file mode 100644 index 000000000..539d5f26c --- /dev/null +++ b/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 +{ + + /// + /// SPM审批通过,通知PM; (在消费者中判断项目是否配置了SPM 并且有SPM,有的话才发邮件,因为没有SPM的时候,状态会跳的 ) Enroll表 + /// + public class ReviewerSPMApprovedEvent : DomainEvent + { + List EnrollIdList { get; set; } + + /// + /// 有SPM 会从 EnrollStatus.HasCommittedToCRO -> InviteIntoGroup + /// + public EnrollStatus EnrollStatus { get; set; } + } +}