Commit 202ec73b authored by 吴春's avatar 吴春

提交代码

parent f9c6cb4f
...@@ -811,8 +811,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -811,8 +811,8 @@ namespace Edu.WebApi.Controllers.Course
} }
foreach (var item in tempGuestList.Where(x => x.GuestState == 1 || x.GuestState == 6 || ((x.GuestState == 5 || x.GuestState == 7) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= data.ClassDate))) foreach (var item in tempGuestList.Where(x => x.GuestState == 1 || x.GuestState == 6 || ((x.GuestState == 5 || x.GuestState == 7) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= data.ClassDate)))
{ {
if (item.IsChaBan == 0 || (item.IsChaBan == 1 && data.ClassDate >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.EffectTime)))) // if ((item.IsChaBan == 1 && data.ClassDate >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.EffectTime))))
{ //{
guestList.Add(new guestList.Add(new
{ {
UserIcon = "", UserIcon = "",
...@@ -828,7 +828,6 @@ namespace Edu.WebApi.Controllers.Course ...@@ -828,7 +828,6 @@ namespace Edu.WebApi.Controllers.Course
item.TotalHours, item.TotalHours,
item.CompleteHours, item.CompleteHours,
item.StartClassHours, item.StartClassHours,
item.IsChaBan,
item.EffectStatus, item.EffectStatus,
item.EffectStatusStr, item.EffectStatusStr,
EffectTime = Common.ConvertHelper.FormatDate(item.EffectTime), EffectTime = Common.ConvertHelper.FormatDate(item.EffectTime),
...@@ -837,7 +836,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -837,7 +836,7 @@ namespace Edu.WebApi.Controllers.Course
StudyNum = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.StudyNum ?? 0 : 0, StudyNum = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.StudyNum ?? 0 : 0,
IsTemp = 1, IsTemp = 1,
}); });
} // }
} }
var classMinutes = classModule.GetClassMinutesModule(classId); var classMinutes = classModule.GetClassMinutesModule(classId);
......
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