页面修改

Edu.Model/Entity/Exam/RB_Student_Practice.cs

@@ -88,5 +88,10 @@ namespace Edu.Model.Entity.Exam
 		/// 是否复习
 		/// </summary>
 		public int IsReview { get; set; }
+
+		/// <summary>
+		/// 测评次数
+		/// </summary>
+		public int Times { get; set; }
 	}
 }

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -410,5 +410,10 @@ namespace Edu.Model.ViewModel.User
         /// 客户状态(1-有效，2-无效)
         /// </summary>
         public int QStudentStatus { get; set; }
+
+        /// <summary>
+        /// 开发题库
+        /// </summary>
+        public string OpenBankLevel { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Course/CourseModule.cs

@@ -224,7 +224,7 @@ namespace Edu.Module.Course
                     item.OpenBankLevelList = new List<int>();
                     if (!string.IsNullOrEmpty(item.OpenBankLevel))
                     {
-                        item.OpenBankLevelList = Common.ConvertHelper.StringToList(item.OpenBankLevel);
+                        item.OpenBankLevelList = Common.Plugin.JsonHelper.DeserializeObject<List<int>>(item.OpenBankLevel);
                     }
                     item.OpenBankLevelNameList = new List<string>();
                     if (item.OpenBankLevelList != null && item.OpenBankLevelList.Count > 0)
@@ -282,7 +282,7 @@ namespace Edu.Module.Course
                 }
                 if (!string.IsNullOrEmpty(extModel.OpenBankLevel))
                 {
-                    extModel.OpenBankLevelList = Common.ConvertHelper.StringToList(extModel.OpenBankLevel);
+                    extModel.OpenBankLevelList = Common.Plugin.JsonHelper.DeserializeObject<List<int>>(extModel.OpenBankLevel);
                 }
             }
             return extModel;

Edu.Module.Exam/CourseExamModule.cs

@@ -684,15 +684,19 @@ namespace Edu.Module.Exam
             int readingTotalCount = 0;
             int readingFinishCount = 0;
             int readingStartId = 0;
+            int readingTimes = 1;
             int listeningTotalCount = 0;
             int listeningFinishCount = 0;
             int listeningStartId = 0;
+            int listeningTimes = 1;
             int grammarTotalCount = 0;
             int grammarFinishCount = 0;
             int grammarStartId = 0;
+            int grammarTimes = 1;
             int wordsTotalCount = 0;
             int wordsFinishCount = 0;
             int wordsStartId = 0;
+            int wordsTimes = 1;
             var sQuery = new RB_Student_Practice_Extend()
             {
                 StudentId = StudentId,
@@ -704,6 +708,12 @@ namespace Edu.Module.Exam
                 var tempReadingList = finishList?.Where(qitem => qitem.Category == Common.Enum.Course.QuestionCategoryEnum.ReadingChoose)?.ToList();
                 readingFinishCount = tempReadingList?.Count() ?? 0;
                 readingStartId = tempReadingList != null && tempReadingList.Count > 0 ? (tempReadingList?.Max(qitem => qitem.QuestionId) ?? 0) : 0;
+                //if (readingStartId == readingFinishCount&& readingFinishCount>0)
+                //{
+                //    readingStartId = 0;
+                //    readingTimes = tempReadingList?.FirstOrDefault()?.Times ?? 1;
+                //    readingFinishCount = 0;
+                //}
 
                 var tempListeningList = finishList?.Where(qitem => qitem.Category == Common.Enum.Course.QuestionCategoryEnum.Listening)?.ToList();
                 listeningFinishCount = tempListeningList?.Count() ?? 0;
@@ -738,15 +748,19 @@ namespace Edu.Module.Exam
                 readingFinishCount,
                 readingTotalCount,
                 readingStartId,
+                readingTimes,
                 listeningFinishCount,
                 listeningTotalCount,
                 listeningStartId,
+                listeningTimes,
                 grammarTotalCount,
                 grammarFinishCount,
                 grammarStartId,
+                grammarTimes,
                 wordsTotalCount,
                 wordsFinishCount,
                 wordsStartId,
+                wordsTimes,
             };
             return obj;
         }

Edu.Module.User/StudentModule.cs

@@ -649,9 +649,9 @@ namespace Edu.Module.User
         /// </summary>
         /// <param name="teacherIds"></param>
         /// <returns></returns>
-        public List<RB_Student_ViewModel> GetStudentInfo(int Student_Id, int Group_Id)
+        public List<RB_Student_ViewModel> GetStudentInfoModule(int Student_Id, int Group_Id)
         {
-            return studentRepository.GetStudentInfo(Student_Id, Group_Id);
+            return studentRepository.GetStudentInfoRepository(Student_Id, Group_Id);
         }
 
         /// <summary>

Edu.Repository/User/RB_StudentRepository.cs

@@ -492,16 +492,17 @@ where b.`Status`=0 and b.ClassStatus in(1,2) and  a.status=0 and  a.Account_Id={
         /// </summary>
         /// <param name="teacherIds"></param>
         /// <returns></returns>
-        public List<RB_Student_ViewModel> GetStudentInfo(int Student_Id, int Group_Id)
+        public List<RB_Student_ViewModel> GetStudentInfoRepository(int Student_Id, int Group_Id)
         {
             var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat($@"
 SELECT s.*,sog.GuestId,o.OrderState,cou.CourseName,cou.CourseId,cou.B2BIcon,cou.B2BBackground,c.ClassName,c.ClassId,c.ClassScrollType,
-case when og.TotalHours <= og.CompleteHours then 3 else
-case when og.CompleteHours = 0 then 1 else
-case when og.TotalHours > og.CompleteHours then 2 else 0 end end end as ClassStatus,
-sch.SName,sch.SId,t.TeacherName,o.EnterID,og.TotalHours,og.CompleteHours, if((og.ValidClassHours-og.CompleteHours)<0,0,(og.ValidClassHours-og.CompleteHours))  as SurplusHours  
+       case when og.TotalHours <= og.CompleteHours then 3 else
+       case when og.CompleteHours = 0 then 1 else
+       case when og.TotalHours > og.CompleteHours then 2 else 0 end end end as ClassStatus,
+       sch.SName,sch.SId,t.TeacherName,o.EnterID,og.TotalHours,og.CompleteHours, if((og.ValidClassHours-og.CompleteHours)<0,0,(og.ValidClassHours-og.CompleteHours))  as SurplusHours
+       ,cou.OpenBankLevel
 FROM rb_student as s LEFT JOIN rb_student_orderguest as sog on s.StuId=sog.Student_Id
     LEFT JOIN rb_order_guest as og on og.Id=sog.GuestId  
     LEFT JOIN rb_order as o on og.OrderId=o.OrderId

Edu.WebApi/Controllers/Applet/AppletIndexController.cs

@@ -83,7 +83,7 @@ namespace Edu.WebApi.Controllers.Applet
         {
             var appletUserInfo = base.AppletUserInfo;
             //判断学员是否退学
-            var studentList = studentModule.GetStudentInfo(appletUserInfo.AccountId, appletUserInfo.Group_Id);
+            var studentList = studentModule.GetStudentInfoModule(appletUserInfo.AccountId, appletUserInfo.Group_Id);
             if (studentList == null || !studentList.Any())
             {
                 return ApiResult.Failed(message: $"很抱歉，由于你已经退学/已毕业，无法继续使用本系统", new { Error = 3 });
@@ -216,12 +216,36 @@ namespace Edu.WebApi.Controllers.Applet
         {
             var appletUserInfo = base.AppletUserInfo;
             //判断学员是否退学
-            var studentList = studentModule.GetStudentInfo(appletUserInfo.AccountId, appletUserInfo.Group_Id);
-
+            var studentList = studentModule.GetStudentInfoModule(appletUserInfo.AccountId, appletUserInfo.Group_Id);
+            List<int> BankTypeList = new List<int>();
             //获取正在学习的班级 /未开班/已结班
             RB_Student_ViewModel studentModel = new RB_Student_ViewModel();
             if (studentList.Any())
             {
+                foreach (var item in studentList)
+                {
+                    if (!string.IsNullOrEmpty(item.OpenBankLevel))
+                    {
+                        try
+                        {
+                            var tempList = Common.Plugin.JsonHelper.DeserializeObject<List<int>>(item.OpenBankLevel);
+                            if (tempList != null && tempList.Count > 0)
+                            {
+                                foreach (var sItem in tempList)
+                                {
+                                    if (!BankTypeList.Contains(sItem))
+                                    {
+                                        BankTypeList.Add(sItem);
+                                    }
+                                }
+                            }
+                        }
+                        catch(Exception ex)
+                        {
+                            Common.Plugin.LogHelper.Write(ex, "GetIndexInfo_V2_OpenBankLevel");
+                        }
+                    }
+                }
                 studentModel = studentList.Where(x => x.ClassStatus == 2).FirstOrDefault();
                 if (studentModel == null || studentModel.StuId == 0)
                 {
@@ -354,7 +378,8 @@ namespace Edu.WebApi.Controllers.Applet
                 studentModel.ClassScrollType,
                 ClassNext,
                 LearningGardenList,
-                Words
+                Words,
+                BankTypeList
             });
 
         }
@@ -368,7 +393,7 @@ namespace Edu.WebApi.Controllers.Applet
         {
             var appletUserInfo = base.AppletUserInfo;
             //判断学员是否退学
-            var studentList = studentModule.GetStudentInfo(appletUserInfo.AccountId, appletUserInfo.Group_Id);
+            var studentList = studentModule.GetStudentInfoModule(appletUserInfo.AccountId, appletUserInfo.Group_Id);
             if (studentList == null || !studentList.Any())
             {
                 return ApiResult.Failed(message: $"很抱歉，由于你已经退学，无法继续使用本系统", new { Error = 3 });
@@ -412,7 +437,7 @@ namespace Edu.WebApi.Controllers.Applet
         {
             var appletUserInfo = base.AppletUserInfo;
             //获取学生所有的课程
-            var studentList = studentModule.GetStudentInfo(appletUserInfo.AccountId, appletUserInfo.Group_Id);
+            var studentList = studentModule.GetStudentInfoModule(appletUserInfo.AccountId, appletUserInfo.Group_Id);
             studentList = studentList.OrderByDescending(x => x.ClassStatus).ToList();
 
             return ApiResult.Success("", studentList.Select(x => new

Edu.WebApi/Controllers/Applet/AppletLoginController.cs

@@ -85,7 +85,6 @@ namespace Edu.WebApi.Controllers.APP
         [AllowAnonymous]
         public ApiResult Login()
         {
-
             JObject jobj = JObject.Parse(RequestParm.Msg.ToString());
             string account = jobj.GetStringValue("Account");
             string password = jobj.GetStringValue("Password");
@@ -123,7 +122,7 @@ namespace Edu.WebApi.Controllers.APP
                 }
 
                 //判断学员是否退学
-                var studentList = studentModule.GetStudentInfo(model.AccountId, model.Group_Id);
+                var studentList = studentModule.GetStudentInfoModule(model.AccountId, model.Group_Id);
                 RB_Student_ViewModel studentModel = new RB_Student_ViewModel();
                 //if (studentList == null || !studentList.Any())
                 //{
@@ -313,7 +312,7 @@ namespace Edu.WebApi.Controllers.APP
                 }
 
                 //判断学员是否退学
-                var studentList = studentModule.GetStudentInfo(model.AccountId, model.Group_Id);
+                var studentList = studentModule.GetStudentInfoModule(model.AccountId, model.Group_Id);
                 //if (studentList == null || !studentList.Any())
                 //{
                 //    return ApiResult.Failed(message: $"很抱歉，由于你已经退学，无法继续使用本系统", new { Error = 3 });

Edu.WebApi/Controllers/Exam/ExamController.cs

@@ -1134,6 +1134,7 @@ namespace Edu.WebApi.Controllers.Exam
                 IsAnswer=base.ParmJObj.GetInt("IsAnswer"),
                 IsWrong=base.ParmJObj.GetInt("IsWrong"),
                 StudentAnswer=base.ParmJObj.GetStringValue("StudentAnswer"),
+                Times=base.ParmJObj.GetInt("Times"),
             };
             bool flag = courseExamModule.SetStudentPracticeModule(model);
             return flag ? ApiResult.Success() : ApiResult.Failed();