Commit 119340e7 authored by 黄奎's avatar 黄奎

页面修改

parent 18093774
...@@ -82,5 +82,15 @@ namespace Edu.Model.Entity.Course ...@@ -82,5 +82,15 @@ namespace Edu.Model.Entity.Course
/// 抄送人(多个逗号分隔) /// 抄送人(多个逗号分隔)
/// </summary> /// </summary>
public string RecipientIds { get; set; } public string RecipientIds { get; set; }
/// <summary>
/// 订单编号
/// </summary>
public int OrderId { get; set; }
/// <summary>
/// 申请备注
/// </summary>
public string ApplyReason { get; set; }
} }
} }
...@@ -49,5 +49,20 @@ namespace Edu.Model.ViewModel.Course ...@@ -49,5 +49,20 @@ namespace Edu.Model.ViewModel.Course
/// 申请时间 /// 申请时间
/// </summary> /// </summary>
public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateTime); } } public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateTime); } }
/// <summary>
/// 业务员
/// </summary>
public int EnterID { get; set; }
/// <summary>
/// 业务员姓名
/// </summary>
public string EnterName { get; set; }
/// <summary>
/// 课程名称
/// </summary>
public string CourseName { get; set; }
} }
} }
...@@ -129,7 +129,9 @@ namespace Edu.Module.Course ...@@ -129,7 +129,9 @@ namespace Edu.Module.Course
GuestId = GuestId, GuestId = GuestId,
SchoolId = guestModel.School_Id, SchoolId = guestModel.School_Id,
StudentId = GuestId, StudentId = GuestId,
TeacherId = teacherId TeacherId = teacherId,
OrderId = OrderId,
ApplyReason = reason,
}; };
var newBackId = student_BackClassRepository.Insert(backClassModel); var newBackId = student_BackClassRepository.Insert(backClassModel);
backClassModel.BackId = newBackId; backClassModel.BackId = newBackId;
......
...@@ -27,13 +27,15 @@ namespace Edu.Repository.Course ...@@ -27,13 +27,15 @@ namespace Edu.Repository.Course
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.*,IFNULL(B.GuestName,'') AS GuestName,IFNULL(C.SName,'') AS SchoolName,IFNULL(D.ClassName,'') AS ClassName,IFNULL(T.TeacherName,'') AS TeacherName SELECT A.*,IFNULL(B.GuestName,'') AS GuestName,IFNULL(C.SName,'') AS SchoolName,IFNULL(D.ClassName,'') AS ClassName,IFNULL(T.TeacherName,'') AS TeacherName
,IFNULL(E.EnterID,0) AS EnterID,IFNULL(F.CourseName,'') AS CourseName
FROM RB_Student_BackClass AS A LEFT JOIN rb_order_guest AS B ON A.GuestId=B.Id FROM RB_Student_BackClass AS A LEFT JOIN rb_order_guest AS B ON A.GuestId=B.Id
LEFT JOIN rb_school AS C ON A.SchoolId=C.SId LEFT JOIN rb_school AS C ON A.SchoolId=C.SId
LEFT JOIN rb_class AS D ON A.ClassId=D.ClassId LEFT JOIN rb_class AS D ON A.ClassId=D.ClassId
LEFT JOIN (SELECT account.Id,teac.TeacherName FROM rb_account AS account INNER JOIN rb_teacher AS teac ON account.AccountId=teac.TId AND account.AccountType=2) LEFT JOIN (SELECT account.Id,teac.TeacherName FROM rb_account AS account INNER JOIN rb_teacher AS teac ON account.AccountId=teac.TId AND account.AccountType=2)
AS T ON A.TeacherId=T.Id AS T ON A.TeacherId=T.Id
WHERE 1=1 LEFT JOIN rb_order AS E ON A.OrderId=E.OrderId
"); LEFT JOIN rb_course AS F ON D.CouseId=F.CourseId
WHERE 1=1 ");
if (query != null) if (query != null)
{ {
if (query.Group_Id > 0) if (query.Group_Id > 0)
......
...@@ -53,6 +53,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -53,6 +53,10 @@ namespace Edu.WebApi.Controllers.Course
{ {
item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? ""; item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
} }
if (item.EnterID > 0)
{
item.EnterName = UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName ?? "";
}
result.Add(new result.Add(new
{ {
item.BackId, item.BackId,
...@@ -70,6 +74,11 @@ namespace Edu.WebApi.Controllers.Course ...@@ -70,6 +74,11 @@ namespace Edu.WebApi.Controllers.Course
item.CreateTimeStr, item.CreateTimeStr,
item.CreateByName, item.CreateByName,
item.AuditStatus, item.AuditStatus,
item.EnterID,
item.EnterName,
item.CourseName,
item.ApplyReason,
item.OrderId,
AuditStatusName=item.AuditStatus.ToName(), AuditStatusName=item.AuditStatus.ToName(),
}); });
} }
......
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