页面修改

Edu.Model/Entity/Exam/RB_Student_Practice.cs

@@ -52,7 +52,7 @@ namespace Edu.Model.Entity.Exam
 		/// <summary>
 		/// 问题类型编号
 		/// </summary>
-		public int? QuestionTypeId { get; set; }
+		public int QuestionTypeId { get; set; }
 
 		/// <summary>
 		/// 问题类型Key

Edu.Module.Exam/CourseExamModule.cs

@@ -690,6 +690,11 @@ namespace Edu.Module.Exam
                 readingFinishCount = finishList?.Where(qitem => qitem.Category == Common.Enum.Course.QuestionCategoryEnum.ReadingChoose)?.Count() ?? 0;
                 listeningFinishCount = finishList?.Where(qitem => qitem.Category == Common.Enum.Course.QuestionCategoryEnum.Listening)?.Count() ?? 0;
                 grammarFinishCount = finishList?.Where(qitem => qitem.Category == Common.Enum.Course.QuestionCategoryEnum.ChooseGrammarUse)?.Count() ?? 0;
+                wordsTotalCount = finishList?.Where(qitem =>
+                qitem.Category == Common.Enum.Course.QuestionCategoryEnum.ChooseWord
+               || qitem.Category == Common.Enum.Course.QuestionCategoryEnum.ChooseMean
+               || qitem.Category == Common.Enum.Course.QuestionCategoryEnum.ChooseWordUse
+               )?.Count() ?? 0;
             }
             var list = questionRepository.GetQuestionCategoryListRepository(query);
             if (list != null && list.Count > 0)
@@ -697,6 +702,11 @@ namespace Edu.Module.Exam
                 readingTotalCount = list?.Where(qitem => qitem.Category == Common.Enum.Course.QuestionCategoryEnum.ReadingChoose)?.Sum(qitem => qitem.QuestionCount) ?? 0;
                 listeningTotalCount = list?.Where(qitem => qitem.Category == Common.Enum.Course.QuestionCategoryEnum.Listening)?.Sum(qitem => qitem.QuestionCount) ?? 0;
                 grammarTotalCount = list?.Where(qitem => qitem.Category == Common.Enum.Course.QuestionCategoryEnum.ChooseGrammarUse)?.Sum(qitem => qitem.QuestionCount) ?? 0;
+                wordsTotalCount = list?.Where(qitem =>
+                qitem.Category == Common.Enum.Course.QuestionCategoryEnum.ChooseWord
+                || qitem.Category == Common.Enum.Course.QuestionCategoryEnum.ChooseMean
+                || qitem.Category == Common.Enum.Course.QuestionCategoryEnum.ChooseWordUse
+                )?.Sum(qitem => qitem.QuestionCount) ?? 0;
             }
             obj = new
             {
@@ -919,6 +929,16 @@ namespace Edu.Module.Exam
             return result;
         }
 
+        /// <summary>
+        /// 判断是否存在学生练习
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool ExistsStudentPracticeModule(RB_Student_Practice_Extend model)
+        {
+            return false;
+        }
+
         /// <summary>
         /// 新增修改学员练习
         /// </summary>

Edu.WebApi/Controllers/Exam/ExamController.cs

@@ -968,7 +968,7 @@ namespace Edu.WebApi.Controllers.Exam
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetAppQuestionStaticModule()
+        public ApiResult GetAppQuestionStatic()
         {
             var query = new RB_Question_ViewModel()
             {
@@ -984,13 +984,13 @@ namespace Edu.WebApi.Controllers.Exam
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetQuestionWordsList()
+        public ApiResult GetQuestionWords()
         {
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
             var query = new RB_Question_ViewModel()
             {
                 BankType = (LevelTypeEnum)base.ParmJObj.GetInt("BankType"),
-                QCategoryId = base.ParmJObj.GetStringValue("QCategoryId"),
+                QCategoryId = string.Format("{0},{1},{2}", (int)QuestionCategoryEnum.ChooseWord, (int)QuestionCategoryEnum.ChooseMean, (int)QuestionCategoryEnum.ChooseWordUse),
             };
             var list = courseExamModule.GetAppQuestionCategoryListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             pageModel.Count = rowsCount;
@@ -1090,5 +1090,32 @@ namespace Edu.WebApi.Controllers.Exam
             pageModel.PageData = list;
             return ApiResult.Success(data: pageModel);
         }
+
+        /// <summary>
+        /// 学员提交联系结果
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetStudentPractice()
+        {
+            var model = new RB_Student_Practice_Extend()
+            {
+                Id=base.ParmJObj.GetInt("Id"),
+                StudentId=base.ParmJObj.GetInt("StudentId"),
+                Category=(QuestionCategoryEnum)base.ParmJObj.GetInt("Category"),
+                LevelType=(LevelTypeEnum)base.ParmJObj.GetInt("LevelType"),
+                QuestionId=base.ParmJObj.GetInt("QuestionId"),
+                Title=base.ParmJObj.GetStringValue("Title"),
+                QuestionContent=base.ParmJObj.GetStringValue("QuestionContent"),
+                QuestionTypeId=base.ParmJObj.GetInt("QuestionTypeId"),
+                QuestionTypeKey=base.ParmJObj.GetStringValue("QuestionTypeKey"),
+                Answer=base.ParmJObj.GetStringValue("Answer"),
+                AnswerParse=base.ParmJObj.GetStringValue("AnswerParse"),
+                IsAnswer=base.ParmJObj.GetInt("IsAnswer"),
+                IsWrong=base.ParmJObj.GetInt("IsWrong"),
+            };
+            bool flag = courseExamModule.SetStudentPracticeModule(model);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
     }
 }
\ No newline at end of file