页面修改

Edu.Model/ViewModel/Scroll/RB_Scroll_Appointment_ViewModel.cs

@@ -131,6 +131,11 @@ namespace Edu.Model.ViewModel.Scroll
         /// </summary>
         public int TotalChapterNo { get; set; }
 
+        /// <summary>
+        /// 已完成最大章节数
+        /// </summary>
+        public int CourseChapterNo { get; set; }
+
         /// <summary>
         /// 学生列表
         /// </summary>

Edu.Module.Course/ClassModule.cs

@@ -4781,10 +4781,7 @@ namespace Edu.Module.Course
                             qitem.ShiftSort == item.Key.ShiftSort &&
                             qitem.CourseSTime == item.Key.CourseSTime
                             ).ToList();
-                            if (Common.ConvertHelper.FormatDate(ClassDate) == "2022-07-08")
-                            {
-                                string str = "";
-                            }
+                     
                             subList.Add(new
                             {
                                 ClassType = 3,
@@ -4814,6 +4811,7 @@ namespace Edu.Module.Course
                                     qitem.LearnCourseId,
                                     qitem.LearnCourseName,
                                     qitem.CourseGradeNo,
+                                    FinishChapterNoName= chatperList?.FirstOrDefault(sItem => sItem.CourseId == qitem.LearnCourseId && sItem.ChapterNo == qitem.CourseChapterNo.ToString())?.ChapterName,
                                     CourseChapterNoName = chatperList?.FirstOrDefault(sItem => sItem.CourseId == qitem.LearnCourseId && sItem.ChapterNo == qitem.CourseGradeNo.ToString())?.ChapterName
                                 }),
                                 AppointState = item.Where(x => x.State == CourseAppointStateEnum.WaitSure).Any() ? 1 : 2,

Edu.Repository/Scroll/RB_Scroll_AppointmentRepository.cs

@@ -255,7 +255,7 @@ ORDER BY r.Id desc ";
 
             string sql = $@" 
 SELECT r.*,c.AccountId as TeacherId,c.WorkUserId,t.TeacherName,t.TeacherHead,s.StuName,sch.OpenId as StuOpenId,cou.CourseName,cou.ScrollMinNum,cou.ScrollMaxNum,cou.CourseTimeId,cr.RoomName
-       ,cr.School_Id as RoomSchoolId,sc.SName as RoomSchoolName ,og.TotalChapterNo,IFNULL(c2.CourseName,'') AS LearnCourseName
+       ,cr.School_Id as RoomSchoolId,sc.SName as RoomSchoolName ,og.TotalChapterNo,IFNULL(c2.CourseName,'') AS LearnCourseName,og.CourseChapterNo
 From RB_Scroll_Appointment r
 inner join rb_order_guest og on r.GuestId = og.Id
 inner join rb_account c on r.AccountId = c.Id

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -370,6 +370,7 @@ namespace Edu.WebApi.Controllers.Course
                 qitem.SalePlatList,
                 qitem.SalePlatArr,
                 qitem.ClassHours,
+                qitem.ScrollMinNum,
                 PreferentialList = qitem?.PreferentialList?.Select(sItem => new
                 {
                     sItem.Id,

Edu.WebApi/Controllers/Course/ScrollController.cs

@@ -772,7 +772,7 @@ namespace Edu.WebApi.Controllers.Course
                 x.OrderId,
                 x.CourseName,
                 x.CourseChapterNo,
-                x.CourseChapterNoName,
+                FinishChapterNoName=x.CourseChapterNoName,
                 x.AppointNum,
                 State = x.AppointNum > 0 ? 3 : 1,
                 x.CourseId,