lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

培训

Browse Source
This commit is contained in:
夏菊
2025-02-25 16:41:06 +08:00
parent ca8be515a9
commit b7c8a426bf
87 changed files with 5778 additions and 1835 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HSSE/EduTrain/CompanyTrainingItemService.cs
+27 -23
View File
@@ -22,35 +22,39 @@ namespace BLL
/// <summary>
/// 添加公司培训明细
/// </summary>
/// <param name="companyTrainingItem"></param>
public static void AddCompanyTrainingItem(Model.Training_CompanyTrainingItem companyTrainingItem)
/// <param name="model"></param>
public static void AddCompanyTrainingItem(Model.Training_CompanyTrainingItem model)
{
Model.Training_CompanyTrainingItem newCompanyTrainingItem = new Model.Training_CompanyTrainingItem();
newCompanyTrainingItem.CompanyTrainingItemId = companyTrainingItem.CompanyTrainingItemId;
newCompanyTrainingItem.CompanyTrainingId = companyTrainingItem.CompanyTrainingId;
newCompanyTrainingItem.CompanyTrainingItemCode = companyTrainingItem.CompanyTrainingItemCode;
newCompanyTrainingItem.CompanyTrainingItemName = companyTrainingItem.CompanyTrainingItemName;
newCompanyTrainingItem.AttachUrl = companyTrainingItem.AttachUrl;
newCompanyTrainingItem.CompileMan = companyTrainingItem.CompileMan;
newCompanyTrainingItem.CompileDate = companyTrainingItem.CompileDate;
db.Training_CompanyTrainingItem.InsertOnSubmit(newCompanyTrainingItem);
Model.Training_CompanyTrainingItem newModel = new Model.Training_CompanyTrainingItem();
newModel.CompanyTrainingItemId = model.CompanyTrainingItemId;
newModel.CompanyTrainingId = model.CompanyTrainingId;
newModel.CompanyTrainingItemCode = model.CompanyTrainingItemCode;
newModel.CompanyTrainingItemName = model.CompanyTrainingItemName;
newModel.AttachUrl = model.AttachUrl;
newModel.CompileMan = model.CompileMan;
newModel.CompileDate = model.CompileDate;
newModel.WorkPostIds = model.WorkPostIds;
newModel.WorkPostNames = model.WorkPostNames;
db.Training_CompanyTrainingItem.InsertOnSubmit(newModel);
db.SubmitChanges();
}
/// <summary>
/// 修改公司培训明细
/// </summary>
/// <param name="companyTrainingItem"></param>
public static void UpdateCompanyTrainingItem(Model.Training_CompanyTrainingItem companyTrainingItem)
/// <param name="model"></param>
public static void UpdateCompanyTrainingItem(Model.Training_CompanyTrainingItem model)
{
Model.Training_CompanyTrainingItem newCompanyTrainingItem = db.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemId == companyTrainingItem.CompanyTrainingItemId);
if (newCompanyTrainingItem != null)
Model.Training_CompanyTrainingItem newModel = db.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemId == model.CompanyTrainingItemId);
if (newModel != null)
{
newCompanyTrainingItem.CompanyTrainingItemCode = companyTrainingItem.CompanyTrainingItemCode;
newCompanyTrainingItem.CompanyTrainingItemName = companyTrainingItem.CompanyTrainingItemName;
newCompanyTrainingItem.AttachUrl = companyTrainingItem.AttachUrl;
newCompanyTrainingItem.CompileMan = companyTrainingItem.CompileMan;
newCompanyTrainingItem.CompileDate = companyTrainingItem.CompileDate;
newModel.CompanyTrainingItemCode = model.CompanyTrainingItemCode;
newModel.CompanyTrainingItemName = model.CompanyTrainingItemName;
newModel.AttachUrl = model.AttachUrl;
newModel.CompileMan = model.CompileMan;
newModel.CompileDate = model.CompileDate;
newModel.WorkPostIds = model.WorkPostIds;
newModel.WorkPostNames = model.WorkPostNames;
db.SubmitChanges();
}
}
@@ -61,10 +65,10 @@ namespace BLL
/// <param name="companyTrainItemId"></param>
public static void DeleteCompanyTrainingItemById(string companyTrainItemId)
{
Model.Training_CompanyTrainingItem companyTrainingItem = db.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemId == companyTrainItemId);
if (companyTrainingItem != null)
Model.Training_CompanyTrainingItem model = db.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemId == companyTrainItemId);
if (model != null)
{
db.Training_CompanyTrainingItem.DeleteOnSubmit(companyTrainingItem);
db.Training_CompanyTrainingItem.DeleteOnSubmit(model);
db.SubmitChanges();
}
}
SGGL/BLL/HSSE/PostTraining/PostTrainingRecordService.cs
+4 -2
View File
@@ -42,7 +42,8 @@ namespace BLL
Method = model.Method,
Lecturer = model.Lecturer,
UnitIds = model.UnitIds,
RoleIds = model.RoleIds,
//RoleIds = model.RoleIds,
WorkPostIds = model.WorkPostIds,
PersonNum = model.PersonNum,
TrainingTime = model.TrainingTime,
Duration = model.Duration,
@@ -74,7 +75,8 @@ namespace BLL
newModel.Method = model.Method;
newModel.Lecturer = model.Lecturer;
newModel.UnitIds = model.UnitIds;
newModel.RoleIds = model.RoleIds;
newModel.WorkPostIds = model.WorkPostIds;
//newModel.RoleIds = model.RoleIds;
newModel.PersonNum = model.PersonNum;
newModel.TrainingTime = model.TrainingTime;
newModel.Duration = model.Duration;
SGGL/BLL/HSSE/PostTraining/PostTrainingStandardService.cs
+16 -9
View File
@@ -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;
SGGL/BLL/HSSE/SitePerson/PersonService.cs
+2 -2
View File
@@ -344,7 +344,7 @@ namespace BLL
TeamGroupId = person.TeamGroupId,
WorkAreaId = person.WorkAreaId,
WorkPostId = person.WorkPostId,
PostTrainingRoleId = person.PostTrainingRoleId,
//PostTrainingRoleId = person.PostTrainingRoleId,
OutTime = person.OutTime,
OutResult = person.OutResult,
Telephone = person.Telephone,
@@ -424,7 +424,7 @@ namespace BLL
newPerson.TeamGroupId = person.TeamGroupId;
newPerson.WorkAreaId = person.WorkAreaId;
newPerson.WorkPostId = person.WorkPostId;
newPerson.PostTrainingRoleId = person.PostTrainingRoleId;
//newPerson.PostTrainingRoleId = person.PostTrainingRoleId;
newPerson.InTime = person.InTime;
newPerson.OutTime = person.OutTime;
newPerson.IsSafetyMonitoring = person.IsSafetyMonitoring;