Merge branch 'dev' of http://110.188.24.182:10023/Fengwo/hotline into dev

src/Hotline.Api/Controllers/Exam/UserExamController.cs

@@ -38,9 +38,9 @@ namespace Hotline.Api.Controllers.Exam
         /// <param name="startUserExamDto"></param>
         /// <returns></returns>
         [HttpPost(UserExamApiRoute.Start)]
-        public async Task Start([FromBody] StartUserExamDto startUserExamDto)
+        public async Task<StartExamViewResponse> Start([FromBody] StartUserExamDto startUserExamDto)
         {
-            await _userExamService.StartUserExamAsync(startUserExamDto, HttpContext.RequestAborted);
+            return await _userExamService.StartUserExamAsync(startUserExamDto, HttpContext.RequestAborted);
         }
 
         /// <summary>

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

@@ -332,9 +332,9 @@ namespace Hotline.Application.Exam.Service.ExamManages
                     _sessionContext
                     );
 
-                await _examManageProxy.DeleteExamQuestions(generateExamTestPaperRequest.TestPaperId, cancellationToken);
+                await _examManageProxy.DeleteExamQuestions(generateExamTestPaperRequest.ExamManageId, cancellationToken);
 
-                await _examManageProxy.GenerateQuestion(questions, generateExamTestPaperRequest.TestPaperId, cancellationToken);
+                await _examManageProxy.GenerateQuestion(questions, generateExamTestPaperRequest.ExamManageId, cancellationToken);
             }
         }
 

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

@@ -122,6 +122,9 @@ namespace Hotline.Application.Exam.Service.ExamManages
 
         public async Task<List<ExamQuestionViewResponse>> GetExamQuestionViewResponses(ExamQuestionGroupRequest examQuestionGroupRequest)
         {
+            if (examQuestionGroupRequest.ExamId.IsNull() && examQuestionGroupRequest.UserId.IsNull())
+                throw UserFriendlyException.SameMessage("查询参数不能为空");
+
             var expression = examQuestionGroupRequest.GetExpression();
             var examManageTable = new ExamRepository<ExamManage>(_uow, _dataPermissionFilterBuilder, _serviceProvider).Queryable().Where(expression);
             var testPaperItemTable = new ExamRepository<ExamQuestion>(_uow, _dataPermissionFilterBuilder, _serviceProvider).Queryable();