GetNextTask 新增 ArbitrationRule
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
4e2fc0d2d9
commit
22afd356a6
|
|
@ -2209,6 +2209,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public JudgeRule JudgeRuleEnum { get; set; } = JudgeRule.Consistent;
|
public JudgeRule JudgeRuleEnum { get; set; } = JudgeRule.Consistent;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 仲裁对象
|
||||||
|
/// </summary>
|
||||||
|
public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class GetReadingImgInDto
|
public class GetReadingImgInDto
|
||||||
|
|
|
||||||
|
|
@ -3938,6 +3938,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
x.JudgeGenerateEnum,
|
x.JudgeGenerateEnum,
|
||||||
x.JudgeModeEnum,
|
x.JudgeModeEnum,
|
||||||
x.JudgeRuleEnum,
|
x.JudgeRuleEnum,
|
||||||
|
x.ArbitrationRule,
|
||||||
}).FirstNotNullAsync();
|
}).FirstNotNullAsync();
|
||||||
|
|
||||||
task.IsReadingShowPreviousResults = criterionInfo.IsReadingShowPreviousResults;
|
task.IsReadingShowPreviousResults = criterionInfo.IsReadingShowPreviousResults;
|
||||||
|
|
@ -4003,6 +4004,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
task.IsHaveKeyFile = await _trialCriterionKeyFileRepository.AnyAsync(x => x.TrialCriterionId == task.TrialReadingCriterionId);
|
task.IsHaveKeyFile = await _trialCriterionKeyFileRepository.AnyAsync(x => x.TrialCriterionId == task.TrialReadingCriterionId);
|
||||||
task.JudgeModeEnum = criterionInfo.JudgeModeEnum;
|
task.JudgeModeEnum = criterionInfo.JudgeModeEnum;
|
||||||
task.JudgeRuleEnum = criterionInfo.JudgeRuleEnum;
|
task.JudgeRuleEnum = criterionInfo.JudgeRuleEnum;
|
||||||
|
task.ArbitrationRule = criterionInfo.ArbitrationRule;
|
||||||
// 添加默认答案
|
// 添加默认答案
|
||||||
if (inDto.VisitTaskId == null && visitTaskInfo.ReadingTaskState != ReadingTaskState.HaveSigned)
|
if (inDto.VisitTaskId == null && visitTaskInfo.ReadingTaskState != ReadingTaskState.HaveSigned)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue