0414-001

SGGL/BLL/HSSE/Check/RectifyNoticesService.cs

@@ -42,6 +42,7 @@ namespace BLL
                 DutyPerson = rectifyNotice.DutyPerson,
                 CompleteDate = rectifyNotice.CompleteDate,
                 IsRectify = rectifyNotice.IsRectify,
+                CNProfessionalId=rectifyNotice.CNProfessionalId,
                 CheckPerson = rectifyNotice.CheckPerson,
                 DutyPersonId = rectifyNotice.DutyPersonId,
                 ReCheckDate = rectifyNotice.ReCheckDate,

SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs

@@ -40,8 +40,10 @@ namespace BLL
                 TrainStartDate = training.TrainStartDate,
                 TeachHour = training.TeachHour,
                 TeachMan = training.TeachMan,
+                CNProfessionalId = training.CNProfessionalId,
                 TeachAddress = training.TeachAddress,
                 Remark = training.Remark,
+                UnitWorkIds = training.UnitWorkIds,
                 AttachUrl = training.AttachUrl,
                 TrainTypeId = training.TrainTypeId,
                 TrainLevelId = training.TrainLevelId,
@@ -62,7 +64,7 @@ namespace BLL
             {
                 newTraining.TrainEndDate = training.TrainStartDate;
             }
-            
+
             db.EduTrain_TrainRecord.InsertOnSubmit(newTraining);
             db.SubmitChanges();
             ////增加一条编码记录
@@ -83,6 +85,7 @@ namespace BLL
                 newTraining.TrainTitle = training.TrainTitle;
                 newTraining.TrainContent = training.TrainContent;
                 newTraining.TrainStartDate = training.TrainStartDate;
+                newTraining.CNProfessionalId = training.CNProfessionalId;
                 if (training.TrainEndDate.HasValue)
                 {
                     newTraining.TrainEndDate = training.TrainEndDate;
@@ -93,6 +96,7 @@ namespace BLL
                 }
                 newTraining.TeachHour = training.TeachHour;
                 newTraining.TeachMan = training.TeachMan;
+                newTraining.UnitWorkIds = training.UnitWorkIds;
                 newTraining.TeachAddress = training.TeachAddress;
                 newTraining.Remark = training.Remark;
                 newTraining.AttachUrl = training.AttachUrl;
@@ -104,7 +108,7 @@ namespace BLL
                 newTraining.FromRecordId = training.FromRecordId;
                 newTraining.WorkPostIds = training.WorkPostIds;
                 db.SubmitChanges();
-            }            
+            }
         }
 
         /// <summary>

SGGL/BLL/HSSE/License/LicenseManagerService.cs

@@ -51,13 +51,14 @@ namespace BLL
                 UnitId = licenseManager.UnitId,
                 LicenseManageContents = licenseManager.LicenseManageContents,
                 ApplicantMan = licenseManager.ApplicantMan,
+                CNProfessionalId = licenseManager.CNProfessionalId,
                 CompileMan = licenseManager.CompileMan,
                 CompileDate = licenseManager.CompileDate,
                 States = licenseManager.States,
                 WorkAreaId = licenseManager.WorkAreaId,
                 StartDate = licenseManager.StartDate,
                 EndDate = licenseManager.EndDate,
-                WorkStates=licenseManager.WorkStates,
+                WorkStates = licenseManager.WorkStates,
             };
             db.License_LicenseManager.InsertOnSubmit(newLicenseManager);
             db.SubmitChanges();
@@ -82,6 +83,7 @@ namespace BLL
                 newLicenseManager.UnitId = licenseManager.UnitId;
                 newLicenseManager.LicenseManageContents = licenseManager.LicenseManageContents;
                 newLicenseManager.ApplicantMan = licenseManager.ApplicantMan;
+                newLicenseManager.CNProfessionalId = licenseManager.CNProfessionalId;
                 newLicenseManager.CompileDate = licenseManager.CompileDate;
                 newLicenseManager.States = licenseManager.States;
                 newLicenseManager.WorkAreaId = licenseManager.WorkAreaId;
@@ -100,7 +102,7 @@ namespace BLL
         {
             Model.SGGLDB db = Funs.DB;
             Model.License_LicenseManager licenseManager = db.License_LicenseManager.FirstOrDefault(e => e.LicenseManagerId == licenseManagerId);
-            if (licenseManager!=null)
+            if (licenseManager != null)
             {
                 ///删除编码表记录
                 BLL.CodeRecordsService.DeleteCodeRecordsByDataId(licenseManagerId);
@@ -110,7 +112,7 @@ namespace BLL
                 if (flowOperate.Count() > 0)
                 {
                     BLL.CommonService.DeleteFlowOperateByID(licenseManager.LicenseManagerId);  ////删除审核流程表
-                }                     
+                }
                 db.License_LicenseManager.DeleteOnSubmit(licenseManager);
                 db.SubmitChanges();
             }

SGGL/BLL/SysManage/RoleService.cs

@@ -60,6 +60,7 @@
                 RoleCode = role.RoleCode,
                 RoleName = role.RoleName,
                 Def = role.Def,
+                CNProfessionalIds=role.CNProfessionalIds,
                 IsSystemBuilt = role.IsSystemBuilt,
                 IsOffice = role.IsOffice,
                 RoleType=role.RoleType,
@@ -83,6 +84,7 @@
                 updateRole.RoleCode = role.RoleCode;
                 updateRole.RoleName = role.RoleName;
                 updateRole.Def = role.Def;
+                updateRole.CNProfessionalIds = role.CNProfessionalIds;
                 updateRole.IsOffice = role.IsOffice;
                 updateRole.RoleType = role.RoleType;
                 db.SubmitChanges();