Commit 67731ebc authored by 黄奎's avatar 黄奎

页面修改

parent 14f7c94b
...@@ -33,6 +33,11 @@ namespace Edu.Model.ViewModel.Sell ...@@ -33,6 +33,11 @@ namespace Edu.Model.ViewModel.Sell
/// </summary> /// </summary>
public int EnterID { get; set; } public int EnterID { get; set; }
/// <summary>
/// 订单创建人
/// </summary>
public int OrderCreateBy { get; set; }
/// <summary> /// <summary>
/// 协助老师 /// 协助老师
/// </summary> /// </summary>
......
...@@ -342,7 +342,7 @@ WHERE {where}"; ...@@ -342,7 +342,7 @@ WHERE {where}";
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.*,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS TargetJoinType,IFNULL(B.StartClassHours,0) AS StartClassHours,IFNULL(C.CourseName,'') AS CourseName SELECT A.*,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS TargetJoinType,IFNULL(B.StartClassHours,0) AS StartClassHours,IFNULL(C.CourseName,'') AS CourseName
,class.ClassName,b.EnterID,plan.TotalPlanNum,planr.Ranks ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId ,class.ClassName,b.EnterID,plan.TotalPlanNum,planr.Ranks ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId
,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId,stu.StuTel,stu.StuRealMobile ,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId,stu.StuTel,stu.StuRealMobile,IFNULL(B.CreateBy,0) AS OrderCreateBy
FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
LEFT JOIN rb_class as class on class.ClassId=a.ClassId LEFT JOIN rb_class as class on class.ClassId=a.ClassId
LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.Id LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.Id
......
...@@ -248,6 +248,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -248,6 +248,10 @@ namespace Edu.WebApi.Controllers.Course
{ {
item.EnterName = UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName ?? ""; item.EnterName = UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName ?? "";
} }
else if (item.OrderCreateBy > 0)
{
item.EnterName = UserReidsCache.GetUserLoginInfo(item.OrderCreateBy)?.AccountName ?? "";
}
result.Add(new result.Add(new
{ {
item.Id, item.Id,
...@@ -263,6 +267,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -263,6 +267,7 @@ namespace Edu.WebApi.Controllers.Course
item.Teacher_Id, item.Teacher_Id,
item.TotalPlanNum, item.TotalPlanNum,
item.Ranks, item.Ranks,
item.OrderId,
item.EnterName, item.EnterName,
item.EnterID, item.EnterID,
item.IsRenewOrder, item.IsRenewOrder,
......
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