Skip to content

E
Education
Commit 57085be6 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 38d0692a
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 23 deletions
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 57085be6
...@@ -770,29 +770,32 @@ namespace Edu.WebApi.Controllers.Course ...@@ -770,29 +770,32 @@ namespace Edu.WebApi.Controllers.Course
List<object> guestList = new List<object>(); List<object> guestList = new List<object>();
foreach (var item in orderGuestList.Where(x => x.GuestState == 1)) foreach (var item in orderGuestList.Where(x => x.GuestState == 1))
{ {
guestList.Add(new if (item.IsChaBan == 0 || (item.IsChaBan == 1 && data.ClassDate >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.EffectTime))))
{ {
UserIcon = "", guestList.Add(new
item.Id, {
SexStr = item.Sex == 1 ? "男" : "女", UserIcon = "",
item.GuestName, item.Id,
item.Age, SexStr = item.Sex == 1 ? "男" : "女",
CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime), item.GuestName,
item.Mobile, item.Age,
item.OrderId, CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
item.CourseName, item.Mobile,
item.CourseId, item.OrderId,
item.TotalHours, item.CourseName,
item.CompleteHours, item.CourseId,
item.StartClassHours, item.TotalHours,
item.IsChaBan, item.CompleteHours,
item.EffectStatus, item.StartClassHours,
item.EffectStatusStr, item.IsChaBan,
EffectTime=Common.ConvertHelper.FormatDate(item.EffectTime), item.EffectStatus,
item.UpOrderId, item.EffectStatusStr,
IsCheck = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.CheckStatus ?? -1 : -1, EffectTime = Common.ConvertHelper.FormatDate(item.EffectTime),
StudyNum = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.StudyNum ?? 0 : 0 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 return ApiResult.Success(data: new
{ {
...@@ -910,7 +913,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -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}); 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()) if (list.Count() != orderGuestList.Where(x => x.GuestState == 1).Count())
{ {
return ApiResult.Failed("签到总人数错误，请先检查信息"); // return ApiResult.Failed("签到总人数错误，请先检查信息");
} }
//判断今天有课没有 //判断今天有课没有
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment