Commit fa13dce5 authored by 黄奎's avatar 黄奎

页面修改

parent e821bfbc
...@@ -4873,6 +4873,7 @@ namespace Edu.Module.Course ...@@ -4873,6 +4873,7 @@ namespace Edu.Module.Course
{ {
List<object> subList = new List<object>(); List<object> subList = new List<object>();
var tempSubList = checkList?.Where(qitem => qitem.OrderId == item.OrderId)?.OrderByDescending(qitem => qitem.ClassDate)?.ToList(); var tempSubList = checkList?.Where(qitem => qitem.OrderId == item.OrderId)?.OrderByDescending(qitem => qitem.ClassDate)?.ToList();
var tempOrder = stuOrderList?.FirstOrDefault(qitem => qitem.OrderId == item.OrderId);
list.Add(new list.Add(new
{ {
item.OrderId, item.OrderId,
...@@ -4881,6 +4882,8 @@ namespace Edu.Module.Course ...@@ -4881,6 +4882,8 @@ namespace Edu.Module.Course
item.RoomName, item.RoomName,
item.TeacherName, item.TeacherName,
item.TeacherHead, item.TeacherHead,
TotalHours= tempOrder?.TotalHours??0,
CompleteHours= tempOrder?.CompleteHours??0,
SubList = tempSubList?.Select(qitem => new SubList = tempSubList?.Select(qitem => new
{ {
ClassData = Common.ConvertHelper.FormatDate2(qitem.ClassDate), ClassData = Common.ConvertHelper.FormatDate2(qitem.ClassDate),
......
...@@ -62,6 +62,8 @@ namespace Edu.WebApi.Controllers.B2BApp ...@@ -62,6 +62,8 @@ namespace Edu.WebApi.Controllers.B2BApp
GuestName=base.ParmJObj.GetStringValue("GuestName"), GuestName=base.ParmJObj.GetStringValue("GuestName"),
Q_StudentId=base.ParmJObj.GetInt("Q_StudentId"), Q_StudentId=base.ParmJObj.GetInt("Q_StudentId"),
}; };
query.Q_StudentId = 0;
query.CustomerId = 0;
var list = orderModule.GetMyOrderPageList(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var list = orderModule.GetMyOrderPageList(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
List<RB_Class_Time_ViewModel> timeList = new List<RB_Class_Time_ViewModel>(); List<RB_Class_Time_ViewModel> timeList = new List<RB_Class_Time_ViewModel>();
List<RB_Customer_BalanceDetail_ViewModel> balanceList = new List<RB_Customer_BalanceDetail_ViewModel>(); List<RB_Customer_BalanceDetail_ViewModel> balanceList = new List<RB_Customer_BalanceDetail_ViewModel>();
...@@ -124,7 +126,7 @@ namespace Edu.WebApi.Controllers.B2BApp ...@@ -124,7 +126,7 @@ namespace Edu.WebApi.Controllers.B2BApp
{ {
var customer = base.AppletCustomerInfo; var customer = base.AppletCustomerInfo;
int StuId = base.ParmJObj.GetInt("StuId"); int StuId = base.ParmJObj.GetInt("StuId");
StuId = 0;
var obj = classModule.AppCustomerGetClassPlan(StuId); var obj = classModule.AppCustomerGetClassPlan(StuId);
return ApiResult.Success(data: obj); return ApiResult.Success(data: obj);
} }
......
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