页面修改

Edu.Model/ViewModel/Exam/RB_StuWords_Exam_Extend.cs

@@ -14,5 +14,21 @@ namespace Edu.Model.ViewModel.Exam
         /// 单词考试详情
         /// </summary>
         public List<RB_StuWords_ExamDetail_Extend> ExamDetailList { get; set; }
+
+        /// <summary>
+        /// 学习分钟数
+        /// </summary>
+        public string ExamMinutes
+        {
+            get
+            {
+                string str = "";
+                if (this.ExamStartTime != null && this.ExamEndTime != null)
+                {
+                    str = Common.ConvertHelper.CalcMinutes(Convert.ToDateTime(this.ExamStartTime), Convert.ToDateTime(this.ExamEndTime)).ToString();
+                }
+                return str;
+            }
+        }
     }
 }

Edu.Module.Exam/CourseExamModule.cs

@@ -198,7 +198,9 @@ namespace Edu.Module.Exam
                         var cItem = tempList[i];
                         options.Add(new optionItem()
                         {
-                            Content = !string.IsNullOrEmpty(cItem.WordContent) ? cItem.WordContent : (totalList?.FirstOrDefault(qitem => !string.IsNullOrEmpty(qitem.WordContent))?.WordContent ?? ""),
+                            Content = !string.IsNullOrEmpty(cItem.WordContent)
+                            ? cItem.WordContent 
+                            : (totalList?.FirstOrDefault(qitem => qitem.Id != item.Id &&!string.IsNullOrEmpty(qitem.WordContent))?.WordContent ?? ""),
                             IsAnswer = false,
                             Name = "",
                             ShowName = "",
@@ -223,7 +225,9 @@ namespace Edu.Module.Exam
                             var cItem = tempList[i];
                             options.Add(new optionItem()
                             {
-                                Content = !string.IsNullOrEmpty(cItem.WordContent) ? cItem.WordContent : (totalList?.FirstOrDefault(qitem => !string.IsNullOrEmpty(qitem.WordContent))?.WordContent ?? ""),
+                                Content = !string.IsNullOrEmpty(cItem.WordContent) 
+                                ? cItem.WordContent : 
+                                (totalList?.FirstOrDefault(qitem => qitem.Id != item.Id&&!string.IsNullOrEmpty(qitem.WordContent))?.WordContent ?? ""),
                                 IsAnswer = false,
                                 Name = "",
                                 ShowName = "",
@@ -252,7 +256,9 @@ namespace Edu.Module.Exam
                             var cItem = tempList[i];
                             options.Add(new optionItem()
                             {
-                                Content = !string.IsNullOrEmpty(cItem.WordWrite) ? cItem.WordWrite : (totalList?.FirstOrDefault(qitem => !string.IsNullOrEmpty(qitem.WordWrite))?.WordWrite ?? ""),
+                                Content = !string.IsNullOrEmpty(cItem.WordWrite) 
+                                ? cItem.WordWrite 
+                                :(totalList?.FirstOrDefault(qitem => qitem.Id != item.Id &&!string.IsNullOrEmpty(qitem.WordWrite))?.WordWrite ?? ""),
                                 IsAnswer = false,
                                 Name = "",
                                 ShowName = "",
@@ -299,6 +305,13 @@ namespace Edu.Module.Exam
             return singleObj;
         }
 
+        /// <summary>
+        /// 生成默认的选择题
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="totalList"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
         public string CreateDefaultQuestion(RB_Course_Words_Extend item, List<RB_Course_Words_Extend> totalList, List<optionItem> options)
         {
             string title = string.Format("请选择【{0}】单词的正确中文意思.", item.WordContent);
@@ -314,7 +327,8 @@ namespace Edu.Module.Exam
                 var cItem = totalList[i];
                 options.Add(new optionItem()
                 {
-                    Content = !string.IsNullOrEmpty(cItem.ChineseMean) ? cItem.ChineseMean : (totalList?.FirstOrDefault(qitem => !string.IsNullOrEmpty(qitem.ChineseMean))?.ChineseMean ?? ""),
+                    Content = !string.IsNullOrEmpty(cItem.ChineseMean) ? cItem.ChineseMean : 
+                    (totalList?.FirstOrDefault(qitem =>qitem.Id!=item.Id && !string.IsNullOrEmpty(qitem.ChineseMean))?.ChineseMean ?? ""),
                     IsAnswer = false,
                     Name = "",
                     ShowName = "",
@@ -478,11 +492,11 @@ namespace Edu.Module.Exam
                 {
                     score = 1;
                 }
-                if (progress > 33 && progress < 70)
+                if (progress > 34 && progress < 66)
                 {
                     score = 2;
                 }
-                if (progress >= 70)
+                if (progress >= 66)
                 {
                     score = 3;
                 }

Edu.WebApi/Controllers/Applet/AppletWordsController.cs

@@ -154,7 +154,12 @@ namespace Edu.WebApi.Controllers.Applet
             }
 
             var flag = courseExamModule.SubmitStuWordsExamModule(model);
-            return flag ? ApiResult.Success(data: model) : ApiResult.Failed();
+            return flag ? ApiResult.Success(data: new
+            {
+                model.Id,
+                model.Score,
+                model.ExamMinutes
+            }) : ApiResult.Failed();
         }
     }
 }