Commit 66fb44d5 authored by 黄奎's avatar 黄奎

页面修改

parent ef2cc1d2
...@@ -28,5 +28,10 @@ namespace Edu.Model.ViewModel.User ...@@ -28,5 +28,10 @@ namespace Edu.Model.ViewModel.User
/// 更新时间 /// 更新时间
/// </summary> /// </summary>
public string UpdateTimeStr { get { return this.UpdateTime.FormatTime(); } } public string UpdateTimeStr { get { return this.UpdateTime.FormatTime(); } }
/// <summary>
/// 校区名称
/// </summary>
public string SName { get; set; }
} }
} }
...@@ -68,11 +68,10 @@ WHERE 1=1 ...@@ -68,11 +68,10 @@ WHERE 1=1
var parameters = new DynamicParameters(); var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.* SELECT A.*,B.SName
FROM rb_manager AS A FROM rb_manager AS A LEFT JOIN rb_school AS B ON A.School_Id=B.SId
WHERE 1=1 WHERE 1=1
"); ");
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Manager_ViewModel.Status), (int)DateStateEnum.Normal);
if (query != null) if (query != null)
{ {
if (!string.IsNullOrWhiteSpace(query.MName)) if (!string.IsNullOrWhiteSpace(query.MName))
...@@ -97,6 +96,10 @@ WHERE 1=1 ...@@ -97,6 +96,10 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Manager_ViewModel.MId), query.MId); builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Manager_ViewModel.MId), query.MId);
} }
if (query.Status >= 0)
{
builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Manager_ViewModel.Status), (int)query.Status);
}
} }
return GetPage<RB_Manager_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList(); return GetPage<RB_Manager_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
} }
......
...@@ -596,7 +596,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -596,7 +596,7 @@ namespace Edu.WebApi.Controllers.User
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString()); var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Manager_ViewModel>(RequestParm.Msg.ToString()); var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Manager_ViewModel>(RequestParm.Msg.ToString());
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
query.School_Id = base.UserInfo.School_Id; //query.School_Id = base.UserInfo.School_Id;
var list = managerModule.GetManagerPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var list = managerModule.GetManagerPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list) foreach (var item in list)
{ {
......
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