培训

SGGL/BLL/BLL.csproj

@@ -690,11 +690,8 @@
     <Compile Include="HSSE\OccupationHealth\PhysicalExaminationService.cs" />
     <Compile Include="HSSE\Perfomance\PerfomanceRecordService.cs" />
     <Compile Include="HSSE\Perfomance\PersonPerfomanceService.cs" />
-<<<<<<< HEAD
-=======
     <Compile Include="HSSE\PostTraining\PostTrainingRecordDetailService.cs" />
     <Compile Include="HSSE\PostTraining\PostTrainingRecordService.cs" />
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
     <Compile Include="HSSE\PostTraining\PostTrainingStandardService.cs" />
     <Compile Include="HSSE\PostTraining\PostTrainingMethodService.cs" />
     <Compile Include="HSSE\PostTraining\PostTrainingTeachersService.cs" />

SGGL/BLL/Common/Const.cs

@@ -1729,14 +1729,11 @@ namespace BLL
         #region 岗位培训
 
         /// <summary>
-<<<<<<< HEAD
-=======
         /// 岗位培训记录
         /// </summary>
         public const string PostTrainingRecordMenuId = "CEF2A108-DDC2-46A2-A47B-7431F1F890F1";
 
         /// <summary>
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
         /// 岗位培训类别
         /// </summary>
         public const string PostTrainingCategoryMenuId = "465786B2-AD20-483A-A082-B2C944BE998F";

SGGL/BLL/HSSE/PostTraining/PostTrainingCategoryService.cs

@@ -60,11 +60,8 @@ namespace BLL
                 newModel.Code = model.Code;
                 newModel.Name = model.Name;
                 newModel.Remark = model.Remark;
-<<<<<<< HEAD
-=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }

SGGL/BLL/HSSE/PostTraining/PostTrainingCourseService.cs

@@ -1,19 +1,8 @@
-<<<<<<< HEAD
-using EmitMapper;
-using Microsoft.Office.Interop.Word;
-using MiniExcelLibs;
-=======
 using MiniExcelLibs;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using Model;
 using System.Collections.Generic;
 using System;
 using System.Linq;
-<<<<<<< HEAD
-using System.Runtime.CompilerServices;
-using Quartz.Util;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace BLL
 {
@@ -75,11 +64,8 @@ namespace BLL
                 newModel.Teachers1 = model.Teachers1;
                 newModel.Teachers2 = model.Teachers2;
                 newModel.Remark = model.Remark;
-<<<<<<< HEAD
-=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }

SGGL/BLL/HSSE/PostTraining/PostTrainingMethodService.cs

@@ -60,11 +60,8 @@ namespace BLL
                 newModel.Code = model.Code;
                 newModel.Name = model.Name;
                 newModel.Remark = model.Remark;
-<<<<<<< HEAD
-=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }

SGGL/BLL/HSSE/PostTraining/PostTrainingRoleService.cs

@@ -50,11 +50,8 @@ namespace BLL
                 newModel.Code = model.Code;
                 newModel.Name = model.Name;
                 newModel.Remark = model.Remark;
-<<<<<<< HEAD
-=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }

SGGL/BLL/HSSE/PostTraining/PostTrainingStandardService.cs

@@ -1,24 +1,9 @@
-<<<<<<< HEAD
-using EmitMapper;
-using Microsoft.Office.Interop.Word;
-using MiniExcelLibs;
-=======
 using MiniExcelLibs;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using Model;
 using System.Collections.Generic;
 using System;
 using System.Linq;
-<<<<<<< HEAD
-using System.Runtime.CompilerServices;
-using Quartz.Util;
-using Microsoft.Office.Interop.Excel;
-using RestSharp;
 using System.Web.UI.WebControls;
-using Microsoft.SqlServer.Dts.Runtime;
-=======
-using System.Web.UI.WebControls;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace BLL
 {

SGGL/BLL/HSSE/PostTraining/PostTrainingTeachersService.cs

@@ -60,11 +60,8 @@ namespace BLL
                 newModel.Code = model.Code;
                 newModel.Name = model.Name;
                 newModel.Remark = model.Remark;
-<<<<<<< HEAD
-=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }