11

Edu.Module.Course/ClassModule.cs

@@ -4329,7 +4329,7 @@ namespace Edu.Module.Course
                                 }
                                 appointGuestList.Add(new
                                 {
-                                    GuestName = sItem.StuName,
+                                    GuestName = sItem.StuName+(sItem.AppointType==3?"(重修)":""),
                                     sItem.StuId,
                                     sItem.GuestId,
                                     sItem.OrderId,
@@ -4713,10 +4713,16 @@ namespace Edu.Module.Course
             var list = class_PlanRepository.GetTeacherPlan(pageIndex, pageSize, out rowsCount, query);
             if (list != null && list.Any())
             {
+                var classCheckList = new List<RB_Class_Check_ViewModel>();
                 var guestList = new List<RB_Order_Guest_ViewModel>();
                 var tempGuestList = new List<RB_Order_Guest_ViewModel>();//2021-07-19 Add By:W临时上课邀请
                 var feedBackList = new List<RB_Class_FeedBack_ViewModel>();//上课反馈
                 var visitorList = new List<RB_Visitor_Reserve_Extend>();
+                string classTimeIds = string.Join(",", list.Select(qitem => qitem.ClassTimeId).Distinct());
+                if (!string.IsNullOrEmpty(classTimeIds))
+                {
+                    classCheckList= classCheckRepository.GetClassCheckListRepository(new RB_Class_Check_ViewModel() { Q_ClassTimeIds = classTimeIds });
+                }
                 if (list.Any(x => x.ClassType == 1))
                 {
                     string classIds = string.Join(",", list.Where(x => x.ClassType == 1).Select(qitem => qitem.ClassId));
@@ -4778,6 +4784,7 @@ namespace Edu.Module.Course
                     {
                         grList = AppointList.Where(x => ("," + item.AppointIds + ",").Contains("," + x.Id + ",")).Select(x => new { GuestName = x.StuName });
                     }
+                    bool IsCheckSign = (classCheckList.FirstOrDefault(qitem => qitem.ClassTimeId == item.ClassTimeId)?.ClassCheckId ?? 0)>0;
                     result.Add(new
                     {
                         Id = item?.ClassTimeId ?? 0,
@@ -4796,7 +4803,8 @@ namespace Edu.Module.Course
                         FeedBackStatus = feedBackStatus,
                         GuestList = grList,
                         item.ClassPlanId,
-                        item.ReserveType
+                        item.ReserveType,
+                        IsCheckSign
                     });
                 }
             }

Edu.Repository/Grade/RB_Class_PlanRepository.cs

@@ -803,7 +803,7 @@ SELECT 3 as ClassType,IFNULL(t1.ClassTimeId,0) as ClassTimeId,a.CourseSTime as N
 FROM rb_scroll_appointment a INNER JOIN rb_course c on a.CourseId = c.CourseId
     INNER JOIN rb_account ac on a.AccountId = ac.Id
     INNER JOIN rb_teacher t on t.TId = ac.AccountId
-    INNER JOIN rb_class_room r on a.RoomId = r.RoomId
+    LEFT JOIN rb_class_room r on a.RoomId = r.RoomId
     INNER JOIN rb_order_guest og on a.GuestId = og.Id 
     LEFT JOIN rb_class_time t1 on t1.ClassPlanId = a.ClassPlanId
 WHERE 1=1 {0} GROUP BY a.CourseSTime,a.CourseETime,a.RoomId,a.Date ", whereAppoint.ToString());