From bb181075a53c2e84cf9d8b0acd2e7005c5749d8b Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 16 Jun 2022 11:17:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               |  5 +++++
 .../Reading/Dto/ReadingQuestionViewModel.cs   | 12 +++++++++++
 .../Service/Reading/ReadingQuestionService.cs | 20 +++++++++++++++----
 .../Reading/ReadingQuestionCriterionSystem.cs |  5 ++++-
 .../Reading/ReadingQuestionTrial.cs           |  5 +++++
 ...rTrial.cs => ReadingTaskQuestionAnswer.cs} |  0
 6 files changed, 42 insertions(+), 5 deletions(-)
 rename IRaCIS.Core.Domain/Reading/{ReadingQuestionAnswerTrial.cs => ReadingTaskQuestionAnswer.cs} (100%)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 168c92466..731e31261 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1734,6 +1734,11 @@
             类型值
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SetTrialQuestionIsIsJudgeQuestionInDto.IsJudgeQuestion">
+            <summary>
+            是否是裁判问题
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionOtherQuestionInDto.Id">
             <summary>
             当前ID
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index 7d6a8e909..5e27a4cde 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -226,6 +226,18 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string TypeValue { get; set; }
 	}
+
+	public class SetTrialQuestionIsIsJudgeQuestionInDto
+	{
+		[NotDefault]
+		public Guid Id { get; set; }
+
+		/// <summary>
+		/// 是否是裁判问题
+		/// </summary>
+		public bool IsJudgeQuestion { get; set; }
+	}
+
 	public class GetTrialCriterionOtherQuestionInDto
 	{
 		[NotDefault]
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
index 31ace53df..43ea5504f 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
@@ -375,8 +375,6 @@ namespace IRaCIS.Application.Services
             return ResponseOutput.Result(success);
         }
 
-
-
         /// <summary>
         /// 新增修改项目问题（项目）
         /// </summary>
@@ -405,8 +403,6 @@ namespace IRaCIS.Application.Services
              inDto.Asc);
         }
 
-
-
         /// <summary>
         /// 获取项目标准的其他问题(项目)
         /// </summary>
@@ -432,6 +428,22 @@ namespace IRaCIS.Application.Services
             return questionList;
         }
 
+        ///// <summary>
+        ///// 设置问题为裁判问题
+        ///// </summary>
+        ///// <returns></returns>
+        //public async Task<IResponseOutput> SetTrialQuestionIsIsJudgeQuestion(SetTrialQuestionIsIsJudgeQuestionInDto inDto)
+        //{
+        //    var trialCriterionId = (await _readingQuestionTrialRepository.FirstOrDefaultAsync(x => x.Id == inDto.Id)).IfNullThrowException();
+
+        //    if (inDto.IsJudgeQuestion)
+        //    {
+        //        if()
+        //    }
+
+
+        //}
+
         /// <summary>
         /// 删除项目问题（项目）
         /// </summary>
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs
index 16b63aaf0..778cb1870 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs
@@ -40,9 +40,12 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid CreateUserId { get; set; }
 
-
+		[ForeignKey("CriterionId")]
 		public List<ReadingQuestionSystem> ReadingQuestionSystemList { get; set; } = new List<ReadingQuestionSystem>();
 
+		
+		public Dictionary Dictionary { get; set; }
+
 	}
 
 
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
index 5c046b420..0e08edd55 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
@@ -63,6 +63,11 @@ namespace IRaCIS.Core.Domain.Models
 
 		public bool IsEnable { get; set; }
 
+		/// <summary>
+		/// 是否是裁判问题
+		/// </summary>
+		public bool IsJudgeQuestion { get; set; }
+
 		/// <summary>
 		/// 创建时间
 		/// </summary>
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionAnswerTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingTaskQuestionAnswer.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingQuestionAnswerTrial.cs
rename to IRaCIS.Core.Domain/Reading/ReadingTaskQuestionAnswer.cs