查询裁判表单修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
393c915884
commit
0af6919b5a
|
|
@ -15348,6 +15348,13 @@
|
||||||
</summary>
|
</summary>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.PhasedGenerationJudge(System.Guid)">
|
||||||
|
<summary>
|
||||||
|
统一生成裁判任务
|
||||||
|
</summary>
|
||||||
|
<param name=""></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.GetTrialCriterionJudgeQuestionList(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionJudgeQuestionListInDto)">
|
<member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.GetTrialCriterionJudgeQuestionList(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialCriterionJudgeQuestionListInDto)">
|
||||||
<summary>
|
<summary>
|
||||||
获取项目标准的裁判问题
|
获取项目标准的裁判问题
|
||||||
|
|
|
||||||
|
|
@ -196,9 +196,27 @@ namespace IRaCIS.Core.Application.Service
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
public async Task<GetJudgeFormOutDto> GetJudgeForm(GetJudgeFormInDto inDto)
|
public async Task<GetJudgeFormOutDto> GetJudgeForm(GetJudgeFormInDto inDto)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
var judgeDataInfo = await _readingJudgeInfoRepository
|
||||||
|
.Where(x => x.JudgeTaskId == inDto.VisitTaskId)
|
||||||
|
.FirstNotNullAsync();
|
||||||
|
|
||||||
|
var taskIds = new List<Guid> { judgeDataInfo.TaskIdOne, judgeDataInfo.TaskIdTwo };
|
||||||
|
|
||||||
|
var readingTask = await _visitTaskRepository
|
||||||
|
.Where(x => taskIds.Contains(x.Id))
|
||||||
|
.Select(x => new
|
||||||
|
{
|
||||||
|
x.Id,
|
||||||
|
x.ArmEnum,
|
||||||
|
x.TrialReadingCriterionId,
|
||||||
|
x.VisitTaskNum,
|
||||||
|
})
|
||||||
|
.FirstNotNullAsync();
|
||||||
|
|
||||||
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
|
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
|
||||||
var judgeRule = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => x.JudgeRuleEnum).FirstNotNullAsync();
|
var judgeRule = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => x.JudgeRuleEnum).FirstNotNullAsync();
|
||||||
var questionList = await GetJudgeDisplayQuestions(taskInfo.TrialReadingCriterionId, taskInfo.VisitTaskNum, judgeRule, true);
|
var questionList = await GetJudgeDisplayQuestions(taskInfo.TrialReadingCriterionId, readingTask.VisitTaskNum, judgeRule, true);
|
||||||
var questionIds = questionList.Select(x => x.Id).ToList();
|
var questionIds = questionList.Select(x => x.Id).ToList();
|
||||||
var answers = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && questionIds.Contains(x.ReadingQuestionTrialId)).ToListAsync();
|
var answers = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && questionIds.Contains(x.ReadingQuestionTrialId)).ToListAsync();
|
||||||
|
|
||||||
|
|
@ -250,9 +268,27 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
private async Task SaveJudgeForm(SetJudgeFormInDto inDto)
|
private async Task SaveJudgeForm(SetJudgeFormInDto inDto)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
|
var judgeDataInfo = await _readingJudgeInfoRepository
|
||||||
|
.Where(x => x.JudgeTaskId == inDto.VisitTaskId)
|
||||||
|
.FirstNotNullAsync();
|
||||||
|
|
||||||
|
var taskIds = new List<Guid> { judgeDataInfo.TaskIdOne, judgeDataInfo.TaskIdTwo };
|
||||||
|
|
||||||
|
var readingTask = await _visitTaskRepository
|
||||||
|
.Where(x => taskIds.Contains(x.Id))
|
||||||
|
.Select(x => new
|
||||||
|
{
|
||||||
|
x.Id,
|
||||||
|
x.ArmEnum,
|
||||||
|
x.TrialReadingCriterionId,
|
||||||
|
x.VisitTaskNum,
|
||||||
|
})
|
||||||
|
.FirstNotNullAsync();
|
||||||
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
|
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
|
||||||
var judgeRule = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => x.JudgeRuleEnum).FirstNotNullAsync();
|
var judgeRule = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => x.JudgeRuleEnum).FirstNotNullAsync();
|
||||||
var displayQuestionIds = (await GetJudgeDisplayQuestions(taskInfo.TrialReadingCriterionId, taskInfo.VisitTaskNum, judgeRule, true)).Select(x => x.Id).ToList();
|
var displayQuestionIds = (await GetJudgeDisplayQuestions(taskInfo.TrialReadingCriterionId, readingTask.VisitTaskNum, judgeRule, true)).Select(x => x.Id).ToList();
|
||||||
var submittedQuestionIds = inDto.QuestionList.Select(x => x.ReadingQuestionId).ToList();
|
var submittedQuestionIds = inDto.QuestionList.Select(x => x.ReadingQuestionId).ToList();
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue