提交代码

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -396,7 +396,25 @@ namespace Edu.WebApi.Controllers.Course
                 }
             }
 
-            return ApiResult.Success(data: new { data.TeacherName, data.RoomName, TotalHour = (totalMinutes / 60).ToString("f2"), ClassNum = (totalMinutes / 45).ToString("f2"), ClassDate = data.ClassDate.ToString("yyyy-MM-dd") });
+            var orderGuestList = classModule.GetOrderGuest(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = data.School_Id, ClassId = data.ClassId });
+            var checkLogList = classModule.GetClassCheckListRepository(new RB_Class_Check_ViewModel { Group_Id = data.Group_Id, School_Id = data.School_Id, ClassId = data.ClassId, StartDate = data.ClassDate.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = data.ClassDate.ToString("yyyy-MM-dd HH:mm:ss") });
+            List<object> guestList = new List<object>();
+            foreach (var item in orderGuestList)
+            {
+                guestList.Add(new
+                {
+                    UserIcon = "",
+                    item.Id,
+                    SexStr = item.Sex == 1 ? "男" : "女",
+                    item.GuestName,
+                    item.Age,
+                    CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
+                    item.Mobile,
+                    item.OrderId,
+                    IsCheck = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.CheckStatus??-1 : -1
+                });
+            }
+            return ApiResult.Success(data: new { data.TeacherName, data.RoomName, TotalHour = Convert.ToInt32(totalMinutes / 60), ClassNum = Convert.ToInt32(totalMinutes / 45), ClassDate = data.ClassDate.ToString("yyyy-MM-dd"), GuestList= guestList });
         }
 
         /// <summary>
@@ -468,7 +486,7 @@ namespace Edu.WebApi.Controllers.Course
 
             List<object> resultList = new List<object>();
 
-            var dateList = list.GroupBy(x => new { MonthStr= x.ClassDate.ToString("MM"), YearStr= x.ClassDate.ToString("yyyy") }).Select(x=>new { x.Key.MonthStr, x.Key.YearStr });
+            var dateList = list.GroupBy(x => new { MonthStr = x.ClassDate.ToString("MM"), YearStr = x.ClassDate.ToString("yyyy") }).Select(x => new { x.Key.MonthStr, x.Key.YearStr });
             foreach (var item in list)
             {
                 int totalNum = checkLogList.Where(x => x.ClassId == item.ClassId && x.ClassRoomId == item.ClassRoomId && x.Group_Id == item.Group_Id && x.School_Id == item.School_Id).Count();