Commit d10b274f authored by 黄奎's avatar 黄奎

页面修改

parent 62d718da
...@@ -79,6 +79,10 @@ WHERE 1=1 ...@@ -79,6 +79,10 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Visitor_Reserve_Extend.CreateBy), query.CreateBy); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Visitor_Reserve_Extend.CreateBy), query.CreateBy);
} }
if (query.Visitor_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Visitor_Reserve_Extend.Visitor_Id), query.Visitor_Id);
}
} }
return GetPage<RB_Visitor_Reserve_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList(); return GetPage<RB_Visitor_Reserve_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
} }
......
...@@ -135,13 +135,20 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -135,13 +135,20 @@ namespace Edu.WebApi.Controllers.Customer
StuId = base.ParmJObj.GetInt("StuId"), StuId = base.ParmJObj.GetInt("StuId"),
}; };
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
var list = customerStudentModule.GetStudentFollowPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var data = customerStudentModule.GetStudentFollowPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list) List<object> list = new List<object>();
foreach (var item in data)
{ {
if (item.CreateBy > 0) string CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
list.Add(new
{ {
// item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? ""; item.Id,
} item.StuId,
item.Remark,
item.CreateBy,
CreateTime = Common.ConvertHelper.FormatTimeStr2(item.CreateTime),
CreateByName,
});
} }
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
pageModel.PageData = list; pageModel.PageData = list;
......
...@@ -47,7 +47,8 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -47,7 +47,8 @@ namespace Edu.WebApi.Controllers.Duty
Q_ReserveStatus=base.ParmJObj.GetStringValue("Q_ReserveStatus"), Q_ReserveStatus=base.ParmJObj.GetStringValue("Q_ReserveStatus"),
VisitorName=base.ParmJObj.GetStringValue("VisitorName"), VisitorName=base.ParmJObj.GetStringValue("VisitorName"),
Id=base.ParmJObj.GetInt("Id"), Id=base.ParmJObj.GetInt("Id"),
IsQueryAll=base.ParmJObj.GetInt("IsQueryAll") IsQueryAll=base.ParmJObj.GetInt("IsQueryAll"),
Visitor_Id=base.ParmJObj.GetInt("Visitor_Id"),
}; };
if (query.IsQueryAll != 1) if (query.IsQueryAll != 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