1

DataBase/版本日志/SGGLDB_V2025-02-17-xiaj（岗位培训模块）.sql

@@ -13,11 +13,16 @@ END
 GO
 
 --岗位培训
+<<<<<<< HEAD
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '465786B2-AD20-483A-A082-B2C944BE998F')
+BEGIN
+=======
 IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'CEF2A108-DDC2-46A2-A47B-7431F1F890F1')
 BEGIN
 	--岗位培训记录
 	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsEnd,IsUsed)
 	VALUES('CEF2A108-DDC2-46A2-A47B-7431F1F890F1','岗位培训记录','HSSE/PostTraining/Record.aspx',10,'BEA50D7C-60FE-488B-8D7D-255020EEB4C2','Menu_HSSE',1,1)
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 	--岗位培训类别
 	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsEnd,IsUsed)
 	VALUES('465786B2-AD20-483A-A082-B2C944BE998F','岗位培训类别','HSSE/PostTraining/Category.aspx',100,'BEA50D7C-60FE-488B-8D7D-255020EEB4C2','Menu_HSSE',1,1)
@@ -38,6 +43,8 @@ BEGIN
 	VALUES('026F0A23-AECD-4BB8-8504-1EB8CB9151C0','岗位培训教资','HSSE/PostTraining/Teachers.aspx',150,'BEA50D7C-60FE-488B-8D7D-255020EEB4C2','Menu_HSSE',1,1)
 END
 GO
+<<<<<<< HEAD
+=======
 IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = 'CEF2A108-DDC2-46A2-A47B-7431F1F890F1')
 BEGIN
 	--岗位培训记录
@@ -51,6 +58,7 @@ BEGIN
     VALUES('E927076D-EC0E-44D5-816A-99A401D7051C','CEF2A108-DDC2-46A2-A47B-7431F1F890F1','保存',4)
 END
 GO
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '465786B2-AD20-483A-A082-B2C944BE998F')
 BEGIN
 	--岗位培训类别
@@ -130,16 +138,21 @@ BEGIN
 END
 GO
 
+<<<<<<< HEAD
+=======
 --1、用户补充培训岗位Id
 IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'SitePerson_Person' AND COLUMN_NAME = 'PostTrainingRoleId')
 BEGIN
 	ALTER TABLE SitePerson_Person ADD PostTrainingRoleId nvarchar(50);
 END
 GO
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 
 /*******************************岗位培训数据表******************************************************************************************/
 
+<<<<<<< HEAD
+=======
 --岗位培训记录
 IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'PostTraining_Record') AND type = N'U')
 BEGIN
@@ -232,6 +245,7 @@ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'
 END
 
 GO
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 --岗位培训类别
 IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'PostTraining_Category') AND type = N'U')
@@ -492,6 +506,8 @@ END
 
 GO
 
+<<<<<<< HEAD
+=======
 /****** Object:  View [dbo].[View_PostTraining_RecordDetail]    Script Date: 2025-2-20 17:56:03 ******/
 SET ANSI_NULLS ON
 GO
@@ -662,3 +678,4 @@ LEFT JOIN PostTraining_Role AS PostRole ON PostRole.Id = Person.PostTrainingRole
 
 GO
 
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74

SGGL/BLL/BLL.csproj

@@ -690,8 +690,11 @@
     <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,11 +1729,14 @@ 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,8 +60,11 @@ 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,8 +1,19 @@
+<<<<<<< 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
 {
@@ -64,8 +75,11 @@ 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,8 +60,11 @@ 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,8 +50,11 @@ 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,9 +1,24 @@
+<<<<<<< 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,8 +60,11 @@ 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/FineUIPro.Web/FineUIPro.Web.csproj

@@ -2200,12 +2200,18 @@
     <Content Include="HSSE\Perfomance\PersonPerfomance.aspx" />
     <Content Include="HSSE\Perfomance\PersonPerfomanceEdit.aspx" />
     <Content Include="HSSE\Perfomance\PersonPerfomanceView.aspx" />
+<<<<<<< HEAD
+    <Content Include="HSSE\PostTraining\Standard.aspx" />
+    <Content Include="HSSE\PostTraining\StandardDataIn.aspx" />
+    <Content Include="HSSE\PostTraining\CourseDataIn.aspx" />
+=======
     <Content Include="HSSE\PostTraining\Record.aspx" />
     <Content Include="HSSE\PostTraining\SelectPerson.aspx" />
     <Content Include="HSSE\PostTraining\Standard.aspx" />
     <Content Include="HSSE\PostTraining\StandardDataIn.aspx" />
     <Content Include="HSSE\PostTraining\CourseDataIn.aspx" />
     <Content Include="HSSE\PostTraining\RecordEdit.aspx" />
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
     <Content Include="HSSE\PostTraining\StandardEdit.aspx" />
     <Content Include="HSSE\PostTraining\Teachers.aspx" />
     <Content Include="HSSE\PostTraining\TeachersEdit.aspx" />
@@ -15085,6 +15091,8 @@
     <Compile Include="HSSE\Perfomance\PersonPerfomanceView.aspx.designer.cs">
       <DependentUpon>PersonPerfomanceView.aspx</DependentUpon>
     </Compile>
+<<<<<<< HEAD
+=======
     <Compile Include="HSSE\PostTraining\Record.aspx.cs">
       <DependentUpon>Record.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15099,6 +15107,7 @@
     <Compile Include="HSSE\PostTraining\SelectPerson.aspx.designer.cs">
       <DependentUpon>SelectPerson.aspx</DependentUpon>
     </Compile>
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
     <Compile Include="HSSE\PostTraining\Standard.aspx.cs">
       <DependentUpon>Standard.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15120,6 +15129,8 @@
     <Compile Include="HSSE\PostTraining\CourseDataIn.aspx.designer.cs">
       <DependentUpon>CourseDataIn.aspx</DependentUpon>
     </Compile>
+<<<<<<< HEAD
+=======
     <Compile Include="HSSE\PostTraining\RecordEdit.aspx.cs">
       <DependentUpon>RecordEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15127,6 +15138,7 @@
     <Compile Include="HSSE\PostTraining\RecordEdit.aspx.designer.cs">
       <DependentUpon>RecordEdit.aspx</DependentUpon>
     </Compile>
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
     <Compile Include="HSSE\PostTraining\StandardEdit.aspx.cs">
       <DependentUpon>StandardEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -19711,7 +19723,7 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservation.aspx.cs

@@ -1,8 +1,19 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using BLL;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine

SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservationEdit.aspx.cs

@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituation.aspx.cs

@@ -1,8 +1,19 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using BLL;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine

SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituationEdit.aspx.cs

@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivities.aspx.cs

@@ -1,8 +1,19 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using BLL;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine

SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivitiesEdit.aspx.cs

@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeeting.aspx.cs

@@ -1,8 +1,19 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using BLL;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine

SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeetingEdit.aspx.cs

@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituation.aspx.cs

@@ -1,8 +1,19 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using BLL;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine

SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituationEdit.aspx.cs

@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/OnePersonPerFile.aspx.cs

@@ -1,8 +1,17 @@
 using BLL;
 using System;
 using System.Collections.Generic;
+<<<<<<< HEAD
+using System.Configuration;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
+=======
 using System.Data;
 using System.Linq;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlan.aspx.cs

@@ -1,8 +1,19 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using BLL;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine

SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlanEdit.aspx.cs

@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperience.aspx.cs

@@ -1,4 +1,16 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using BLL;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
+using AspNet = System.Web.UI.WebControls;
+
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
@@ -6,6 +18,7 @@ using BLL;
 using AspNet = System.Web.UI.WebControls;
 
 
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 namespace FineUIPro.Web.HSSE.Examine
 {
     public partial class SharingOfSafetyExperience : PageBase

SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperienceEdit.aspx.cs

@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/StaffHSEInfoArchives.aspx.cs

@@ -1,7 +1,19 @@
 using BLL;
+<<<<<<< HEAD
+using FineUIPro.Web.HSSE.SitePerson;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
+=======
 using System;
 using System.Data;
 using System.Linq;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/PostTraining/Category.aspx.cs

@@ -1,7 +1,16 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 

SGGL/FineUIPro.Web/HSSE/PostTraining/CategoryEdit.aspx.cs

@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {

SGGL/FineUIPro.Web/HSSE/PostTraining/Course.aspx.cs

@@ -4,6 +4,10 @@ using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
+<<<<<<< HEAD
+using System.Xml.Linq;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 

SGGL/FineUIPro.Web/HSSE/PostTraining/CourseDataIn.aspx.cs

@@ -6,6 +6,11 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Web;
+<<<<<<< HEAD
+using System.Web.UI;
+using System.Web.UI.WebControls;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {

SGGL/FineUIPro.Web/HSSE/PostTraining/CourseEdit.aspx.cs

@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {

SGGL/FineUIPro.Web/HSSE/PostTraining/Method.aspx.cs

@@ -1,7 +1,16 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 

SGGL/FineUIPro.Web/HSSE/PostTraining/MethodEdit.aspx.cs

@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {

SGGL/FineUIPro.Web/HSSE/PostTraining/Role.aspx.cs

@@ -1,7 +1,16 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 

SGGL/FineUIPro.Web/HSSE/PostTraining/RoleEdit.aspx.cs

@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {

SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx

@@ -61,7 +61,11 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
+<<<<<<< HEAD
+                        <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center" EnableLock="true" Locked="true"
+=======
                         <f:TemplateField ColumnID="tfNumber" Width="60px" HeaderText="序号" HeaderTextAlign="Center" EnableLock="true" Locked="true"
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                             TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>

SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx.cs

@@ -4,6 +4,10 @@ using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
+<<<<<<< HEAD
+using System.Xml.Linq;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 
@@ -99,7 +103,11 @@ namespace FineUIPro.Web.HSSE.PostTraining
             }
             if (this.drpRole.SelectedValue != BLL.Const._Null)
             {
+<<<<<<< HEAD
+                strSql += " AND Course.RoleId = @RoleId";
+=======
                 strSql += " AND Standard.RoleId = @RoleId";
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 listStr.Add(new SqlParameter("@RoleId", this.drpRole.SelectedValue));
             }
             if (this.drpCategory.SelectedValue != BLL.Const._Null)

SGGL/FineUIPro.Web/HSSE/PostTraining/StandardDataIn.aspx.cs

@@ -6,6 +6,11 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Web;
+<<<<<<< HEAD
+using System.Web.UI;
+using System.Web.UI.WebControls;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {

SGGL/FineUIPro.Web/HSSE/PostTraining/StandardEdit.aspx.cs

@@ -1,5 +1,11 @@
 using BLL;
+<<<<<<< HEAD
+using Microsoft.Office.Interop.Excel;
 using System;
+using System.Web;
+=======
+using System;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {
@@ -154,7 +160,11 @@ namespace FineUIPro.Web.HSSE.PostTraining
             newModel.RoleId = this.drpRole.SelectedValue;
             newModel.CourseId = this.drpCourse.SelectedValue;
             newModel.ClassHour = decimal.Parse(this.txtClassHour.Text.Trim());
+<<<<<<< HEAD
+            newModel.Cycle = int.Parse(this.txtCycle.Text.Trim());
+=======
             newModel.Cycle = decimal.Parse(this.txtCycle.Text.Trim());
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
             newModel.Method = this.drpMethod.SelectedText;
             newModel.Outcome = this.drpOutcome.SelectedText;
             newModel.Teachers = this.drpTeachers.SelectedText;

SGGL/FineUIPro.Web/HSSE/PostTraining/Teachers.aspx.cs

@@ -1,7 +1,16 @@
 using System;
+<<<<<<< HEAD
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+=======
 using System.Data;
 using System.Linq;
 using System.Text;
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 

SGGL/FineUIPro.Web/HSSE/PostTraining/TeachersEdit.aspx.cs

@@ -1,5 +1,9 @@
 using BLL;
 using System;
+<<<<<<< HEAD
+using System.Web;
+=======
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {

SGGL/Model/Model.cs

@@ -1814,12 +1814,15 @@ namespace Model
     partial void InsertPostTraining_Method(PostTraining_Method instance);
     partial void UpdatePostTraining_Method(PostTraining_Method instance);
     partial void DeletePostTraining_Method(PostTraining_Method instance);
+<<<<<<< HEAD
+=======
     partial void InsertPostTraining_Record(PostTraining_Record instance);
     partial void UpdatePostTraining_Record(PostTraining_Record instance);
     partial void DeletePostTraining_Record(PostTraining_Record instance);
     partial void InsertPostTraining_Record_Detail(PostTraining_Record_Detail instance);
     partial void UpdatePostTraining_Record_Detail(PostTraining_Record_Detail instance);
     partial void DeletePostTraining_Record_Detail(PostTraining_Record_Detail instance);
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
     partial void InsertPostTraining_Role(PostTraining_Role instance);
     partial void UpdatePostTraining_Role(PostTraining_Role instance);
     partial void DeletePostTraining_Role(PostTraining_Role instance);
@@ -7516,6 +7519,8 @@ namespace Model
 			}
 		}
 		
+<<<<<<< HEAD
+=======
 		public System.Data.Linq.Table<PostTraining_Record> PostTraining_Record
 		{
 			get
@@ -7532,6 +7537,7 @@ namespace Model
 			}
 		}
 		
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 		public System.Data.Linq.Table<PostTraining_Role> PostTraining_Role
 		{
 			get
@@ -288011,8 +288017,11 @@ namespace Model
 		
 		private EntitySet<PostTraining_Course> _PostTraining_Course;
 		
+<<<<<<< HEAD
+=======
 		private EntitySet<PostTraining_Record> _PostTraining_Record;
 		
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -288035,7 +288044,10 @@ namespace Model
 		{
 			this._Sys_User = default(EntityRef<Sys_User>);
 			this._PostTraining_Course = new EntitySet<PostTraining_Course>(new Action<PostTraining_Course>(this.attach_PostTraining_Course), new Action<PostTraining_Course>(this.detach_PostTraining_Course));
+<<<<<<< HEAD
+=======
 			this._PostTraining_Record = new EntitySet<PostTraining_Record>(new Action<PostTraining_Record>(this.attach_PostTraining_Record), new Action<PostTraining_Record>(this.detach_PostTraining_Record));
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 			OnCreated();
 		}
 		
@@ -288210,6 +288222,8 @@ namespace Model
 			}
 		}
 		
+<<<<<<< HEAD
+=======
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_PostTraining_Category", Storage="_PostTraining_Record", ThisKey="Id", OtherKey="CategoryId", DeleteRule="NO ACTION")]
 		public EntitySet<PostTraining_Record> PostTraining_Record
 		{
@@ -288223,6 +288237,7 @@ namespace Model
 			}
 		}
 		
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -288254,6 +288269,8 @@ namespace Model
 			this.SendPropertyChanging();
 			entity.PostTraining_Category = null;
 		}
+<<<<<<< HEAD
+=======
 		
 		private void attach_PostTraining_Record(PostTraining_Record entity)
 		{
@@ -288266,6 +288283,7 @@ namespace Model
 			this.SendPropertyChanging();
 			entity.PostTraining_Category = null;
 		}
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PostTraining_Course")]
@@ -288302,8 +288320,11 @@ namespace Model
 		
 		private EntityRef<Sys_User> _Sys_User;
 		
+<<<<<<< HEAD
+=======
 		private EntitySet<PostTraining_Record> _PostTraining_Record;
 		
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 		private EntitySet<PostTraining_Standard> _PostTraining_Standard;
 		
     #region 可扩展性方法定义
@@ -288340,7 +288361,10 @@ namespace Model
 		{
 			this._PostTraining_Category = default(EntityRef<PostTraining_Category>);
 			this._Sys_User = default(EntityRef<Sys_User>);
+<<<<<<< HEAD
+=======
 			this._PostTraining_Record = new EntitySet<PostTraining_Record>(new Action<PostTraining_Record>(this.attach_PostTraining_Record), new Action<PostTraining_Record>(this.detach_PostTraining_Record));
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 			this._PostTraining_Standard = new EntitySet<PostTraining_Standard>(new Action<PostTraining_Standard>(this.attach_PostTraining_Standard), new Action<PostTraining_Standard>(this.detach_PostTraining_Standard));
 			OnCreated();
 		}
@@ -288661,6 +288685,8 @@ namespace Model
 			}
 		}
 		
+<<<<<<< HEAD
+=======
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_PostTraining_Course", Storage="_PostTraining_Record", ThisKey="Id", OtherKey="CourseId", DeleteRule="NO ACTION")]
 		public EntitySet<PostTraining_Record> PostTraining_Record
 		{
@@ -288674,6 +288700,7 @@ namespace Model
 			}
 		}
 		
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Standard_PostTraining_Course", Storage="_PostTraining_Standard", ThisKey="Id", OtherKey="CourseId", DeleteRule="NO ACTION")]
 		public EntitySet<PostTraining_Standard> PostTraining_Standard
 		{
@@ -288707,6 +288734,8 @@ namespace Model
 			}
 		}
 		
+<<<<<<< HEAD
+=======
 		private void attach_PostTraining_Record(PostTraining_Record entity)
 		{
 			this.SendPropertyChanging();
@@ -288719,6 +288748,7 @@ namespace Model
 			entity.PostTraining_Course = null;
 		}
 		
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 		private void attach_PostTraining_Standard(PostTraining_Standard entity)
 		{
 			this.SendPropertyChanging();
@@ -288955,6 +288985,8 @@ namespace Model
 		}
 	}
 	
+<<<<<<< HEAD
+=======
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PostTraining_Record")]
 	public partial class PostTraining_Record : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -289816,6 +289848,7 @@ namespace Model
 		}
 	}
 	
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PostTraining_Role")]
 	public partial class PostTraining_Role : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -375274,8 +375307,11 @@ namespace Model
 		
 		private EntitySet<PostTraining_Method> _PostTraining_Method;
 		
+<<<<<<< HEAD
+=======
 		private EntitySet<PostTraining_Record> _PostTraining_Record;
 		
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 		private EntitySet<PostTraining_Role> _PostTraining_Role;
 		
 		private EntitySet<PostTraining_Standard> _PostTraining_Standard;
@@ -375837,7 +375873,10 @@ namespace Model
 			this._PostTraining_Category = new EntitySet<PostTraining_Category>(new Action<PostTraining_Category>(this.attach_PostTraining_Category), new Action<PostTraining_Category>(this.detach_PostTraining_Category));
 			this._PostTraining_Course = new EntitySet<PostTraining_Course>(new Action<PostTraining_Course>(this.attach_PostTraining_Course), new Action<PostTraining_Course>(this.detach_PostTraining_Course));
 			this._PostTraining_Method = new EntitySet<PostTraining_Method>(new Action<PostTraining_Method>(this.attach_PostTraining_Method), new Action<PostTraining_Method>(this.detach_PostTraining_Method));
+<<<<<<< HEAD
+=======
 			this._PostTraining_Record = new EntitySet<PostTraining_Record>(new Action<PostTraining_Record>(this.attach_PostTraining_Record), new Action<PostTraining_Record>(this.detach_PostTraining_Record));
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 			this._PostTraining_Role = new EntitySet<PostTraining_Role>(new Action<PostTraining_Role>(this.attach_PostTraining_Role), new Action<PostTraining_Role>(this.detach_PostTraining_Role));
 			this._PostTraining_Standard = new EntitySet<PostTraining_Standard>(new Action<PostTraining_Standard>(this.attach_PostTraining_Standard), new Action<PostTraining_Standard>(this.detach_PostTraining_Standard));
 			this._PostTraining_Teachers = new EntitySet<PostTraining_Teachers>(new Action<PostTraining_Teachers>(this.attach_PostTraining_Teachers), new Action<PostTraining_Teachers>(this.detach_PostTraining_Teachers));
@@ -380454,6 +380493,8 @@ namespace Model
 			}
 		}
 		
+<<<<<<< HEAD
+=======
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_Sys_User", Storage="_PostTraining_Record", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
 		public EntitySet<PostTraining_Record> PostTraining_Record
 		{
@@ -380467,6 +380508,7 @@ namespace Model
 			}
 		}
 		
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Role_Sys_User", Storage="_PostTraining_Role", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
 		public EntitySet<PostTraining_Role> PostTraining_Role
 		{
@@ -384849,6 +384891,8 @@ namespace Model
 			entity.Sys_User = null;
 		}
 		
+<<<<<<< HEAD
+=======
 		private void attach_PostTraining_Record(PostTraining_Record entity)
 		{
 			this.SendPropertyChanging();
@@ -384861,6 +384905,7 @@ namespace Model
 			entity.Sys_User = null;
 		}
 		
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 		private void attach_PostTraining_Role(PostTraining_Role entity)
 		{
 			this.SendPropertyChanging();
@@ -458469,10 +458514,13 @@ namespace Model
 		
 		private string _PoliticsStatusName;
 		
+<<<<<<< HEAD
+=======
 		private string _PostTrainingRoleId;
 		
 		private string _PostTrainingRoleName;
 		
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 		public View_SitePerson_PersonList()
 		{
 		}
@@ -458844,6 +458892,8 @@ namespace Model
 				}
 			}
 		}
+<<<<<<< HEAD
+=======
 		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PostTrainingRoleId", DbType="NVarChar(50)")]
 		public string PostTrainingRoleId
@@ -458876,6 +458926,7 @@ namespace Model
 				}
 			}
 		}
+>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Solution_LargerHazardListItem")]