Merge branch 'feature/exam' into dev

合并冲突

src/Hotline.Application/Exam/Service/ExamManages/UserExamService.cs

@@ -340,19 +340,17 @@ namespace Hotline.Application.Exam.Service.ExamManages
                 return startExamViewResponse;
             }
 
-            userExam.ExamStatus = Share.Enums.Exams.EExamStatus.Executing;
+            if (userExam.ExamStatus == EExamStatus.NoStart)
+            {
+                userExam.ExamStatus = Share.Enums.Exams.EExamStatus.Executing;
 
-            userExam.ToUpdate(_sessionContext);
+                userExam.ToUpdate(_sessionContext);
 
-            await _repository.UpdateWithValidateAsync(userExam, cancellationToken);
-   
+                await _repository.UpdateWithValidateAsync(userExam, cancellationToken);
 
+            }
             var examManage = await _examManageRepository.GetAsync(x => x.Id == userExam.ExamId);
 
-            examManage.ExamStatus = EExamStatus.Executing;
-
-            await _examManageRepository.UpdateWithValidateAsync(examManage, cancellationToken);
-
             return new StartExamViewResponse
             {
                 StartTime = userExam.StartTime,
@@ -551,13 +549,13 @@ namespace Hotline.Application.Exam.Service.ExamManages
             var questionScoreTable = questionScoreRepository.Queryable();
 
             var queryable = userExamTable.InnerJoin(userExamItemTable, (e, i) => e.Id == i.UserExamId)
-                .InnerJoin(questionTable, (e, i, q) => i.QuestionId == q.Id)
+                .InnerJoin(questionTable, (e, i, q) => i.QuestionId == q.QuestionId)
                 .LeftJoin(userExamItemOptionTable, (e, i, q, o) => i.Id == o.UserExamItemId)
                 .LeftJoin(quesitonOptionTable, (e, i, q, o, qo) => o.QuestionOptionId == qo.Id)
                 .LeftJoin(examAnswerTable, (e, i, q, o, qo, a) => i.Id == a.UserExamItemId)
                 .LeftJoin(testPaperItemAnswerTable, (e, i, q, o, qo, a, ta) => ta.QuestionId == qo.QuestionId)
                 .InnerJoin(questionScoreTable, (e, i, q, o, qo, a, ta, s) => q.QuestionType == s.QuestionType && e.ExamId == s.ExamManageId)
-            .Where((e, i, q, o, qo, a, ta, s) => q.QuestionType == EQuestionType.Single || q.QuestionType == EQuestionType.Multi || q.QuestionType == EQuestionType.Judge)
+            .Where((e, i, q, o, qo, a, ta, s) => !(q.QuestionType == EQuestionType.Single || q.QuestionType == EQuestionType.Multi || q.QuestionType == EQuestionType.Judge))
             .Select(
             (e, i, q, o, qo, a, ta, s) => new GradingExamQuestionTempDto
             {
@@ -589,7 +587,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
                 Id = g.Key.Id,
                 Score = g.FirstOrDefault().Score,
                 Title = g.FirstOrDefault().Title,
-                CorrectAnswer = g.Key.QuestionType.CheckSelectType() ? string.Join(",", g.Where(i => i.IsAnswer).Select(n => n.Label)) : g.FirstOrDefault()?.CorrectAnswer
+                CorrectAnswer = g.Key.QuestionType.CheckSelectType() ? string.Join(",", g.Where(i => i.IsAnswer).Select(n => n.Label).Distinct()) : g.FirstOrDefault()?.CorrectAnswer
             }).ToList();
 
             return gradingExamQuestionDtos;