From 3807db1b86c108fd6aca693e308fbd011bec0fcf Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 28 Feb 2023 17:04:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml |  6 ++----
 .../Document/DTO/TrialEmailNoticeConfigViewModel.cs | 10 ++++++++++
 .../Document/TrialEmailNoticeConfigService.cs       | 13 ++++++++-----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index b7712116..49b15b43 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -613,13 +613,11 @@
             <returns></returns>
             <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.ManualGenerateEmailFile(System.Guid,System.Guid,IRaCIS.Core.Domain.Share.CommonDocumentBusinessScenario)">
+        <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.ManualGenerateEmailFile(IRaCIS.Core.Application.ViewModel.GenerateEmailCommand)">
             <summary>
             手动生成入组确认 或者PD 进展的邮件   如果能发送，会返回文件的路径，否则会给出提示
             </summary>
-            <param name="subjectId"></param>
-            <param name="trialReadingCriterionId"></param>
-            <param name="businessScenarioEnum"></param>
+            <param name="generateEmailCommand"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.ManualSendEmail(System.Guid,System.String)">
diff --git a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
index a789b269..7cd8ad0a 100644
--- a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
@@ -108,6 +108,16 @@ namespace IRaCIS.Core.Application.ViewModel
 
     }
 
+
+    public class GenerateEmailCommand
+    {
+        public Guid SubjectId { get; set; }
+
+        public Guid TrialReadingCriterionId { get; set; }
+
+        public CommonDocumentBusinessScenario BusinessScenarioEnum  { get; set; }
+    }
+
     ///<summary> TrialEmailNoticeConfigAddOrEdit  列表查询参数模型</summary>
     public class TrialEmailNoticeConfigAddOrEdit
     {
diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index 0bd377e1..3069a7d6 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -829,13 +829,16 @@ namespace IRaCIS.Core.Application.Service
         /// <summary>
         /// 手动生成入组确认 或者PD 进展的邮件   如果能发送，会返回文件的路径，否则会给出提示
         /// </summary>
-        /// <param name="subjectId"></param>
-        /// <param name="trialReadingCriterionId"></param>
-        /// <param name="businessScenarioEnum"></param>
+        /// <param name="generateEmailCommand"></param>
+
         /// <returns></returns>
-        [HttpPut]
-        public async Task<IResponseOutput> ManualGenerateEmailFile(Guid subjectId, Guid trialReadingCriterionId, CommonDocumentBusinessScenario businessScenarioEnum)
+        [HttpPost]
+        public async Task<IResponseOutput> ManualGenerateEmailFile(GenerateEmailCommand generateEmailCommand)
         {
+            var subjectId = generateEmailCommand.SubjectId;
+            var businessScenarioEnum = generateEmailCommand.BusinessScenarioEnum;
+            var trialReadingCriterionId = generateEmailCommand.TrialReadingCriterionId;
+
 
             var trialConfig = await _subjectRepository.Where(t => t.Id == subjectId).Select(t => new { t.Trial.IsEnrollementQualificationConfirm, t.Trial.IsPDProgressView }).FirstNotNullAsync();