培训
This commit is contained in:
@@ -32,7 +32,8 @@ namespace BLL
|
||||
{
|
||||
Id = model.Id,
|
||||
Code = model.Code,
|
||||
RoleId = model.RoleId,
|
||||
//RoleId = model.RoleId,
|
||||
WorkPostId = model.WorkPostId,
|
||||
CourseId = model.CourseId,
|
||||
ClassHour = model.ClassHour,
|
||||
Cycle = model.Cycle,
|
||||
@@ -57,7 +58,8 @@ namespace BLL
|
||||
if (newModel != null)
|
||||
{
|
||||
newModel.Code = model.Code;
|
||||
newModel.RoleId = model.RoleId;
|
||||
//newModel.RoleId = model.RoleId;
|
||||
newModel.WorkPostId = model.WorkPostId;
|
||||
newModel.CourseId = model.CourseId;
|
||||
newModel.ClassHour = model.ClassHour;
|
||||
newModel.Cycle = model.Cycle;
|
||||
@@ -102,12 +104,15 @@ namespace BLL
|
||||
var db = Funs.DB;
|
||||
var lst = (from x in db.PostTraining_Standard
|
||||
join y in db.PostTraining_Course on x.CourseId equals y.Id
|
||||
join z in db.PostTraining_Role on x.RoleId equals z.Id
|
||||
join z in db.Base_WorkPost on x.WorkPostId equals z.WorkPostId
|
||||
//join z in db.PostTraining_Role on x.RoleId equals z.Id
|
||||
orderby x.Code
|
||||
select new PostTrainingStandardInfo
|
||||
{
|
||||
RoleId = x.RoleId,
|
||||
RoleName = z.Name,
|
||||
WorkPostId = x.WorkPostId,
|
||||
WorkPostName = z.WorkPostName,
|
||||
//RoleId = x.RoleId,
|
||||
//RoleName = z.RoleName,
|
||||
CourseId = x.CourseId,
|
||||
CourseName = y.Name,
|
||||
CategoryName = y.CategoryName,
|
||||
@@ -155,8 +160,9 @@ namespace BLL
|
||||
var lstStandard = GetStandardInfoList();
|
||||
//培训课程
|
||||
var lstCourse = PostTrainingCourseService.GetCourseList();
|
||||
//培训角色
|
||||
var lstRole = PostTrainingRoleService.GetRoleList();
|
||||
////培训角色
|
||||
//var lstRole = PostTrainingRoleService.GetRoleList();
|
||||
var lstWorkPost = WorkPostService.GetWorkPostList();
|
||||
//培训类别
|
||||
var lstCategory = PostTrainingCategoryService.GetCategoryList();
|
||||
//培训方式
|
||||
@@ -186,7 +192,7 @@ namespace BLL
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(roleName))
|
||||
{
|
||||
if (!lstRole.Where(x => x.Name == roleName).Any())
|
||||
if (!lstWorkPost.Where(x => x.WorkPostName == roleName).Any())
|
||||
{
|
||||
Model.ErrorInfo errorInfo = new Model.ErrorInfo();
|
||||
errorInfo.Row = rowIndex.ToString();
|
||||
@@ -392,7 +398,8 @@ namespace BLL
|
||||
CompileMan = creatUserId
|
||||
};
|
||||
newModel.CourseId = lstCourse.Where(x => x.Name == courseName).FirstOrDefault().Id;
|
||||
newModel.RoleId = lstRole.Where(x => x.Name == roleName).FirstOrDefault().Id;
|
||||
//newModel.RoleId = lstRole.Where(x => x.Name == roleName).FirstOrDefault().Id;
|
||||
newModel.WorkPostId = lstWorkPost.Where(x => x.WorkPostName == roleName).FirstOrDefault().WorkPostId;
|
||||
newModel.ClassHour = classHour;
|
||||
newModel.Cycle = cycle;
|
||||
newModel.Method = method;
|
||||
|
||||
Reference in New Issue
Block a user