约课显示调整

Edu.Model/ViewModel/Scroll/RB_Scroll_Appointment_ViewModel.cs

@@ -141,6 +141,11 @@ namespace Edu.Model.ViewModel.Scroll
         /// </summary>
         public int CourseChapterNo { get; set; }
 
+        /// <summary>
+        /// 学员订单Id
+        /// </summary>
+        public int OrderId { get; set; }
+
         /// <summary>
         /// 学生列表
         /// </summary>

Edu.Module.Course/ClassModule.cs

@@ -221,6 +221,11 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_Class_CheckRepository class_CheckRepository = new RB_Class_CheckRepository();
 
+        /// <summary>
+        /// 订单课程仓储层
+        /// </summary>
+        private readonly RB_Order_CourseRepository order_CourseRepository = new RB_Order_CourseRepository();
+
 
         /// <summary>
         /// 获取班级列表
@@ -4083,11 +4088,20 @@ namespace Edu.Module.Course
                     });
                 }
                 List<RB_Course_Chapter_ViewModel> chatperList = new List<RB_Course_Chapter_ViewModel>();
+                List<RB_Order_Course_ViewModel> orderCourseList = new List<RB_Order_Course_ViewModel>();
                 if (appointList != null && appointList.Count > 0)
                 {
                     string learnIds = string.Join(",", appointList.Select(qitem => qitem.LearnCourseId).Distinct());
                     List<int> learnList = Common.ConvertHelper.StringToList(learnIds);
                     string courseIds = string.Join(",", appointList.Select(qitem => qitem.CourseId).Distinct());
+                    
+      
+                    string orderIds = string.Join(",", appointList.Select(qitem => qitem.OrderId));
+                    if (!string.IsNullOrEmpty(orderIds))
+                    {
+                        orderCourseList = order_CourseRepository.GetOrderCourseListRepository(new RB_Order_Course_ViewModel() { QOrderIds = orderIds });
+                    }
+
                     List<int> courseList = Common.ConvertHelper.StringToList(courseIds);
                     List<int> newList = new List<int>();
                     if (learnList != null)
@@ -4207,6 +4221,18 @@ namespace Edu.Module.Course
                             qitem.ShiftSort == item.Key.ShiftSort &&
                             qitem.CourseSTime == item.Key.CourseSTime
                             ).ToList();
+                            foreach (var sItem in subAppointList)
+                            {
+                                var tempOrderCourse = orderCourseList?.Where(qitem => qitem.OrderId == sItem.OrderId)?.ToList();
+                                if (tempOrderCourse != null && tempOrderCourse.Count > 0)
+                                {
+                                    string NewCourseName = string.Join("、", tempOrderCourse.Select(qitem => qitem.CourseName));
+                                    if (!string.IsNullOrEmpty(NewCourseName))
+                                    {
+                                        sItem.LearnCourseName = NewCourseName;
+                                    }
+                                }
+                            }
 
                             var tempChatper = chatperList?.Where(qitem => qitem.CourseId == item.Key.CourseId && qitem.ChapterNo == item.Key.ChapterNo.ToString())?.FirstOrDefault();
                             int CourseGradeId = 0;

Edu.Repository/Scroll/RB_Scroll_AppointmentRepository.cs

@@ -286,7 +286,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,og.CourseChapterNo
+       ,cr.School_Id as RoomSchoolId,sc.SName as RoomSchoolName ,og.TotalChapterNo,IFNULL(c2.CourseName,'') AS LearnCourseName,og.CourseChapterNo,og.OrderId
 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