Commit f1b8be81 authored by 黄奎's avatar 黄奎

页面修改

parent 3497d79e
...@@ -284,5 +284,10 @@ namespace Edu.Model.ViewModel.User ...@@ -284,5 +284,10 @@ namespace Edu.Model.ViewModel.User
/// 已完成课时 /// 已完成课时
/// </summary> /// </summary>
public decimal CompleteHours { get; set; } public decimal CompleteHours { get; set; }
/// <summary>
/// 是否存在课程顾问(1-存在,2-不存在)
/// </summary>
public int ExistCourseConsultant { get; set; }
} }
} }
\ No newline at end of file
...@@ -297,6 +297,18 @@ WHERE 1=1 ...@@ -297,6 +297,18 @@ WHERE 1=1
builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.CreateBy), query.CreateBy); builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.CreateBy), query.CreateBy);
} }
} }
if (query.ExistCourseConsultant > 0)
{
if (query.ExistCourseConsultant == 1)
{
builder.AppendFormat(" AND Exists (SELECT StuId FROM rb_student_assist WHERE AssistType=2 AND `Status`=0 AND t.StuId=StuId) ");
}
if (query.ExistCourseConsultant == 2)
{
builder.AppendFormat(" AND NOT Exists (SELECT StuId FROM rb_student_assist WHERE AssistType=2 AND `Status`=0 AND t.StuId=StuId) ");
}
}
} }
builder.AppendFormat(" ORDER BY t.{0} DESC ", nameof(RB_Student_ViewModel.StuId)); builder.AppendFormat(" ORDER BY t.{0} DESC ", nameof(RB_Student_ViewModel.StuId));
return GetPage<RB_Student_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList(); return GetPage<RB_Student_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
......
...@@ -678,6 +678,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -678,6 +678,7 @@ namespace Edu.WebApi.Controllers.User
QQ = base.ParmJObj.GetStringValue("QQ"), QQ = base.ParmJObj.GetStringValue("QQ"),
WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"), WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
StuType = base.ParmJObj.GetInt("StuType"), StuType = base.ParmJObj.GetInt("StuType"),
ExistCourseConsultant=base.ParmJObj.GetInt("ExistCourseConsultant"),
}; };
if (query.IsQueryMyStu == 1) if (query.IsQueryMyStu == 1)
{ {
......
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