Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/Entity/Question/RB_Question_Type.cs

@@ -35,10 +35,5 @@ namespace Edu.Model.Entity.Question
 		/// 删除状态
 		/// </summary>
 		public DateStateEnum Status { get; set; }
-
-		/// <summary>
-		/// JSON配置
-		/// </summary>
-		public string JsonConfig { get; set; }
 	}
 }

Edu.Model/ViewModel/Question/RB_Question_Type_ViewModel.cs

@@ -30,15 +30,15 @@ namespace Edu.Model.ViewModel.Question
     /// 选择题选项列表【单选、多选、判断题】
     /// </summary>
     public class optionItem
-    { 
+    {
         /// <summary>
         /// 选项编号【例如:A,B,C,D】
         /// </summary>
         public string Name { get; set; }
 
-       /// <summary>
-       /// 选项内容
-       /// </summary>
+        /// <summary>
+        /// 选项内容
+        /// </summary>
         public string Content { get; set; }
 
         /// <summary>
@@ -73,4 +73,35 @@ namespace Edu.Model.ViewModel.Question
         /// </summary>
         public string Content { get; set; }
     }
+
+    /// <summary>
+    /// 阅读理解
+    /// </summary>
+    public class readingComprehensioItem
+    {
+        /// <summary>
+        /// 问题类型(5-种基本题型)
+        /// </summary>
+        public int QuestionType { get; set; }
+
+        /// <summary>
+        /// 问题类型Key
+        /// </summary>
+        public string QuestionKey { get; set; }
+
+        /// <summary>
+        /// 问题类型名称
+        /// </summary>
+        public string QuestionName { get; set; }
+
+        /// <summary>
+        /// 题目名称
+        /// </summary>
+        public string SubTitle { get; set; }
+
+        /// <summary>
+        /// 题目答案内容
+        /// </summary>
+        public object SubAnwser { get; set; }
+    }
 }
\ No newline at end of file

Edu.Module.Question/AnalysisQuestionTypeModule.cs

@@ -73,6 +73,86 @@ namespace Edu.Module.Question
                 case "cloze":
                     obj = Common.Plugin.JsonHelper.DeserializeObject<List<List<optionItem>>>(data);
                     break;
+                //阅读理解
+                case "reading-comprehensio":
+                    var readingList = Common.Plugin.JsonHelper.DeserializeObject<List<readingComprehensioItem>>(data);
+                    if (readingList != null && readingList.Count > 0)
+                    {
+                        foreach (var item in readingList)
+                        {
+                            switch (item.QuestionKey)
+                            {
+                                //单选题
+                                case "single":
+                                    item.SubAnwser = Common.Plugin.JsonHelper.DeserializeObject<List<optionItem>>(item.SubAnwser.ToString());
+                                    break;
+                                //多选题
+                                case "multiple":
+                                    item.SubAnwser = Common.Plugin.JsonHelper.DeserializeObject<List<optionItem>>(item.SubAnwser.ToString());
+                                    break;
+                                //填空题
+                                case "fill-in":
+                                    item.SubAnwser = Common.Plugin.JsonHelper.DeserializeObject<List<fillInItem>>(item.SubAnwser.ToString());
+                                    break;
+                                //判断题
+                                case "judge":
+                                    item.SubAnwser = Common.Plugin.JsonHelper.DeserializeObject<List<optionItem>>(item.SubAnwser.ToString());
+                                    break;
+                                //简答题
+                                case "short-answer":
+                                    item.SubAnwser = Common.Plugin.JsonHelper.DeserializeObject<List<fillInItem>>(item.SubAnwser.ToString());
+                                    break;
+                            }
+                        }
+                    }
+                    obj = readingList;
+                    break;
+                //口语题
+                case "spoken":
+                    obj = data;
+                    break;
+                //听力题
+                case "listening":
+                    var listenList = Common.Plugin.JsonHelper.DeserializeObject<List<readingComprehensioItem>>(data);
+                    if (listenList != null && listenList.Count > 0)
+                    {
+                        foreach (var item in listenList)
+                        {
+                            switch (item.QuestionKey)
+                            {
+                                //单选题
+                                case "single":
+                                    item.SubAnwser = Common.Plugin.JsonHelper.DeserializeObject<List<optionItem>>(item.SubAnwser.ToString());
+                                    break;
+                                //多选题
+                                case "multiple":
+                                    item.SubAnwser = Common.Plugin.JsonHelper.DeserializeObject<List<optionItem>>(item.SubAnwser.ToString());
+                                    break;
+                                //填空题
+                                case "fill-in":
+                                    item.SubAnwser = Common.Plugin.JsonHelper.DeserializeObject<List<fillInItem>>(item.SubAnwser.ToString());
+                                    break;
+                                //判断题
+                                case "judge":
+                                    item.SubAnwser = Common.Plugin.JsonHelper.DeserializeObject<List<optionItem>>(item.SubAnwser.ToString());
+                                    break;
+                                //简答题
+                                case "short-answer":
+                                    item.SubAnwser = Common.Plugin.JsonHelper.DeserializeObject<List<fillInItem>>(item.SubAnwser.ToString());
+                                    break;
+                            }
+                        }
+                    }
+                    obj = listenList;
+                    break;
+                //共用选择题
+                case "sharing-choose":
+                    obj = Common.Plugin.JsonHelper.DeserializeObject<List<List<matchingItem>>>(data);
+                    break;
+                //其它题
+                case "other":
+                    obj = data;
+                    break;
             }
             return obj;
         }

Edu.Repository/Question/RB_QuestionRepository.cs

@@ -72,6 +72,7 @@ WHERE 1=1 ");
                     builder.AppendFormat(" AND A.{0} LIKE @Title ", nameof(RB_Question_ViewModel.Title));
                     parameters.Add("Title", "%" + query.Title.Trim() + "%");
                 }
+                builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Question_ViewModel.QuestionId));
                 return GetPage<RB_Question_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
             }
         }