页面修改

Edu.Module.Exam/PaperModule.cs

@@ -720,6 +720,7 @@ namespace Edu.Module.Exam
                             gItem.GScore = gItem?.DetailsList?.Sum(qitem => qitem.Score) ?? 0;
                             foreach (var sItem in gItem.DetailsList)
                             {
+                               
                                 List<object> quesAnswerList = new List<object>();
                                 //完型填空
                                 if (sItem.QuestionTypeKey == "cloze")

Edu.Repository/Question/RB_QuestionRepository.cs

@@ -22,10 +22,11 @@ namespace Edu.Repository.Question
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT * 
-FROM  RB_Question
-WHERE 1=1 
+SELECT A.* 
+FROM  RB_Question AS A INNER JOIN rb_question_bank AS B ON A.BankId=B.BankId
+WHERE 1=1 AND B.Status=0
 ");
+
             if (query == null)
             {
                 return new List<RB_Question_ViewModel>();
@@ -34,19 +35,19 @@ WHERE 1=1
             {
                 if (!string.IsNullOrEmpty(query.QBankIds))
                 {
-                    builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Question_ViewModel.BankId), query.QBankIds);
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Question_ViewModel.BankId), query.QBankIds);
                 }
                 if (query.CourseId > 0)
                 {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Question_ViewModel.CourseId), query.CourseId);
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Question_ViewModel.CourseId), query.CourseId);
                 }
                 if (!string.IsNullOrEmpty(query.Q_QuestionTypeIds))
                 {
-                    builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Question_ViewModel.QuestionTypeId), query.Q_QuestionTypeIds);
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Question_ViewModel.QuestionTypeId), query.Q_QuestionTypeIds);
                 }
                 if (!string.IsNullOrEmpty(query.QCategoryId))
                 {
-                    builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Question_ViewModel.Category), query.QCategoryId);
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Question_ViewModel.Category), query.QCategoryId);
                 }
                 return Get<RB_Question_ViewModel>(builder.ToString()).ToList();
             }
@@ -105,7 +106,9 @@ WHERE 1=1 AND `Status`=0
             builder.AppendFormat(@"
 SELECT A.*,IFNULL(B.`Name` ,'') AS QuestionTypeName
 FROM  RB_Question AS A LEFT JOIN RB_Question_Type B ON A.QuestionTypeId=B.QId   
-WHERE 1=1 ");
+      INNER JOIN rb_question_bank AS C ON A.BankId=C.BankId
+WHERE 1=1 AND C.Status=0
+");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Question_ViewModel.Status), (int)DateStateEnum.Normal);
             if (query == null)
             {

Edu.WebApi/Controllers/Exam/ExamController.cs

@@ -159,7 +159,6 @@ namespace Edu.WebApi.Controllers.Exam
                             GId = jobj.GetInt("GId"),
                             PaperId = jobj.GetInt("PaperId"),
                             GroupName = jobj.GetStringValue("GroupName"),
-                           
                             GSortNum = gSortNum,
                             GScore = jobj.GetDecimal("GScore"),
                             DetailsList = new List<RB_Examination_Details_ViewModel>(),
@@ -216,7 +215,7 @@ namespace Edu.WebApi.Controllers.Exam
                                 string msg = analysisQuestion.CheckQuestion(detailModel.QuestionTypeKey, detailModel.QuestionContent, detailModel.Answer, out string newAnswer);
                                 if (!string.IsNullOrEmpty(msg))
                                 {
-                                    return ApiResult.Failed(message: msg);
+                                    return ApiResult.Failed(message: "【" + detailModel.Title + "】" + msg);
                                 }
                                 else
                                 {