11

Edu.Module.Course/ClassModule.cs

@@ -26,6 +26,7 @@ using Edu.Repository.Scroll;
 using Edu.Repository.Sell;
 using Edu.Repository.User;
 using Microsoft.AspNetCore.SignalR;
+using Senparc.Weixin.Work.AdvancedAPIs.OaDataOpen;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -3344,7 +3345,7 @@ namespace Edu.Module.Course
                         });
                     }
 
-                    appointList.Where(x => x.Date == ClassDate).GroupBy(x => new { x.Date, x.TeacherId, x.TeacherName, x.RoomId, x.RoomName, x.CourseName, x.CourseGradeId, x.CourseGradeNo, x.CourseSTime }).OrderBy(x => x.Key.CourseSTime).ToList().ForEach(item =>
+                    appointList.Where(x => x.Date == ClassDate).GroupBy(x => new { x.Date, x.TeacherId, x.TeacherName, x.RoomId, x.RoomName, x.CourseName, x.CourseGradeId, x.ShiftSort, x.CourseSTime }).OrderBy(x => x.Key.CourseSTime).ToList().ForEach(item =>
                     {
                         //上课时段                        
                         string STime = item.FirstOrDefault().CourseSTime ?? "", ETime = item.FirstOrDefault().CourseETime ?? "";
@@ -3358,7 +3359,7 @@ namespace Edu.Module.Course
                             item.Key.CourseName,
                             item.Key.RoomName,
                             item.Key.TeacherName,
-                            Ranks = item.Key.CourseGradeNo,
+                            Ranks = item.Key.ShiftSort,
                             CourseGradeIdName = item.Key.CourseGradeId.ToName(),
                             TotalPlanNum = item.FirstOrDefault().TotalChapterNo,
                             TimeStr = Common.ConvertHelper.GetTimeStr(currentDate),
@@ -3927,9 +3928,24 @@ namespace Edu.Module.Course
                             subItem.School_Id,
                         });
                     }
-
+                    if (Common.ConvertHelper.FormatDate(ClassDate) == "2024-11-06")
+                    {
+                        string str = "";
+                    }
                     //约课
-                    appointList.Where(x => x.Date == ClassDate).GroupBy(x => new { x.Date, x.TeacherId, x.TeacherName, x.RoomId, x.RoomName, x.CourseName, x.CourseGradeNo, x.CourseGradeId, x.CourseSTime }).OrderBy(x => x.Key.CourseSTime).ToList().ForEach(item =>
+                    var tempAppointList = appointList.Where(x => x.Date == ClassDate).GroupBy(x => new
+                    {
+                        x.Date,
+                        x.TeacherId,
+                        x.TeacherName,
+                        x.RoomId,
+                        x.RoomName,
+                        x.CourseName,
+                        x.ShiftSort,
+                        x.CourseGradeId,
+                        x.CourseSTime
+                    }).OrderBy(x => x.Key.CourseSTime).ToList();
+                    foreach (var item in tempAppointList)
                     {
                         //上课时段                        
                         string STime = item.FirstOrDefault().CourseSTime ?? "", ETime = item.FirstOrDefault().CourseETime ?? "";
@@ -3943,7 +3959,7 @@ namespace Edu.Module.Course
                             item.Key.CourseName,
                             item.Key.RoomName,
                             item.Key.TeacherName,
-                             Ranks = item.Key.CourseGradeNo,
+                            Ranks = item.Key.ShiftSort,
                             CourseGradeIdName = item.Key.CourseGradeId.ToName(),
                             TotalPlanNum = item.FirstOrDefault().TotalChapterNo,
                             TimeStr = Common.ConvertHelper.GetTimeStr(currentDate),
@@ -3957,7 +3973,7 @@ namespace Edu.Module.Course
                             item.FirstOrDefault()?.ClassPlanId,
                             School_Id = 0,
                         });
-                     });
+                    }
 
                     var obj = new
                     {

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -2881,7 +2881,22 @@ namespace Edu.WebApi.Controllers.Course
                                     foreach (var gItem in guestList)
                                     {
                                         JObject gObj = JObject.Parse(gItem.ToString());
+                                        string AppointTypeStr = "";
+                                        int AppointType = gObj.GetInt("AppointType");
+                                        if (AppointType == 2)
+                                        {
+                                            AppointTypeStr = "补课";
+                                        }
+                                        if (AppointType == 3)
+                                        {
+                                            AppointTypeStr = "重修";
+                                        }
+
                                         guestStr += "/" + gObj["GuestName"].ToString();
+                                        if (!string.IsNullOrEmpty(AppointTypeStr))
+                                        {
+                                            guestStr += string.Format("【{0}】", AppointTypeStr);
+                                        }
                                     }
                                 }
                                 var dataRow = new List<ExcelColumn>(30)