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 @@
类型值
+
+
+ 是否是裁判问题
+
+
当前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
///
public string TypeValue { get; set; }
}
+
+ public class SetTrialQuestionIsIsJudgeQuestionInDto
+ {
+ [NotDefault]
+ public Guid Id { get; set; }
+
+ ///
+ /// 是否是裁判问题
+ ///
+ 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);
}
-
-
///
/// 新增修改项目问题(项目)
///
@@ -405,8 +403,6 @@ namespace IRaCIS.Application.Services
inDto.Asc);
}
-
-
///
/// 获取项目标准的其他问题(项目)
///
@@ -432,6 +428,22 @@ namespace IRaCIS.Application.Services
return questionList;
}
+ /////
+ ///// 设置问题为裁判问题
+ /////
+ /////
+ //public async Task SetTrialQuestionIsIsJudgeQuestion(SetTrialQuestionIsIsJudgeQuestionInDto inDto)
+ //{
+ // var trialCriterionId = (await _readingQuestionTrialRepository.FirstOrDefaultAsync(x => x.Id == inDto.Id)).IfNullThrowException();
+
+ // if (inDto.IsJudgeQuestion)
+ // {
+ // if()
+ // }
+
+
+ //}
+
///
/// 删除项目问题(项目)
///
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
///
public Guid CreateUserId { get; set; }
-
+ [ForeignKey("CriterionId")]
public List ReadingQuestionSystemList { get; set; } = new List();
+
+ 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; }
+ ///
+ /// 是否是裁判问题
+ ///
+ public bool IsJudgeQuestion { get; set; }
+
///
/// 创建时间
///
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