Commit bca5cc00 authored by 吴春's avatar 吴春

提交代码

parent 76f8c1a1
......@@ -287,7 +287,7 @@ namespace Edu.WebApi.Controllers.Course
public ApiResult RemoveClassPlan()
{
var ClassPlanId = base.ParmJObj.GetInt("ClassPlanId");
var flag = classModule.RemoveClassPlanModule(ClassPlanId,base.UserInfo);
var flag = classModule.RemoveClassPlanModule(ClassPlanId, base.UserInfo);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
......@@ -343,7 +343,7 @@ namespace Edu.WebApi.Controllers.Course
}
}
}
var flag = classModule.SetClassPlanModule(extModel,base.UserInfo.Id);
var flag = classModule.SetClassPlanModule(extModel, base.UserInfo.Id);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
......@@ -461,7 +461,7 @@ namespace Edu.WebApi.Controllers.Course
model.UpdateTime = model.CreateTime;
model.Group_Id = base.UserInfo.Group_Id;
bool result = classModule.AddClassStudentDropOutModule(model, base.UserInfo.AccountName);
return result? ApiResult.Success():ApiResult.Failed();
return result ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取教室页列表
......@@ -578,8 +578,18 @@ namespace Edu.WebApi.Controllers.Course
item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
}
}
var resultList = list.Select(x => new
{
LogTypeStr = EnumHelper.ToName(x.LogType),
x.LogContent,
CreateYear = x.CreateTime.ToString("yyyy"),
CreateMonth = x.CreateTime.ToString("MM"),
CreateDay = x.CreateTime.ToString("dd"),
CreatHour = x.CreateTime.ToString("HH:mm:ss"),
x.CreateByName
});
pageModel.Count = rowsCount;
pageModel.PageData = list;
pageModel.PageData = resultList;
return ApiResult.Success(data: pageModel);
}
......
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