老师排课表和学员发课表下载调整

Edu.Module.Course/ClassModule.cs

@@ -4400,7 +4400,7 @@ namespace Edu.Module.Course
 
 
         /// <summary>
-        /// 预约课管理
+        /// 预约课管理导出
         /// </summary>
         /// <param name="StartDate"></param>
         /// <param name="EndDate"></param>
@@ -4410,7 +4410,7 @@ namespace Edu.Module.Course
         /// <param name="appointState"></param>
         /// <param name="group_Id"></param>
         /// <returns></returns>
-        public List<RB_Teacher_ViewModel> GetAppointmentPlanStatExport(string StartDate, string EndDate, int teacherId, int classRoomId, int ClassType, int appointState, int group_Id, out List<RB_Class_Plan_ViewModel> list, out List<RB_Reserve_Class_Extend> reserveList, out List<RB_Scroll_Appointment_ViewModel> appointList, out List<RB_Class_Time_ViewModel> timeList, out List<RB_Order_Guest_ViewModel> guestList, out List<RB_Order_Guest_ViewModel> tempGuestList, out List<RB_Visitor_Reserve_Extend> visitorList, out List<RB_Course_Chapter_ViewModel> chatperList)
+        public List<RB_Teacher_ViewModel> GetAppointmentPlanStatExport(string StartDate, string EndDate, int teacherId, int classRoomId, int ClassType, int appointState, int group_Id, out List<RB_Class_Plan_ViewModel> list, out List<RB_Reserve_Class_Extend> reserveList, out List<RB_Scroll_Appointment_ViewModel> appointList, out List<RB_Class_Time_ViewModel> timeList, out List<RB_Order_Guest_ViewModel> guestList, out List<RB_Order_Guest_ViewModel> tempGuestList, out List<RB_Visitor_Reserve_Extend> visitorList, out List<RB_Course_Chapter_ViewModel> chatperList,out List<RB_Course_ViewModel> courseList)
         {
             var sDTime = Convert.ToDateTime(StartDate);
             var eDTime = Convert.ToDateTime(EndDate);
@@ -4428,6 +4428,7 @@ namespace Edu.Module.Course
             tempGuestList = new List<RB_Order_Guest_ViewModel>();//2021-07-20 Add By:W临时上课邀请
             visitorList = new List<RB_Visitor_Reserve_Extend>();
             chatperList = new List<RB_Course_Chapter_ViewModel>();
+            courseList = new List<RB_Course_ViewModel>();
             List<RB_Teacher_ViewModel> TeacherList = new List<RB_Teacher_ViewModel>();
             var reserveQuery = new RB_Reserve_Class_Extend()
             {
@@ -4515,15 +4516,15 @@ namespace Edu.Module.Course
                         item.OrderCourseList = orderCourseList?.Where(qitem => qitem.OrderId == item.OrderId)?.ToList() ?? new List<RB_Order_Course_ViewModel>();
                     }
 
-                    List<int> courseList = Common.ConvertHelper.StringToList(courseIds);
+                    List<int> courseIdList = Common.ConvertHelper.StringToList(courseIds);
                     List<int> newList = new List<int>();
                     if (learnList != null)
                     {
                         newList.AddRange(learnList);
                     }
-                    if (courseList != null)
+                    if (courseIdList != null)
                     {
-                        newList.AddRange(courseList);
+                        newList.AddRange(courseIdList);
                     }
                     if (orderCourseIdList != null && orderCourseIdList.Count > 0)
                     {
@@ -4536,6 +4537,7 @@ namespace Edu.Module.Course
                         {
                             CourseIds = string.Join(",", newList.Distinct())
                         }); ;
+                        courseList = courseRepository.GetCourseListRepository(new RB_Course_ViewModel() { QCourseIds = string.Join(",", courseIdList.Distinct()) });
                     }
                 }
                 //获取所有老师的列表