Commit 780da62d authored by 黄奎's avatar 黄奎

页面修改

parent a74cd15e
......@@ -84,7 +84,7 @@ namespace Edu.Module.Customer
}
if (oldModel.Remark != model.Remark)
{
logContent += string.Format("备注:由【{0}】=>【{1}】,,", oldModel.Remark, model.Remark);
logContent += string.Format("备注:由【{0}】=>【{1}】,", oldModel.Remark, model.Remark);
}
if (oldModel.Feedback != model.Feedback)
{
......
......@@ -37,13 +37,19 @@ namespace Edu.WebApi.Controllers.Customer
StuId = base.ParmJObj.GetInt("StuId"),
};
query.Group_Id = base.UserInfo.Group_Id;
var list = customerStudentModule.GetStudentAppointmentPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list)
var data = customerStudentModule.GetStudentAppointmentPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
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,
CreateTime = Common.ConvertHelper.FormatTimeStr2(item.CreateTime),
CreateByName,
});
}
pageModel.Count = rowsCount;
pageModel.PageData = list;
......@@ -196,6 +202,8 @@ namespace Edu.WebApi.Controllers.Customer
}
list.Add(new
{
item.Id,
item.StuId,
item.SchoolName,
item.ReceptionPersionName,
item.Remark,
......@@ -280,15 +288,7 @@ namespace Edu.WebApi.Controllers.Customer
foreach (var item in data)
{
string CreateByName = "";
if (item.CreateType > 1)
{
CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
}
else
{
CreateByName = UserReidsCache.GetAppletCustomerLoginInfo(item.CreateBy)?.CustomerName ?? "";
}
CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
list.Add(new
{
item.LogId,
......
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