页面修改

Edu.Model/ViewModel/Scroll/RB_Scroll_Appointment_ViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using Edu.Model.Entity.Scroll;
+using Edu.Model.ViewModel.Sell;
 
 namespace Edu.Model.ViewModel.Scroll
 {
@@ -146,6 +147,11 @@ namespace Edu.Model.ViewModel.Scroll
         /// </summary>
         public int OrderId { get; set; }
 
+        /// <summary>
+        /// 订单课程Id
+        /// </summary>
+        public List<RB_Order_Course_ViewModel> OrderCourseList { get; set; }
+
         /// <summary>
         /// 学生列表
         /// </summary>

Edu.Module.Course/ClassModule.cs

@@ -4410,6 +4410,22 @@ namespace Edu.Module.Course
                     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());
+                    List<RB_Order_Course_ViewModel> orderCourseList = new List<RB_Order_Course_ViewModel>();
+                    string orderIds = string.Join(",", appointList.Select(qitem => qitem.OrderId));
+                    List<int> orderCourseIdList = new List<int>();
+                    if (!string.IsNullOrEmpty(orderIds))
+                    {
+                        orderCourseList = order_CourseRepository.GetOrderCourseListRepository(new RB_Order_Course_ViewModel() { QOrderIds = orderIds });
+                        if (orderCourseList != null && orderCourseList.Count > 0)
+                        {
+                            orderCourseIdList = orderCourseList.Select(qitem => qitem.CourseId).Distinct().ToList();
+                        }
+                    }
+                    foreach (var item in appointList)
+                    {
+                        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> newList = new List<int>();
                     if (learnList != null)
@@ -4420,12 +4436,16 @@ namespace Edu.Module.Course
                     {
                         newList.AddRange(courseList);
                     }
+                    if (orderCourseIdList != null && orderCourseIdList.Count > 0)
+                    {
+                        newList.AddRange(orderCourseIdList);
+                    }
 
                     if (newList != null && newList.Count > 0)
                     {
                         chatperList = course_ChapterRepository.GetChapterListRepository(new RB_Course_Chapter_ViewModel()
                         {
-                            CourseIds = string.Join(",", newList)
+                            CourseIds = string.Join(",", newList.Distinct())
                         }); ;
                     }
                 }

Edu.WebApi/Controllers/Course/TeacherClassController.cs

@@ -809,8 +809,8 @@ namespace Edu.WebApi.Controllers.Course
                         new ExcelColumn(value:"日期"){CellWidth=24,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                         new ExcelColumn(value:"星期"){CellWidth=24,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                         new ExcelColumn(value:"时间"){CellWidth=24,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
-                        new ExcelColumn(value:"课程"){CellWidth=50,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
-                        new ExcelColumn(value:"上课地点"){CellWidth=24,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                        new ExcelColumn(value:"章节"){CellWidth=50,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                        //new ExcelColumn(value:"上课地点"){CellWidth=24,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     }
                 };
                 slist.Add(headerTimeLast);
@@ -819,17 +819,35 @@ namespace Edu.WebApi.Controllers.Course
                     var guestAppointList = appointList.Where(x => x.GuestId == item.Key).OrderBy(x => x.Date);
                     foreach (var itemGuest in guestAppointList)
                     {
-                        ExcelDataSource rowGuest = new ExcelDataSource()
+                        List<ExcelColumn> excelColumns = new List<ExcelColumn>();
+                        excelColumns.Add(new ExcelColumn(value: itemGuest.StuName) { CellWidth = 24, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER });
+                        excelColumns.Add(new ExcelColumn(value: itemGuest.Date.ToString("MM月dd日")) { CellWidth = 24, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER });
+                        excelColumns.Add(new ExcelColumn(value: Common.ConvertHelper.GetWeekDay(itemGuest.Date)) { CellWidth = 24, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER });
+                        excelColumns.Add(new ExcelColumn(value: (itemGuest.CourseSTime ?? "") + "-" + (itemGuest.CourseETime ?? "")) { CellWidth = 24, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER });
+
+                        var tempChapter =new RB_Course_Chapter_ViewModel();
+                        if (itemGuest.OrderCourseList != null && itemGuest.OrderCourseList.Count > 0)
                         {
-                            ExcelRows = new List<ExcelColumn>(30)
+                            tempChapter = chatperList.FirstOrDefault(qitem => itemGuest.OrderCourseList.Any(sItem => sItem.CourseId == qitem.CourseId) && qitem.CourseRate == itemGuest.CourseGradeId && qitem.ChapterId == itemGuest.CourseGradeNo) ?? new RB_Course_Chapter_ViewModel();
+                        }
+                        else
+                        {
+                            tempChapter = chatperList.FirstOrDefault(qitem => qitem.CourseId == itemGuest.LearnCourseId && qitem.CourseRate == itemGuest.CourseGradeId && qitem.ChapterId == itemGuest.CourseGradeNo) ?? new RB_Course_Chapter_ViewModel();
+                        }
+                        
+                        string chapterName = itemGuest.CourseName + "-" + itemGuest.CourseGradeNo;
+                        if (tempChapter != null && tempChapter.ChapterId > 0)
+                        {
+                            chapterName = tempChapter.CourseRate.ToName() + "-" + tempChapter.ChapterName;
+                        }
+                        else
                         {
-                                new ExcelColumn(value:itemGuest.StuName){CellWidth=24,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
-                                new ExcelColumn(value:itemGuest.Date.ToString("MM月dd日")){CellWidth=24,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
-                                new ExcelColumn(value:Common.ConvertHelper.GetWeekDay(itemGuest.Date)){CellWidth=24,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
-                                new ExcelColumn(value:(itemGuest.CourseSTime??"")+"-"+(itemGuest.CourseETime??"")){CellWidth=24,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
-                                new ExcelColumn(value:itemGuest.CourseName+"-"+itemGuest.ChapterNo){CellWidth=50,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
-                                new ExcelColumn(value:itemGuest.RoomName){CellWidth=24,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                            string XX = "";
                         }
+                        excelColumns.Add(new ExcelColumn(value: chapterName) { CellWidth = 50, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER });
+                        ExcelDataSource rowGuest = new ExcelDataSource()
+                        {
+                            ExcelRows = excelColumns
                         };
                         slist.Add(rowGuest);
                     }
@@ -842,7 +860,7 @@ namespace Edu.WebApi.Controllers.Course
                                 new ExcelColumn(value:""){CellWidth=24,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                                 new ExcelColumn(value:""){CellWidth=24,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                                 new ExcelColumn(value:""){CellWidth=50,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
-                                new ExcelColumn(value:""){CellWidth=24,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                                //new ExcelColumn(value:""){CellWidth=24,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                             }
                     };
                     slist.Add(rowKGuest);