Commit a9be473a authored by 黄奎's avatar 黄奎

页面修改

parent f6f6475d
...@@ -263,17 +263,12 @@ namespace Edu.Module.Course ...@@ -263,17 +263,12 @@ namespace Edu.Module.Course
var classOrderList = new List<RB_Order_ViewModel>(); var classOrderList = new List<RB_Order_ViewModel>();
var stepPriceList = new List<RB_Class_StepPrice_ViewModel>(); var stepPriceList = new List<RB_Class_StepPrice_ViewModel>();
var otherCourseList = new List<RB_Class_Course_Extend>(); var otherCourseList = new List<RB_Class_Course_Extend>();
var maxPlanDateList = new List<RB_Class_Plan_ViewModel>();
string ids = string.Join(",", list.Select(qitem => qitem.ClassId)); string ids = string.Join(",", list.Select(qitem => qitem.ClassId));
if (!string.IsNullOrEmpty(ids)) if (!string.IsNullOrEmpty(ids))
{ {
classTimeList = class_TimeRepository.GetClassTimeListRepository(ids); classTimeList = class_TimeRepository.GetClassTimeListRepository(ids);
classOrderList = orderRepository.GetClassOrderPeopleNumRepository(ids); classOrderList = orderRepository.GetClassOrderPeopleNumRepository(ids);
otherCourseList = GetClassCourseListModule(new RB_Class_Course_Extend() { QClassIds = ids }); otherCourseList = GetClassCourseListModule(new RB_Class_Course_Extend() { QClassIds = ids });
maxPlanDateList= class_PlanRepository.GetClassPlanMaxDataRepository(new RB_Class_Plan_ViewModel()
{
QClassIds = ids
});
} }
if (isGetStepPrice) if (isGetStepPrice)
{ {
...@@ -283,8 +278,7 @@ namespace Edu.Module.Course ...@@ -283,8 +278,7 @@ namespace Edu.Module.Course
//课程计划上课日期 //课程计划上课日期
foreach (var item in list) foreach (var item in list)
{ {
var finish = maxPlanDateList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.ClassDate; item.FinishTimeStr = Common.ConvertHelper.FormatDate(item.EndClassDate);
item.FinishTimeStr = Common.ConvertHelper.FormatDate(finish);
item.NewPlanDateTime = classTimeList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.NewPlanDateTime; item.NewPlanDateTime = classTimeList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.NewPlanDateTime;
item.OrderStudentCount = classOrderList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.GuestNum ?? 0; item.OrderStudentCount = classOrderList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.GuestNum ?? 0;
if (isGetStepPrice) if (isGetStepPrice)
......
...@@ -84,7 +84,6 @@ namespace Edu.WebApi.Controllers.Course ...@@ -84,7 +84,6 @@ namespace Edu.WebApi.Controllers.Course
item.ClassNo, item.ClassNo,
item.CouseId, item.CouseId,
item.FinishTimeStr, item.FinishTimeStr,
EndClassDate= Common.ConvertHelper.FormatDate(item.EndClassDate),
}); });
} }
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
......
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