From f49fafe8661590f0c39c3bf089829f8d629e8e5c Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 1 Mar 2023 15:28:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=82=AE=E4=BB=B6=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs | 2 ++
 IRaCIS.Core.Application/Service/Document/_MapConfig.cs      | 2 ++
 IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs       | 6 +++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
index 7cd8ad0a..8ecdc76e 100644
--- a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
@@ -23,6 +23,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public Guid CreateUserId { get; set; }
 
+        public string TrialCriterionName { get; set; }
+
 
         public List<EmailUserInfoDto> TrialEmailNoticeUserList { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/Document/_MapConfig.cs b/IRaCIS.Core.Application/Service/Document/_MapConfig.cs
index df48cda7..61a8836f 100644
--- a/IRaCIS.Core.Application/Service/Document/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Document/_MapConfig.cs
@@ -70,6 +70,8 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<TrialEmailNoticeConfig, TrialEmailNoticeConfigView>()
+                
+                .ForMember(d => d.TrialCriterionName, c => c.MapFrom(t => t.TrialReadingCriterion.CriterionName))
                  .ForMember(d => d.TrialEmailNoticeUserList, c => c.MapFrom(t => t.TrialEmailNoticeUserList));
 
             CreateMap<TrialEmailNoticeConfigAddOrEdit, TrialEmailNoticeConfig>();
diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
index b7c4b78a..5b3bf06b 100644
--- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
+++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
@@ -76,7 +76,11 @@ namespace IRaCIS.Core.Domain.Models
 
 		public Guid? TrialReadingCriterionId { get; set; }
 
-		[Required]
+		[ForeignKey("TrialReadingCriterionId")]
+		[JsonIgnore]
+		public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
+
+        [Required]
 		public string FilePath { get; set; } = string.Empty;
 
 		[Required]