新增验证

Edu.Model/ViewModel/Question/RB_Question_ViewModel.cs

 using Edu.Common;
+using Edu.Common.Enum.Exam;
 using Edu.Common.Plugin;
 using System.Collections.Generic;
 
@@ -122,5 +123,10 @@ namespace Edu.Model.ViewModel.Question
         /// 阅读理解、听力、完型，答案列表
         /// </summary>
         public List<object> QuestionAnswerList { get; set; }
+
+        /// <summary>
+        /// 题库类型(见枚举)
+        /// </summary>
+        public BankTypeEnum BankType { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Exam/CourseExamModule.cs

@@ -8,6 +8,8 @@ using Edu.Model.ViewModel.Question;
 using Edu.Repository.Exam;
 using Edu.Model.ViewModel.Exam;
 using VT.FW.DB;
+using Edu.Repository.Question;
+using Edu.Module.Question;
 
 namespace Edu.Module.Exam
 {
@@ -41,6 +43,17 @@ namespace Edu.Module.Exam
         /// </summary>
         private readonly RB_StuWords_ExamDetailRepository stuWords_ExamDetailRepository = new RB_StuWords_ExamDetailRepository();
 
+        /// <summary>
+        /// 问题仓储层对象
+        /// </summary>
+        private readonly RB_QuestionRepository questionRepository = new RB_QuestionRepository();
+
+        /// <summary>
+        /// 问题解析处理类
+        /// </summary>
+        private readonly AnalysisQuestionTypeModule analysisQuestion = new AnalysisQuestionTypeModule();
+
+        #region 单词测试和复习
         /// <summary>
         /// 生成课程复习和预习单词
         /// </summary>
@@ -634,5 +647,35 @@ namespace Edu.Module.Exam
             var list = stuWords_ExamRepository.GetStuWordsExamListRepository(query);
             return list;
         }
+
+        #endregion
+
+        #region 题库相关测试
+
+        public List<object> GetAppQuestionCategoryListModule(RB_Question_ViewModel query)
+        {
+            List<object> list = new List<object>();
+           var dataList= questionRepository.GetQuestionListRepository( query);
+            if (dataList != null && dataList.Count > 0)
+            {
+                foreach (var item in dataList)
+                {
+                    var QuestionContentObj = analysisQuestion.ParsingQuestion(item.QuestionTypeKey, item.QuestionContent);
+                    var obj = new
+                    {
+                        item.QuestionId,
+                        item.QuestionTypeId,
+                        item.QuestionTypeKey,
+                        item.Title,
+                        QuestionContentObj
+                    };
+                    list.Add(obj);
+                }
+            }
+           return list;
+        }
+ 
+        #endregion
+
     }
 }

Edu.Repository/Question/RB_QuestionRepository.cs

@@ -48,6 +48,10 @@ WHERE 1=1 AND B.Status=0
                 {
                     builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Question_ViewModel.Category), query.QCategoryId);
                 }
+                if (query.BankType > 0)
+                {
+                    builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_Question_ViewModel.BankType), (int)query.BankType);
+                }
                 return Get<RB_Question_ViewModel>(builder.ToString()).ToList();
             }
         }

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -1207,6 +1207,10 @@ namespace Edu.WebApi.Controllers.Course
             {
                 return ApiResult.ParamIsNull(message: "请选择签到学员!");
             }
+            if (list != null && list.Where(qitem => qitem.TeacherId <= 0).Count() > 0)
+            {
+                return ApiResult.ParamIsNull(message: "未设置上课老师!请联系学管!");
+            }
             #region 验证是否已轧账
             string MonthStr = list.FirstOrDefault().ClassDate.ToString("yyyy-MM");
             int schoolId = list.FirstOrDefault().School_Id;

Edu.WebApi/Controllers/Exam/ExamController.cs

@@ -45,6 +45,11 @@ namespace Edu.WebApi.Controllers.Exam
         /// </summary>
         private readonly AnalysisQuestionTypeModule analysisQuestion = new AnalysisQuestionTypeModule();
 
+        /// <summary>
+        /// 课程测试处理类对象
+        /// </summary>
+        private readonly CourseExamModule courseExamModule = AOP.AOPHelper.CreateAOPObject<CourseExamModule>();
+
         /// <summary>
         /// 获取试卷分页列表
         /// </summary>
@@ -958,6 +963,37 @@ namespace Edu.WebApi.Controllers.Exam
             return result ? ApiResult.Success("阅卷成功!") : ApiResult.Failed("阅卷失败!");
         }
 
-       //public ApiResult 
+
+        /// <summary>
+        /// 甲小鹤小程序获取题库单词训练
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetQuestionWordsList()
+        {
+            var query = new RB_Question_ViewModel()
+            {
+                BankType = (BankTypeEnum)base.ParmJObj.GetInt("BankType"),
+                QCategoryId = base.ParmJObj.GetStringValue("QCategoryId"),
+            };
+            var list = courseExamModule.GetAppQuestionCategoryListModule(query);
+            return ApiResult.Success(data: list);
+        }
+
+        /// <summary>
+        /// 甲小鹤小程序获取题库语法训练
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetQuestionGrammar()
+        {
+            var query = new RB_Question_ViewModel()
+            {
+                BankType = (BankTypeEnum)base.ParmJObj.GetInt("BankType"),
+                QCategoryId = base.ParmJObj.GetStringValue("QCategoryId"),
+            };
+            var list = courseExamModule.GetAppQuestionCategoryListModule(query);
+            return ApiResult.Success(data: list);
+        }
     }
 }
\ No newline at end of file