页面修改

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -769,6 +769,8 @@ namespace Edu.WebApi.Controllers.Course
             });
             List<object> guestList = new List<object>();
             foreach (var item in orderGuestList.Where(x => x.GuestState == 1))
+            {
+                if (item.IsChaBan == 0 || (item.IsChaBan == 1 && data.ClassDate  >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.EffectTime))))
                 {
                     guestList.Add(new
                     {
@@ -788,12 +790,13 @@ namespace Edu.WebApi.Controllers.Course
                         item.IsChaBan,
                         item.EffectStatus,
                         item.EffectStatusStr,
-                    EffectTime=Common.ConvertHelper.FormatDate(item.EffectTime),
+                        EffectTime = Common.ConvertHelper.FormatDate(item.EffectTime),
                         item.UpOrderId,
                         IsCheck = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.CheckStatus ?? -1 : -1,
                         StudyNum = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.StudyNum ?? 0 : 0
                     });
                 }
+            }
             return ApiResult.Success(data: new
             {
                 data.TeacherName,
@@ -910,7 +913,7 @@ namespace Edu.WebApi.Controllers.Course
             var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId ,QEffectStatus=1});
             if (list.Count() != orderGuestList.Where(x => x.GuestState == 1).Count())
             {
-                return ApiResult.Failed("签到总人数错误，请先检查信息");
+               // return ApiResult.Failed("签到总人数错误，请先检查信息");
             }
 
             //判断今天有课没有