diff --git a/DataBase/版本日志/SGGLDB_V2025-02-17-xiaj（岗位培训模块）.sql b/DataBase/版本日志/SGGLDB_V2025-02-17-xiaj（岗位培训模块）.sql index 6fa1200..ed7a1a4 100644 --- a/DataBase/版本日志/SGGLDB_V2025-02-17-xiaj（岗位培训模块）.sql +++ b/DataBase/版本日志/SGGLDB_V2025-02-17-xiaj（岗位培训模块）.sql @@ -13,8 +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) @@ -35,6 +43,22 @@ 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 + --λѵ¼ + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('D35FC243-EAB1-47DF-9590-7E9403F969F9','CEF2A108-DDC2-46A2-A47B-7431F1F890F1','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('3121AEDD-C697-4B70-ADB4-619B17636888','CEF2A108-DDC2-46A2-A47B-7431F1F890F1','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('D517703B-3232-4296-892E-944372715424','CEF2A108-DDC2-46A2-A47B-7431F1F890F1','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + 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 --λѵ @@ -114,10 +138,114 @@ 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 + +CREATE TABLE [dbo].[PostTraining_Record]( + [Id] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NOT NULL, + [Code] [nvarchar](50) NULL, + [Name] [nvarchar](200) NULL, + [Content] [nvarchar](500) NULL, + [CategoryId] [nvarchar](50) NULL, + [CategoryName] [nvarchar](200) NULL, + [CourseId] [nvarchar](50) NOT NULL, + [CourseName] [nvarchar](200) NULL, + [Location] [nvarchar](200) NULL, + [Method] [nvarchar](200) NULL, + [Lecturer] [nvarchar](200) NULL, + [UnitIds] [nvarchar](max) NULL, + [RoleIds] [nvarchar](max) NULL, + [PersonNum] [int] NOT NULL, + [TrainingTime] [datetime] NOT NULL, + [Duration] [decimal](10, 2) NOT NULL, + [Remark] [nvarchar](1000) NULL, + [CompileDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + CONSTRAINT [PK_PostTraining_Record] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +ALTER TABLE [dbo].[PostTraining_Record] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Record_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +ALTER TABLE [dbo].[PostTraining_Record] CHECK CONSTRAINT [FK_PostTraining_Record_Base_Project] +ALTER TABLE [dbo].[PostTraining_Record] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Record_PostTraining_Category] FOREIGN KEY([CategoryId]) +REFERENCES [dbo].[PostTraining_Category] ([Id]) +ALTER TABLE [dbo].[PostTraining_Record] CHECK CONSTRAINT [FK_PostTraining_Record_PostTraining_Category] +ALTER TABLE [dbo].[PostTraining_Record] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Record_PostTraining_Course] FOREIGN KEY([CourseId]) +REFERENCES [dbo].[PostTraining_Course] ([Id]) +ALTER TABLE [dbo].[PostTraining_Record] CHECK CONSTRAINT [FK_PostTraining_Record_PostTraining_Course] +ALTER TABLE [dbo].[PostTraining_Record] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Record_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[PostTraining_Record] CHECK CONSTRAINT [FK_PostTraining_Record_Sys_User] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'ProjectId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Code' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Name' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Content' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'CategoryId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'CategoryName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'γId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'CourseId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'γ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'CourseName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵص' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Location' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵʽ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Method' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ڿ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Lecturer' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'UnitIds' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'RoleIds' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'PersonNum' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'TrainingTime' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѧʱСʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Duration' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Remark' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'CompileMan' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'CompileDate' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λѵγ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record' +END + +GO + + +--λѵԱ¼ϸ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'PostTraining_Record_Detail') AND type = N'U') +BEGIN + +CREATE TABLE [dbo].[PostTraining_Record_Detail]( + [Id] [nvarchar](50) NOT NULL, + [RecordId] [nvarchar](50) NULL, + [PersonId] [nvarchar](50) NULL + CONSTRAINT [PK_PostTraining_Record_Detail] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +ALTER TABLE [dbo].[PostTraining_Record_Detail] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Record_Detail_PostTraining_Record] FOREIGN KEY([RecordId]) +REFERENCES [dbo].[PostTraining_Record] ([Id]) +ALTER TABLE [dbo].[PostTraining_Record_Detail] CHECK CONSTRAINT [FK_PostTraining_Record_Detail_PostTraining_Record] + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record_Detail', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ¼Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record_Detail', @level2type=N'COLUMN',@level2name=N'RecordId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵԱId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record_Detail', @level2type=N'COLUMN',@level2name=N'PersonId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λѵԱ¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record_Detail' +END + +GO +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 --λѵ IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'PostTraining_Category') AND type = N'U') @@ -378,3 +506,176 @@ END GO +<<<<<<< HEAD +======= +/****** Object: View [dbo].[View_PostTraining_RecordDetail] Script Date: 2025-2-20 17:56:03 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + +--λѵ¼ϸбͼ +CREATE VIEW [dbo].[View_PostTraining_RecordDetail] AS +SELECT recordDetail.Id AS DetailId, + recordDetail.RecordId, + recordDetail.PersonId, + person.UnitId, + unit.UnitName, + person.PersonName, + pRole.Name AS RoleName +FROM dbo.PostTraining_Record_Detail AS recordDetail +LEFT JOIN dbo.SitePerson_Person AS person ON person.PersonId = recordDetail.PersonId +LEFT JOIN dbo.Base_Unit AS unit ON unit.UnitId=person.UnitId +LEFT JOIN dbo.PostTraining_Role AS pRole ON pRole.Id=person.PostTrainingRoleId + +GO + +ALTER VIEW [dbo].[View_SitePerson_Person] +AS +SELECT Person.PersonId, + Person.CardNo, + Person.PersonName, + Person.Sex, + (Case Person.Sex WHEN '1' THEN '' WHEN '2' THEN 'Ů' ELSE '' END) AS SexName, + Person.IdentityCard, + Person.Address, + Person.ProjectId, + Person.UnitId, + Person.Birthday, + Person.TeamGroupId, + Person.WorkAreaId, + Person.WorkPostId, + Person.InTime, + Person.OutTime, + Person.OutResult, + Person.Telephone, + Person.PositionId, + Person.PostTitleId, + Person.PhotoUrl, + Person.IsUsed, + (CASE Person.IsUsed WHEN 'TRUE' THEN '' ELSE '' END) AS IsUsedName, + Person.IsCardUsed, + (CASE Person.IsCardUsed WHEN 'TRUE' THEN '' ELSE '' END) AS IsCardUsedName, + Person.PersonIndex, + Project.ProjectCode, + Project.ProjectName, + Unit.UnitCode, + Unit.UnitName, + TeamGroup.TeamGroupName, + --WorkArea.UnitWorkCode AS WorkAreaCode, + WorkAreaCode= STUFF((SELECT ',' + UnitWorkCode FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + --WorkArea.UnitWorkName AS WorkAreaName + WorkAreaName= STUFF((SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + Post.WorkPostName, + Position.PositionName, + Title.PostTitleName, + Depart.DepartName, + Post.PostType, + Post.IsHsse, + (SELECT COUNT(*) FROM EduTrain_TrainRecordDetail T WHERE T.PersonId=Person.PersonId) AS TrainCount, + Person.AuditorId, + sysUser.UserName AS AuditorName, + Person.AuditorDate, + Person.IDCardUrl, + Person.IsForeign, + case when Person.IsForeign=1 then '' else '' end as IsForeignStr, + Person.IdcardType, + BasicData1.dictName as IdcardTypeName, + Person.IdcardStartDate, + Person.IdcardEndDate, + Person.IdcardForever, + case when Person.IdcardForever='Y' then '' else '' end as IdcardForeverStr, + Person.PoliticsStatus, + BasicData2.dictName as PoliticsStatusName, + Person.IdcardAddress, + Person.Nation, + BasicData3.dictName as NationName, + Person.EduLevel, + BasicData4.dictName as EduLevelName, + Person.MaritalStatus, + BasicData5.dictName as MaritalStatusName, + Person.CountryCode, + Country.cname as CountryName, + Person.ProvinceCode, + City.cname as ProvinceName, + Person.MainCNProfessionalId, + CNProfessional.ProfessionalName as MainCNProfessionalName, + Person.ViceCNProfessionalId, + '' as ViceCNProfessionalName, + Person.IsOutside, + case when Person.IsOutside=1 then '' else '' end as IsOutsideStr, + Person.BlackList, + Person.BlackReason, + Person.States, + sysUser.StarLevelId, + StarLevel.StarMark, + StarLevel.LevelValue, + Person.PostTrainingRoleId, + PostRole.Name AS PostTrainingRoleName + +FROM SitePerson_Person AS Person +LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId +LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId +LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId=Person.TeamGroupId +--LEFT JOIN WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Person.WorkAreaId +LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = Person.WorkPostId +LEFT JOIN Base_Position AS Position ON Position.PositionId = Person.PositionId +Left JOIN Base_PostTitle AS Title ON Title.PostTitleId = Person.PostTitleId +Left JOIN Base_Depart AS Depart ON Depart.DepartId = Person.DepartId +Left JOIN Sys_User AS sysUser ON sysUser.UserId = Person.AuditorId +Left JOIN RealName_BasicData AS BasicData1 ON BasicData1.dictCode = Person.IdcardType +Left JOIN RealName_BasicData AS BasicData2 ON BasicData2.dictCode = Person.PoliticsStatus +Left JOIN RealName_BasicData AS BasicData3 ON BasicData3.dictCode = Person.Nation +Left JOIN RealName_BasicData AS BasicData4 ON BasicData4.dictCode = Person.EduLevel +Left JOIN RealName_BasicData AS BasicData5 ON BasicData5.dictCode = Person.MaritalStatus +Left JOIN RealName_Country AS Country ON Country.CountryId = Person.CountryCode +Left JOIN RealName_City AS City ON City.provinceCode = Person.ProvinceCode +Left JOIN Base_CNProfessional AS CNProfessional ON CNProfessional.CNProfessionalId = Person.MainCNProfessionalId +Left JOIN Base_StarLevel AS StarLevel ON sysUser.StarLevelId = StarLevel.StarLevelId +Left JOIN PostTraining_Role AS PostRole ON PostRole.Id = Person.PostTrainingRoleId + +GO + +ALTER VIEW [dbo].[View_SitePerson_PersonList] +AS + +SELECT + Person.PersonId, + Person.ProjectId, + Person.IsUsed, + Person.IsForeign, + Person.IsOutside, + Person.BlackList, + Person.CardNo, + Person.PersonName, + Person.UnitId, + Unit.UnitName, + Post.WorkPostName, + WorkAreaName= STUFF((SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + TeamGroup.TeamGroupName, + Person.InTime, + Person.OutTime, + (CASE Person.IsUsed WHEN 'TRUE' THEN '' ELSE '' END) AS IsUsedName, + Person.IdentityCard, + Person.TeamGroupId, + Person.WorkPostId, + Person.IdcardType, + Person.PhotoUrl, + edu.TrainCount, + PoliticsStatus.dictName AS PoliticsStatusName, + Person.PostTrainingRoleId, + PostRole.Name AS PostTrainingRoleName +FROM SitePerson_Person AS Person +LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId +LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId=Person.TeamGroupId +LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = Person.WorkPostId +LEFT JOIN RealName_BasicData AS PoliticsStatus ON PoliticsStatus.dictCode = Person.PoliticsStatus AND PoliticsStatus.DictTypeCode='POLITICAL_LANDSCAPE' +LEFT JOIN (select PersonId,count(PersonId)as TrainCount from EduTrain_TrainRecordDetail group by PersonId) as edu on edu.PersonId= Person.PersonId +LEFT JOIN PostTraining_Role AS PostRole ON PostRole.Id = Person.PostTrainingRoleId + + + +GO + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 180b4e4..2dfb61b 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -277,6 +277,7 @@ + @@ -689,6 +690,11 @@ +<<<<<<< HEAD +======= + + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index ec93f6d..2d607a4 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -1729,6 +1729,14 @@ namespace BLL #region 岗位培训 /// +<<<<<<< HEAD +======= + /// 岗位培训记录 + /// + public const string PostTrainingRecordMenuId = "CEF2A108-DDC2-46A2-A47B-7431F1F890F1"; + + /// +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 /// 岗位培训类别 /// public const string PostTrainingCategoryMenuId = "465786B2-AD20-483A-A082-B2C944BE998F"; diff --git a/SGGL/BLL/Common/StringHelper.cs b/SGGL/BLL/Common/StringHelper.cs new file mode 100644 index 0000000..cbfe875 --- /dev/null +++ b/SGGL/BLL/Common/StringHelper.cs @@ -0,0 +1,29 @@ +using System; +using System.Data; +using System.Linq; + +namespace BLL +{ + /// + /// 字符串操作辅助类 + /// + public class StringHelper + { + /// + /// 字符串转换 + /// 'A,B,C' => 'A','B','C' + /// + /// + /// + public static string StringConvert(string str) + { + string result = string.Empty; + if (!string.IsNullOrWhiteSpace(str)) + { + string[] items = str.Split(','); + result = string.Join(",", items.Select(x => $"'{x}'")); + } + return result; + } + } +} diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingCategoryService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingCategoryService.cs index 44adf4a..116ea93 100644 --- a/SGGL/BLL/HSSE/PostTraining/PostTrainingCategoryService.cs +++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingCategoryService.cs @@ -60,6 +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(); } } diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingCourseService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingCourseService.cs index 09b5c85..5a2ce55 100644 --- a/SGGL/BLL/HSSE/PostTraining/PostTrainingCourseService.cs +++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingCourseService.cs @@ -1,12 +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 { @@ -68,6 +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(); } } diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingMethodService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingMethodService.cs index 4eed534..c1cc39c 100644 --- a/SGGL/BLL/HSSE/PostTraining/PostTrainingMethodService.cs +++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingMethodService.cs @@ -60,6 +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(); } } diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingRecordDetailService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingRecordDetailService.cs new file mode 100644 index 0000000..e30bfa4 --- /dev/null +++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingRecordDetailService.cs @@ -0,0 +1,113 @@ +using Model; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 岗位培训记录明细 + /// + public static class PostTrainingRecordDetailService + { + /// + /// 根据主键获取岗位培训记录明细信息 + /// + /// + /// + public static PostTraining_Record_Detail GetRecordDetailById(string Id) + { + return Funs.DB.PostTraining_Record_Detail.FirstOrDefault(e => e.Id == Id); + } + + /// + /// 根据记录Id、人员Id获取岗位培训记录明细信息 + /// + /// + /// + /// + public static PostTraining_Record_Detail GetRecordDetailByRecordIdPersonId(string recordId, string personId) + { + return Funs.DB.PostTraining_Record_Detail.FirstOrDefault(e => e.RecordId == recordId && e.PersonId == personId); + } + + /// + /// 根据主键记录Id获取所有的培训明细信息 + /// + /// + /// + public static List GetRecordDetailByRecordId(string recordId) + { + return (from x in Funs.DB.PostTraining_Record_Detail where x.RecordId == recordId select x).ToList(); + } + + /// + /// 添加岗位培训记录明细 + /// + /// + public static void AddRecordDetail(PostTraining_Record_Detail model) + { + PostTraining_Record_Detail newModel = new PostTraining_Record_Detail + { + Id = model.Id, + RecordId = model.RecordId, + PersonId = model.PersonId + }; + Funs.DB.PostTraining_Record_Detail.InsertOnSubmit(newModel); + Funs.DB.SubmitChanges(); + } + + /// + /// 修改 + /// + /// + public static void UpdateRecordDetail(PostTraining_Record_Detail model) + { + PostTraining_Record_Detail newModel = Funs.DB.PostTraining_Record_Detail.FirstOrDefault(e => e.Id == model.Id); + if (newModel != null) + { + newModel.RecordId = model.RecordId; + newModel.PersonId = model.PersonId; + Funs.DB.SubmitChanges(); + } + } + + /// + /// 删除 + /// + /// + public static void DeleteRecordDetailById(string Id) + { + PostTraining_Record_Detail model = Funs.DB.PostTraining_Record_Detail.FirstOrDefault(e => e.Id == Id); + if (model != null) + { + CommonService.DeleteAttachFileById(Id); + Funs.DB.PostTraining_Record_Detail.DeleteOnSubmit(model); + Funs.DB.SubmitChanges(); + } + } + + + /// + /// 根据主键删除培训记录 + /// + /// + public static void DeleteTrainDetailByTrainDetail(string detailId) + { + Model.SGGLDB db = Funs.DB; + Model.PostTraining_Record_Detail trainDetails = Funs.DB.PostTraining_Record_Detail.FirstOrDefault(e => e.Id == detailId); + if (trainDetails != null) + { + db.PostTraining_Record_Detail.DeleteOnSubmit(trainDetails); + db.SubmitChanges(); + + var record = PostTrainingRecordService.GetRecordById(trainDetails.RecordId); + if (record != null) + { + record.PersonNum -= 1; + BLL.PostTrainingRecordService.UpdateRecord(record); + } + } + } + + } +} diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingRecordService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingRecordService.cs new file mode 100644 index 0000000..8c35e28 --- /dev/null +++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingRecordService.cs @@ -0,0 +1,391 @@ +using MiniExcelLibs; +using Model; +using System.Collections.Generic; +using System; +using System.Linq; + +namespace BLL +{ + /// + /// 岗位培训记录 + /// + public static class PostTrainingRecordService + { + /// + /// 根据主键获取岗位培训记录信息 + /// + /// + /// + public static PostTraining_Record GetRecordById(string Id) + { + return Funs.DB.PostTraining_Record.FirstOrDefault(e => e.Id == Id); + } + + /// + /// 添加岗位培训记录 + /// + /// + public static void AddRecord(PostTraining_Record model) + { + PostTraining_Record newModel = new PostTraining_Record + { + Id = model.Id, + ProjectId = model.ProjectId, + Code = model.Code, + Name = model.Name, + Content = model.Content, + CategoryId = model.CategoryId, + CategoryName = model.CategoryName, + CourseId = model.CourseId, + CourseName = model.CourseName, + Location = model.Location, + Method = model.Method, + Lecturer = model.Lecturer, + UnitIds = model.UnitIds, + RoleIds = model.RoleIds, + PersonNum = model.PersonNum, + TrainingTime = model.TrainingTime, + Duration = model.Duration, + CompileDate = model.CompileDate, + CompileMan = model.CompileMan, + Remark = model.Remark + }; + Funs.DB.PostTraining_Record.InsertOnSubmit(newModel); + Funs.DB.SubmitChanges(); + } + + /// + /// 修改 + /// + /// + public static void UpdateRecord(PostTraining_Record model) + { + PostTraining_Record newModel = Funs.DB.PostTraining_Record.FirstOrDefault(e => e.Id == model.Id); + if (newModel != null) + { + newModel.Code = model.Code; + newModel.Name = model.Name; + newModel.Content = model.Content; + newModel.CategoryId = model.CategoryId; + newModel.CategoryName = model.CategoryName; + newModel.CourseId = model.CourseId; + newModel.CourseName = model.CourseName; + newModel.Location = model.Location; + newModel.Method = model.Method; + newModel.Lecturer = model.Lecturer; + newModel.UnitIds = model.UnitIds; + newModel.RoleIds = model.RoleIds; + newModel.PersonNum = model.PersonNum; + newModel.TrainingTime = model.TrainingTime; + newModel.Duration = model.Duration; + newModel.Remark = model.Remark; + newModel.CompileDate = model.CompileDate; + newModel.CompileMan = model.CompileMan; + Funs.DB.SubmitChanges(); + } + } + + /// + /// 删除 + /// + /// + public static void DeleteRecordById(string Id) + { + PostTraining_Record model = Funs.DB.PostTraining_Record.FirstOrDefault(e => e.Id == Id); + if (model != null) + { + CommonService.DeleteAttachFileById(Id); + Funs.DB.PostTraining_Record.DeleteOnSubmit(model); + Funs.DB.SubmitChanges(); + } + } + + #region 导入数据 + + ///// + ///// 导入数据 + ///// + ///// + ///// + ///// + ///// + ///// + //public static ResponeData ImportData(string OriFileName, string path, string projectid, string creatUserId, ref List errorList) + //{ + // var responeData = new ResponeData(); + // List temeplateDtoIns; + // try + // { + // temeplateDtoIns = MiniExcel.Query(path, startCell: "A1").ToList(); + // } + // catch (Exception ex) + // { + // responeData.code = 0; + // responeData.message = "模板错误:" + ex.ToString(); + // return responeData; + // } + + // if (temeplateDtoIns.Count == 0) + // { + // responeData.code = 0; + // responeData.message = "导入数据为空！"; + // return responeData; + // } + + // //培训标准 + // var lstRecord = GetRecordInfoList(); + // //培训课程 + // var lstCourse = PostTrainingCourseService.GetCourseList(); + // //培训角色 + // var lstRole = PostTrainingRoleService.GetRoleList(); + // //培训类别 + // var lstCategory = PostTrainingCategoryService.GetCategoryList(); + // //培训方式 + // var lstMethod = PostTrainingMethodService.GetMethodList(); + // //培训教资 + // var lstTeachers = PostTrainingTeachersService.GetTeachersList(); + // //培训效果 + // var lstOutcome = GetPostTrainingOutcomeList(); + + // #region 数据校验 + + // string errorMsg = string.Empty; + // int rowIndex = 3; + // foreach (var item in temeplateDtoIns) + // { + // string roleName = !string.IsNullOrWhiteSpace(item.RoleName) ? item.RoleName.Trim() : string.Empty; + // string categoryName = !string.IsNullOrWhiteSpace(item.CategoryName) ? item.CategoryName.Trim() : string.Empty; + // string courseName = !string.IsNullOrWhiteSpace(item.CourseName) ? item.CourseName.Trim() : string.Empty; + // string classHourStr = !string.IsNullOrWhiteSpace(item.ClassHour) ? item.ClassHour.Trim() : string.Empty; + // string cycleStr = !string.IsNullOrWhiteSpace(item.Cycle) ? item.Cycle.Trim() : string.Empty; + // decimal classHour = 0; + // decimal cycle = 0; + // string method = !string.IsNullOrWhiteSpace(item.Method) ? item.Method.Trim() : string.Empty; + // string outcome = !string.IsNullOrWhiteSpace(item.Outcome) ? item.Outcome.Trim() : string.Empty; + // string teachers = !string.IsNullOrWhiteSpace(item.Teachers) ? item.Teachers.Trim() : string.Empty; + // string remark = !string.IsNullOrWhiteSpace(item.Remark) ? item.Remark.Trim() : string.Empty; + + // if (!string.IsNullOrWhiteSpace(roleName)) + // { + // if (!lstRole.Where(x => x.Name == roleName).Any()) + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "适用岗位角色"; + // errorInfo.Reason = $"角色不存在：{roleName}"; + // errorList.Add(errorInfo); + // } + // } + // else + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "适用岗位角色"; + // errorInfo.Reason = "不可为空"; + // errorList.Add(errorInfo); + // } + + // if (!string.IsNullOrWhiteSpace(categoryName)) + // { + // if (!lstCategory.Where(x => x.Name == categoryName).Any()) + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训类别"; + // errorInfo.Reason = $"培训类别不存在：{categoryName}"; + // errorList.Add(errorInfo); + // } + // } + // else + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训类别"; + // errorInfo.Reason = "不可为空"; + // errorList.Add(errorInfo); + // } + + // if (string.IsNullOrWhiteSpace(courseName)) + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训课程"; + // errorInfo.Reason = "不可为空"; + // errorList.Add(errorInfo); + // } + + // if (!string.IsNullOrWhiteSpace(categoryName) && !string.IsNullOrWhiteSpace(courseName)) + // { + // if (temeplateDtoIns.Where(x => x.RoleName == roleName && x.CourseName == courseName && x.CategoryName == categoryName).Count() > 1) + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训课程"; + // errorInfo.Reason = $"【{roleName}】导入数据重复：{courseName}（{categoryName}）"; + // errorList.Add(errorInfo); + // } + // if (!lstCourse.Where(x => x.Name == courseName && x.CategoryName == categoryName).Any()) + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训课程"; + // errorInfo.Reason = $"【{roleName}】不存在培训课程：{courseName}（{categoryName}）"; + // errorList.Add(errorInfo); + // } + // else if (lstRecord.Where(x => x.CourseName == courseName && x.CategoryName == categoryName).Any()) + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训课程"; + // errorInfo.Reason = $"培训标准已存在：{courseName}（{categoryName}）"; + // errorList.Add(errorInfo); + // } + // } + + // if (!string.IsNullOrEmpty(classHourStr)) + // { + // try + // { + // classHour = decimal.Parse(classHourStr); + // if (classHour <= 0) + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训课时"; + // errorInfo.Reason = "请填写大于0的数值"; + // errorList.Add(errorInfo); + // } + // } + // catch (Exception) + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训课时"; + // errorInfo.Reason = "请填写大于0的数值"; + // errorList.Add(errorInfo); + // } + // } + // else + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训课时"; + // errorInfo.Reason = "请填写大于0的数值"; + // errorList.Add(errorInfo); + // } + + // if (!string.IsNullOrEmpty(cycleStr)) + // { + // try + // { + // cycle = decimal.Parse(cycleStr); + // if (cycle <= 0) + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训周期"; + // errorInfo.Reason = "请填写大于0的数值"; + // errorList.Add(errorInfo); + // } + // } + // catch (Exception) + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训周期"; + // errorInfo.Reason = "请填写大于0的数值"; + // errorList.Add(errorInfo); + // } + // } + // else + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训周期"; + // errorInfo.Reason = "请填写大于0的数值"; + // errorList.Add(errorInfo); + // } + + // if (!string.IsNullOrWhiteSpace(method)) + // { + // if (!lstMethod.Where(x => x.Name == method).Any()) + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训方式"; + // errorInfo.Reason = $"培训方式字典不存在：{method}"; + // errorList.Add(errorInfo); + // } + // } + // if (!string.IsNullOrWhiteSpace(outcome)) + // { + // if (!lstOutcome.Where(x => x.Text == outcome).Any()) + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训效果"; + // errorInfo.Reason = $"培训效果字典不存在：{outcome}"; + // errorList.Add(errorInfo); + // } + // } + // if (!string.IsNullOrWhiteSpace(teachers)) + // { + // if (!lstTeachers.Where(x => x.Name == teachers).Any()) + // { + // ErrorInfo errorInfo = new ErrorInfo(); + // errorInfo.Row = rowIndex.ToString(); + // errorInfo.Column = "培训师资"; + // errorInfo.Reason = $"培训师资字典不存在：{teachers}"; + // errorList.Add(errorInfo); + // } + // } + + // rowIndex++; + // } + + // if (errorList.Any()) + // { + // responeData.code = 0; + // responeData.message = "存在异常数据！"; + // return responeData; + // } + + // #endregion + + // foreach (var item in temeplateDtoIns) + // { + // string roleName = !string.IsNullOrWhiteSpace(item.RoleName) ? item.RoleName.Trim() : string.Empty; + // string categoryName = !string.IsNullOrWhiteSpace(item.CategoryName) ? item.CategoryName.Trim() : string.Empty; + // string courseName = !string.IsNullOrWhiteSpace(item.CourseName) ? item.CourseName.Trim() : string.Empty; + // decimal classHour = decimal.Parse(item.ClassHour); + // decimal cycle = decimal.Parse(item.Cycle); + // string method = !string.IsNullOrWhiteSpace(item.Method) ? item.Method.Trim() : string.Empty; + // string outcome = !string.IsNullOrWhiteSpace(item.Outcome) ? item.Outcome.Trim() : string.Empty; + // string teachers = !string.IsNullOrWhiteSpace(item.Teachers) ? item.Teachers.Trim() : string.Empty; + // string remark = !string.IsNullOrWhiteSpace(item.Remark) ? item.Remark.Trim() : string.Empty; + + // PostTraining_Record newModel = new PostTraining_Record + // { + // Id = SQLHelper.GetNewID(typeof(PostTraining_Record)), + // Code = SQLHelper.RunProcNewId("SpGetNewCode5", "dbo.PostTraining_Record", "Code", ""), + // //ProjectId = this.ProjectId, + // CompileDate = DateTime.Now, + // CompileMan = creatUserId + // }; + // newModel.CourseId = lstCourse.Where(x => x.Name == courseName).FirstOrDefault().Id; + // newModel.RoleId = lstRole.Where(x => x.Name == roleName).FirstOrDefault().Id; + // newModel.ClassHour = classHour; + // newModel.Cycle = cycle; + // newModel.Method = method; + // newModel.Outcome = outcome; + // newModel.Teachers = teachers; + // newModel.Remark = remark; + + // AddRecord(newModel); + // } + // return responeData; + //} + + #endregion + } +} diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingRoleService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingRoleService.cs index 79a3e43..be50fec 100644 --- a/SGGL/BLL/HSSE/PostTraining/PostTrainingRoleService.cs +++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingRoleService.cs @@ -50,6 +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(); } } diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingStandardService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingStandardService.cs index 3ff37de..d0e0e30 100644 --- a/SGGL/BLL/HSSE/PostTraining/PostTrainingStandardService.cs +++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingStandardService.cs @@ -1,16 +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 { diff --git a/SGGL/BLL/HSSE/PostTraining/PostTrainingTeachersService.cs b/SGGL/BLL/HSSE/PostTraining/PostTrainingTeachersService.cs index 7cc309c..f970a60 100644 --- a/SGGL/BLL/HSSE/PostTraining/PostTrainingTeachersService.cs +++ b/SGGL/BLL/HSSE/PostTraining/PostTrainingTeachersService.cs @@ -60,6 +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(); } } diff --git a/SGGL/BLL/HSSE/SitePerson/PersonService.cs b/SGGL/BLL/HSSE/SitePerson/PersonService.cs index 57b9266..f9ab3cf 100644 --- a/SGGL/BLL/HSSE/SitePerson/PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/PersonService.cs @@ -344,6 +344,7 @@ namespace BLL TeamGroupId = person.TeamGroupId, WorkAreaId = person.WorkAreaId, WorkPostId = person.WorkPostId, + PostTrainingRoleId = person.PostTrainingRoleId, OutTime = person.OutTime, OutResult = person.OutResult, Telephone = person.Telephone, @@ -423,6 +424,7 @@ namespace BLL newPerson.TeamGroupId = person.TeamGroupId; newPerson.WorkAreaId = person.WorkAreaId; newPerson.WorkPostId = person.WorkPostId; + newPerson.PostTrainingRoleId = person.PostTrainingRoleId; newPerson.InTime = person.InTime; newPerson.OutTime = person.OutTime; newPerson.IsSafetyMonitoring = person.IsSafetyMonitoring; diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202502201221247893.xlsx b/SGGL/FineUIPro.Web/File/Excel/Temp/202502201221247893.xlsx new file mode 100644 index 0000000..cb528e6 Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/Temp/202502201221247893.xlsx differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index c0d12e3..b6f0e2f 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -2200,9 +2200,18 @@ +<<<<<<< HEAD +======= + + + + + + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 @@ -15082,6 +15091,23 @@ PersonPerfomanceView.aspx +<<<<<<< HEAD +======= + + Record.aspx + ASPXCodeBehind + + + Record.aspx + + + SelectPerson.aspx + ASPXCodeBehind + + + SelectPerson.aspx + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 Standard.aspx ASPXCodeBehind @@ -15103,6 +15129,16 @@ CourseDataIn.aspx +<<<<<<< HEAD +======= + + RecordEdit.aspx + ASPXCodeBehind + + + RecordEdit.aspx + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 StandardEdit.aspx ASPXCodeBehind @@ -19687,7 +19723,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservation.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservation.aspx.cs index bb50914..2406847 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservation.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservation.aspx.cs @@ -1,4 +1,5 @@ using System; +<<<<<<< HEAD using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -7,6 +8,12 @@ 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 diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservationEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservationEdit.aspx.cs index e2f791d..818efc4 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservationEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservationEdit.aspx.cs @@ -1,6 +1,9 @@ using BLL; using System; +<<<<<<< HEAD using System.Web; +======= +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 namespace FineUIPro.Web.HSSE.Examine { diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituation.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituation.aspx.cs index 879cb6f..3a50fdc 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituation.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituation.aspx.cs @@ -1,4 +1,5 @@ using System; +<<<<<<< HEAD using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -7,6 +8,12 @@ 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 diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituationEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituationEdit.aspx.cs index 74556e7..654682e 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituationEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituationEdit.aspx.cs @@ -1,6 +1,9 @@ using BLL; using System; +<<<<<<< HEAD using System.Web; +======= +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 namespace FineUIPro.Web.HSSE.Examine { diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivities.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivities.aspx.cs index 60225e0..c9e65b8 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivities.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivities.aspx.cs @@ -1,4 +1,5 @@ using System; +<<<<<<< HEAD using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -7,6 +8,12 @@ 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 diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivitiesEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivitiesEdit.aspx.cs index bf20cb7..bc5fea9 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivitiesEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivitiesEdit.aspx.cs @@ -1,6 +1,9 @@ using BLL; using System; +<<<<<<< HEAD using System.Web; +======= +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 namespace FineUIPro.Web.HSSE.Examine { diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeeting.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeeting.aspx.cs index 632774a..cb110a8 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeeting.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeeting.aspx.cs @@ -1,4 +1,5 @@ using System; +<<<<<<< HEAD using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -7,6 +8,12 @@ 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 diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeetingEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeetingEdit.aspx.cs index 0d04757..45587a0 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeetingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeetingEdit.aspx.cs @@ -1,6 +1,9 @@ using BLL; using System; +<<<<<<< HEAD using System.Web; +======= +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 namespace FineUIPro.Web.HSSE.Examine { diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituation.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituation.aspx.cs index aabc5ca..accfdee 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituation.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituation.aspx.cs @@ -1,4 +1,5 @@ using System; +<<<<<<< HEAD using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -7,6 +8,12 @@ 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 diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituationEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituationEdit.aspx.cs index 42c724b..4569409 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituationEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituationEdit.aspx.cs @@ -1,6 +1,9 @@ using BLL; using System; +<<<<<<< HEAD using System.Web; +======= +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 namespace FineUIPro.Web.HSSE.Examine { diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/OnePersonPerFile.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/OnePersonPerFile.aspx.cs index 6fc1a20..d079668 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/OnePersonPerFile.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/OnePersonPerFile.aspx.cs @@ -1,12 +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 { diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlan.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlan.aspx.cs index 8a73265..5083bf0 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlan.aspx.cs @@ -1,4 +1,5 @@ using System; +<<<<<<< HEAD using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -7,6 +8,12 @@ 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 diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlanEdit.aspx.cs index 484b05f..53ec2bb 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlanEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlanEdit.aspx.cs @@ -1,6 +1,9 @@ using BLL; using System; +<<<<<<< HEAD using System.Web; +======= +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 namespace FineUIPro.Web.HSSE.Examine { diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperience.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperience.aspx.cs index de42e8a..be2490a 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperience.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperience.aspx.cs @@ -1,4 +1,5 @@ using System; +<<<<<<< HEAD using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -9,6 +10,15 @@ using BLL; using static System.Runtime.CompilerServices.RuntimeHelpers; using AspNet = System.Web.UI.WebControls; +======= +using System.Data; +using System.Linq; +using System.Text; +using BLL; +using AspNet = System.Web.UI.WebControls; + + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 namespace FineUIPro.Web.HSSE.Examine { public partial class SharingOfSafetyExperience : PageBase diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperienceEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperienceEdit.aspx.cs index 8635742..2d91c62 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperienceEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperienceEdit.aspx.cs @@ -1,6 +1,9 @@ using BLL; using System; +<<<<<<< HEAD using System.Web; +======= +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 namespace FineUIPro.Web.HSSE.Examine { diff --git a/SGGL/FineUIPro.Web/HSSE/Examine/StaffHSEInfoArchives.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Examine/StaffHSEInfoArchives.aspx.cs index 0a71115..550a5f1 100644 --- a/SGGL/FineUIPro.Web/HSSE/Examine/StaffHSEInfoArchives.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Examine/StaffHSEInfoArchives.aspx.cs @@ -1,4 +1,5 @@ using BLL; +<<<<<<< HEAD using FineUIPro.Web.HSSE.SitePerson; using System; using System.Collections.Generic; @@ -8,6 +9,11 @@ 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 { diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Category.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/Category.aspx.cs index 1bba7d5..eafde08 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/Category.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Category.aspx.cs @@ -1,10 +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; diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/CategoryEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/CategoryEdit.aspx.cs index 6122d06..ce99cb8 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/CategoryEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/CategoryEdit.aspx.cs @@ -1,6 +1,9 @@ using BLL; using System; +<<<<<<< HEAD using System.Web; +======= +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 namespace FineUIPro.Web.HSSE.PostTraining { diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Course.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/Course.aspx.cs index abc71a1..ac02b15 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/Course.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Course.aspx.cs @@ -4,7 +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; diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseDataIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseDataIn.aspx.cs index 6d0605f..1eadfff 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseDataIn.aspx.cs @@ -6,8 +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 { diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseEdit.aspx.cs index d119d10..9920b55 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/CourseEdit.aspx.cs @@ -1,6 +1,9 @@ using BLL; using System; +<<<<<<< HEAD using System.Web; +======= +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 namespace FineUIPro.Web.HSSE.PostTraining { diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Method.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/Method.aspx.cs index 28d82da..7682c4e 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/Method.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Method.aspx.cs @@ -1,10 +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; diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/MethodEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/MethodEdit.aspx.cs index 12a6cce..a74ac5e 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/MethodEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/MethodEdit.aspx.cs @@ -1,6 +1,9 @@ using BLL; using System; +<<<<<<< HEAD using System.Web; +======= +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 namespace FineUIPro.Web.HSSE.PostTraining { diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Record.aspx b/SGGL/FineUIPro.Web/HSSE/PostTraining/Record.aspx new file mode 100644 index 0000000..ff3c8f7 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Record.aspx @@ -0,0 +1,184 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Record.aspx.cs" Inherits="FineUIPro.Web.HSSE.PostTraining.Record" %> + + + + + + + 岗位培训记录 + + + + +
+ + + + + + + + + + + + <%-- + + + + + + + --%> + <%-- + --%> + <%-- + --%> + + + <%-- + --%> + + <%-- + --%> + + + + + + + + + + + + + + + + + + + + <%-- + + + + + + + + + --%> + + + + + + + + + + + <%-- + + --%> + + + + + + + + + + + + + + + + + <%----%> + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Record.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/Record.aspx.cs new file mode 100644 index 0000000..93041d7 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Record.aspx.cs @@ -0,0 +1,378 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Text; +using BLL; +using AspNet = System.Web.UI.WebControls; + +namespace FineUIPro.Web.HSSE.PostTraining +{ + public partial class Record : PageBase + { + #region 定义项 + /// + /// 主键 + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } + this.InitDropDownList(); + + ////权限按钮方法 + this.GetButtonPower(); + this.btnNew.OnClientClick = Window1.GetShowReference("RecordEdit.aspx") + "return false;"; + if (this.CurrUser != null && this.CurrUser.PageSize.HasValue) + { + Grid1.PageSize = this.CurrUser.PageSize.Value; + } + this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + // 绑定表格 + this.BindGrid(); + } + } + + /// + /// 下拉框加载 + /// + private void InitDropDownList() + { + ////获取适用岗位下拉框 + //PostTrainingRoleService.InitPostTrainingRoleDropDownList(this.drpRole, true); + ////获取培训类别下拉框 + //PostTrainingCategoryService.InitPostTrainingCategoryDropDownList(this.drpCategory, true); + ////获取培训方式下拉框 + //PostTrainingMethodService.InitPostTrainingMethodDropDownList(this.drpMethod, null, true); + ////获取培训师资下拉框 + //PostTrainingTeachersService.InitPostTrainingTeachersDropDownList(this.drpTeachers, null, true); + ////获取培训效果下拉框 + //PostTrainingRecordService.InitPostTrainingOutcomeDropDownList(this.drpOutcome, true); + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT Record.*,Person.PersonName,Role.Name AS RoleName + FROM PostTraining_Record_Detail AS Detail + LEFT JOIN PostTraining_Record AS Record ON Record.Id=Detail.RecordId + LEFT JOIN SitePerson_Person AS Person ON Person.PersonId=Detail.PersonId + LEFT JOIN PostTraining_Role AS Role ON Role.Id=Person.PostTrainingRoleId + LEFT JOIN Sys_User AS SUser ON SUser.UserId=Record.CompileMan + WHERE 1=1 "; + List listStr = new List(); + if (!string.IsNullOrEmpty(this.txtCode.Text.Trim())) + { + strSql += " AND Record.Code LIKE @Code"; + listStr.Add(new SqlParameter("@Code", "%" + this.txtCode.Text.Trim() + "%")); + } + if (!string.IsNullOrEmpty(this.txtPersonName.Text.Trim())) + { + strSql += " AND Person.PersonName LIKE @PersonName"; + listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text.Trim() + "%")); + } + //if (this.drpRole.SelectedValue != BLL.Const._Null) + //{ + // strSql += " AND Record.RoleId = @RoleId"; + // listStr.Add(new SqlParameter("@RoleId", this.drpRole.SelectedValue)); + //} + //if (this.drpCategory.SelectedValue != BLL.Const._Null) + //{ + // strSql += " AND Course.CategoryId = @CategoryId"; + // listStr.Add(new SqlParameter("@CategoryId", this.drpCategory.SelectedValue)); + //} + //if (this.drpMethod.SelectedValue != BLL.Const._Null) + //{ + // strSql += " AND Record.Method = @Method"; + // listStr.Add(new SqlParameter("@Method", this.drpMethod.SelectedValue)); + //} + //if (this.drpTeachers.SelectedValue != BLL.Const._Null) + //{ + // strSql += " AND Record.Teachers = @Teachers"; + // listStr.Add(new SqlParameter("@Teachers", this.drpTeachers.SelectedValue)); + //} + //if (this.drpOutcome.SelectedValue != BLL.Const._Null) + //{ + // strSql += " AND Record.Outcome = @Outcome"; + // listStr.Add(new SqlParameter("@Outcome", this.drpOutcome.SelectedValue)); + //} + + strSql += " ORDER BY Record.Code ASC "; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + + Grid1.DataSource = table; + Grid1.DataBind(); + + } + + #region 分页 排序 + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页下拉选择事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 编辑 + /// + /// 双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 右键编辑事件 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (this.btnMenuEdit.Hidden) + { + Alert.ShowInTop("抱歉！您没有编辑权限！", MessageBoxIcon.Warning); + return; + } + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + var model = BLL.PostTrainingRecordService.GetRecordById(id); + if (model != null) + { + if (this.btnMenuEdit.Hidden) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面 + { + //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RecordView.aspx?Id={0}", id, "查看 - "))); + } + else + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RecordEdit.aspx?Id={0}", id, "编辑 - "))); + } + } + } + #endregion + + #region 删除 + + /// + /// 右键删除事件 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + var newModel = BLL.PostTrainingRecordService.GetRecordById(rowID); + if (newModel != null) + { + BLL.LogService.AddSys_Log(this.CurrUser, newModel.Code, newModel.Id, BLL.Const.PostTrainingRecordMenuId, BLL.Const.BtnDelete); + BLL.PostTrainingRecordService.DeleteRecordById(rowID); + } + } + + this.BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.PostTrainingRecordMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnAdd)) + { + this.btnNew.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuEdit.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnMenuDelete.Hidden = false; + } + } + } + #endregion + + #region 关闭弹出窗 + /// + /// 关闭弹出窗 + /// + /// + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("岗位培训类别" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + this.Grid1.PageSize = 5000; + this.BindGrid(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + + /// + /// 导出方法 + /// + /// + /// + private string GetGridTableHtml(Grid grid) + { + StringBuilder sb = new StringBuilder(); + sb.Append(""); + sb.Append(""); + sb.Append(""); + foreach (GridColumn column in grid.Columns) + { + sb.AppendFormat("", column.HeaderText); + } + sb.Append(""); + foreach (GridRow row in grid.Rows) + { + sb.Append(""); + foreach (GridColumn column in grid.Columns) + { + string html = row.Values[column.ColumnIndex].ToString(); + if (column.ColumnID == "tfNumber") + { + html = (row.FindControl("lblNumber") as AspNet.Label).Text; + } + sb.AppendFormat("", html); + } + + sb.Append(""); + } + + sb.Append("
{0}
{0}
"); + + return sb.ToString(); + } + #endregion + + #region 导入 + + /// + /// 导入 + /// + /// + /// + protected void btnImport_Click(object sender, EventArgs e) + { + //PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("RecordDataIn.aspx?", "导入 - "))); + } + + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Record.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/Record.aspx.designer.cs new file mode 100644 index 0000000..97396b2 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Record.aspx.designer.cs @@ -0,0 +1,170 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.PostTraining +{ + + + public partial class Record + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCode; + + /// + /// txtPersonName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPersonName; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// lblNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNumber; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/RecordEdit.aspx b/SGGL/FineUIPro.Web/HSSE/PostTraining/RecordEdit.aspx new file mode 100644 index 0000000..29a21dd --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/RecordEdit.aspx @@ -0,0 +1,186 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RecordEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.PostTraining.RecordEdit" ValidateRequest="false" %> + +<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl" TagPrefix="uc1" %> + + + + + + 编辑岗位培训记录 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/RecordEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/RecordEdit.aspx.cs new file mode 100644 index 0000000..05942f2 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/RecordEdit.aspx.cs @@ -0,0 +1,350 @@ +using BLL; +using FineUIPro.Web.HSSE.EduTrain; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace FineUIPro.Web.HSSE.PostTraining +{ + public partial class RecordEdit : PageBase + { + #region 定义项 + + /// + /// 主键 + /// + public string Id + { + get + { + return (string)ViewState["Id"]; + } + set + { + ViewState["Id"] = value; + } + } + /// + /// 项目主键 + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + + /// + /// 定义集合 + /// + private static List recordDetails = new List(); + + #endregion + + #region 加载 + + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = this.CurrUser.LoginProjectId; + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.InitDropDownList(); + + this.Id = Request.Params["Id"]; + if (!string.IsNullOrEmpty(this.Id)) + { + Model.PostTraining_Record model = BLL.PostTrainingRecordService.GetRecordById(this.Id); + if (model != null) + { + this.txtCode.Text = model.Code; + this.txtRemark.Text = model.Remark; + if (!string.IsNullOrWhiteSpace(model.CourseId)) + { + var course = BLL.PostTrainingCourseService.GetCourseById(model.CourseId); + this.drpCategory.SelectedValue = course.CategoryId; + //培训课程 + PostTrainingCourseService.InitPostTrainingCourseDropDownList(this.drpCourse, course.CategoryId, false); + this.drpCourse.SelectedValue = model.CourseId; + } + if (!string.IsNullOrWhiteSpace(model.Method)) + { + this.drpMethod.SelectedValue = model.Method; + } + } + } + else + { + ////自动生成编码 + this.txtCode.Text = SQLHelper.RunProcNewId("SpGetNewCode5", "dbo.PostTraining_Record", "Code", ""); + } + } + } + + /// + /// 下拉框加载 + /// + private void InitDropDownList() + { + //培训单位 + UnitService.InitUnitDropDownList(this.drpUnits, this.ProjectId, false); + //获取适用岗位下拉框 + PostTrainingRoleService.InitPostTrainingRoleDropDownList(this.drpRole, false); + //获取培训类别下拉框 + PostTrainingCategoryService.InitPostTrainingCategoryDropDownList(this.drpCategory, false); + //获取培训方式下拉框 + PostTrainingMethodService.InitPostTrainingMethodDropDownList(this.drpMethod, null, false); + + this.drpUnits.SelectedValue = this.CurrUser.UnitId; + + ////获取培训师资下拉框 + //PostTrainingTeachersService.InitPostTrainingTeachersDropDownList(this.drpTeachers, null, false); + //培训效果 + ////PostTrainingRecordService.InitPostTrainingOutcomeDropDownList(this.drpOutcome, false); + } + + /// + /// 培训类别下拉加载 + /// + /// + /// + protected void drpCategory_SelectedIndexChanged(object sender, EventArgs e) + { + //培训课程 + PostTrainingCourseService.InitPostTrainingCourseDropDownList(this.drpCourse, this.drpCategory.SelectedValue, false); + } + + /// + /// 绑定 Grid1 + /// + private void Grid1DataBind() + { + recordDetails = (from x in Funs.DB.View_PostTraining_RecordDetail + where x.RecordId == this.Id + orderby x.UnitName, x.RoleName, x.PersonName + select x).ToList(); + Grid1.DataSource = recordDetails; + Grid1.DataBind(); + //for (int i = 0; i < Grid1.Rows.Count; i++) + //{ + // bool isRed = true; + // string trainDetailId = Grid1.Rows[i].DataKeys[0].ToString(); + // var getAtt = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == trainDetailId); + // if (getAtt != null) + // { + // isRed = false; + // } + // if (isRed) + // { + // var getRecordDetail = recordDetails.FirstOrDefault(x => x.DetailId == trainDetailId); + // if (getRecordDetail != null && !string.IsNullOrEmpty(this.TestPlanId)) ////未参加过培训的人员 + // { + // var getTestRecord = Funs.DB.Training_TestRecord.FirstOrDefault(x => x.TestManId == getRecordDetail.PersonId && x.TestPlanId == this.TestPlanId); + // if (getTestRecord != null) + // { + // isRed = false; + // } + // } + // } + // if (isRed) + // { + // Grid1.Rows[i].RowCssClass = "Red"; + // } + //} + } + + #endregion + + #region 选择按钮 + /// + /// 选择按钮 + /// + /// + /// + protected void btnSelect_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.Id)) + { + this.SaveData(BLL.Const.BtnSave); + } + //培训岗位 + string roleIds = string.Empty; + foreach (var item in this.drpRole.SelectedValueArray) + { + roleIds += item + ","; + } + if (!string.IsNullOrEmpty(roleIds)) + { + roleIds = roleIds.Substring(0, roleIds.LastIndexOf(",")); + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SelectPerson.aspx?RecordId={0}&RoleIds={1}", this.Id, roleIds, "编辑 - "))); + } + #endregion + + #region 删除 + /// + /// 批量删除 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + BLL.PostTrainingRecordDetailService.DeleteTrainDetailByTrainDetail(rowID); + } + + this.Grid1DataBind(); + this.txtPersonNum.Text = recordDetails.Count.ToString(); + this.ShowNotify("删除数据成功!（表格数据已重新绑定）"); + } + } + #endregion + + #region 关闭弹出窗 + + /// + /// 关闭弹出窗 + /// + /// + /// + protected void Window1_Close(object sender, EventArgs e) + { + this.Grid1DataBind(); + this.txtPersonNum.Text = recordDetails.Count.ToString(); + } + + #endregion + + #region 保存 + + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + this.SaveData(BLL.Const.BtnSave); + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + } + + /// + /// 保存数据 + /// + /// + private void SaveData(string type) + { + Model.PostTraining_Record newModel = new Model.PostTraining_Record + { + ProjectId = this.ProjectId, + Code = this.txtCode.Text.Trim(), + CompileDate = DateTime.Now, + CompileMan = this.CurrUser.UserId, + PersonNum = this.Grid1.Rows.Count, + TrainingTime = Funs.GetNewDateTimeOrNow(this.txtTrainingTime.Text.Trim()) + }; + newModel.Name = this.txtName.Text.Trim(); + newModel.Content = this.txtContent.Text.Trim(); + newModel.CategoryId = this.drpCategory.SelectedValue; + newModel.CategoryName = this.drpCategory.SelectedText; + newModel.CourseId = this.drpCourse.SelectedValue; + newModel.CourseName = this.drpCourse.SelectedText; + newModel.Location = this.txtLocation.Text.Trim(); + newModel.Method = this.drpMethod.SelectedText; + newModel.Lecturer = this.txtLecturer.Text.Trim(); + newModel.Duration = decimal.Parse(this.txtDuration.Text.Trim()); + newModel.Remark = this.txtRemark.Text.Trim(); + + //培训单位 + string unitIds = string.Empty; + foreach (var item in this.drpUnits.SelectedValueArray) + { + unitIds += item + ","; + } + if (!string.IsNullOrEmpty(unitIds)) + { + unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); + } + + //培训岗位 + string roleIds = string.Empty; + foreach (var item in this.drpRole.SelectedValueArray) + { + roleIds += item + ","; + } + if (!string.IsNullOrEmpty(roleIds)) + { + roleIds = roleIds.Substring(0, roleIds.LastIndexOf(",")); + } + + newModel.UnitIds = unitIds; + newModel.RoleIds = roleIds; + if (!string.IsNullOrEmpty(this.Id)) + { + newModel.Id = this.Id; + BLL.PostTrainingRecordService.UpdateRecord(newModel); + BLL.LogService.AddSys_Log(this.CurrUser, newModel.Code, newModel.Id, BLL.Const.PostTrainingRecordMenuId, BLL.Const.BtnModify); + } + else + { + this.Id = SQLHelper.GetNewID(typeof(Model.PostTraining_Record)); + newModel.Id = this.Id; + BLL.PostTrainingRecordService.AddRecord(newModel); + BLL.LogService.AddSys_Log(this.CurrUser, newModel.Code, newModel.Id, BLL.Const.PostTrainingRecordMenuId, BLL.Const.BtnAdd); + } + + //JArray mergedData = Grid1.GetMergedData(); + //foreach (JObject mergedRow in mergedData) + //{ + // string status = mergedRow.Value("status"); + // JObject values = mergedRow.Value("values"); + // Model.PostTraining_Record_Detail detail = BLL.PostTrainingRecordDetailService.GetRecordDetailById(values.Value("DetailId").ToString()); + // if (detail != null) + // { + // if (values.Value("CheckResult").ToString() == "1") + // { + // detail.CheckResult = true; + // } + // else + // { + // detail.CheckResult = false; + // } + // detail.CheckScore = Funs.GetNewDecimalOrZero(values.Value("CheckScore").ToString()); ; + // BLL.EduTrain_TrainRecordDetailService.UpdateTrainDetail(detail); + // } + //} + } + #endregion + + #region 附件上传 + /// + /// 上传附件 + /// + /// + /// + protected void btnAttachUrl_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.Id)) + { + SaveData(BLL.Const.BtnSave); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PostTraining/Record&menuId={1}", Id, BLL.Const.PostTrainingRecordMenuId))); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/RecordEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/RecordEdit.aspx.designer.cs new file mode 100644 index 0000000..f86f186 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/RecordEdit.aspx.designer.cs @@ -0,0 +1,296 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.PostTraining +{ + + + public partial class RecordEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCode; + + /// + /// txtName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtName; + + /// + /// drpCategory 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCategory; + + /// + /// drpCourse 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCourse; + + /// + /// txtTrainingTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtTrainingTime; + + /// + /// txtDuration 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtDuration; + + /// + /// drpMethod 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpMethod; + + /// + /// txtLocation 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtLocation; + + /// + /// txtPersonNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtPersonNum; + + /// + /// txtLecturer 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtLecturer; + + /// + /// drpUnits 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnits; + + /// + /// trRole 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow trRole; + + /// + /// drpRole 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpRole; + + /// + /// txtContent 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtContent; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRemark; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// btnSelect 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSelect; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// lbTemp 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbTemp; + + /// + /// btnAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Role.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/Role.aspx.cs index bba9b96..a8488ed 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/Role.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Role.aspx.cs @@ -1,10 +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; diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/RoleEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/RoleEdit.aspx.cs index d13c0f4..3c3ffd9 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/RoleEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/RoleEdit.aspx.cs @@ -1,6 +1,9 @@ using BLL; using System; +<<<<<<< HEAD using System.Web; +======= +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 namespace FineUIPro.Web.HSSE.PostTraining { diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/SelectPerson.aspx b/SGGL/FineUIPro.Web/HSSE/PostTraining/SelectPerson.aspx new file mode 100644 index 0000000..ab9ee18 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/SelectPerson.aspx @@ -0,0 +1,87 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SelectPerson.aspx.cs" Inherits="FineUIPro.Web.HSSE.PostTraining.SelectPerson" %> + + + + + + 查找人员 + + + +
+ + + + + + + + + + + + + + + + <%-- + + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/SelectPerson.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/SelectPerson.aspx.cs new file mode 100644 index 0000000..178bdb0 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/SelectPerson.aspx.cs @@ -0,0 +1,236 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web.Security; + +namespace FineUIPro.Web.HSSE.PostTraining +{ + public partial class SelectPerson : PageBase + { + #region 定义项 + /// + /// 主键 + /// + public string RecordId + { + get + { + return (string)ViewState["RecordId"]; + } + set + { + ViewState["RecordId"] = value; + } + } + + ///// + ///// GV被选择项列表 + ///// + //public List ItemSelectedList + //{ + // get + // { + // return (List)ViewState["ItemSelectedList"]; + // } + // set + // { + // ViewState["ItemSelectedList"] = value; + // } + //} + + /// + /// 项目id + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion + + #region 页面加载 + /// + /// 页面加载 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } + //单位 + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); + this.RecordId = Request.Params["RecordId"]; + // 绑定表格 + BindGrid(); + } + } + #endregion + + #region 保存 + /// + /// 保存 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + //var sss = Grid1; + //var item = Grid1.Rows[rowIndex]; + //var sssrrr22 = Grid1.Rows[rowIndex].RowID; + //var sssrrr2233 = item.GetType().GetProperty("PostTrainingRoleId").GetValue(item, null); ; + string personId = Grid1.DataKeys[rowIndex][0].ToString(); + //string roleId = Grid1.DataKeys[rowIndex][1].ToString(); + var recordDetail = BLL.PostTrainingRecordDetailService.GetRecordDetailByRecordIdPersonId(this.RecordId, personId); + if (recordDetail == null && !string.IsNullOrEmpty(personId)) + { + string newKeyID = SQLHelper.GetNewID(typeof(Model.PostTraining_Record_Detail)); + Model.PostTraining_Record_Detail detail = new Model.PostTraining_Record_Detail + { + Id = newKeyID, + RecordId = this.RecordId, + PersonId = personId + }; + BLL.PostTrainingRecordDetailService.AddRecordDetail(detail); + } + } + + //更新培训人数 + var record = BLL.PostTrainingRecordService.GetRecordById(this.RecordId); + if (record != null) + { + var item = BLL.PostTrainingRecordDetailService.GetRecordDetailByRecordId(this.RecordId); + record.PersonNum = item.Count(); + BLL.PostTrainingRecordService.UpdateRecord(record); + } + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + else + { + Alert.ShowInParent("请至少选择一条记录！"); + return; + } + + } + #endregion + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + string roleIds = Request.Params["RoleIds"]; + //var trainType = BLL.TrainTypeService.GetTrainTypeById(type); + if (!string.IsNullOrWhiteSpace(roleIds)) + { + string roleIdStr = StringHelper.StringConvert(roleIds); + string strSql = $@"SELECT viewPerSon.PersonId,viewPerSon.UnitName,viewPerSon.PersonName,viewPerSon.CardNo,viewPerSon.SexName,PostTrainingRoleId,PostTrainingRoleName,viewPerSon.IdentityCard,TeamGroupName,WorkAreaName,InTime + FROM View_SitePerson_Person AS viewPerSon + WHERE viewPerSon.ProjectId='{this.ProjectId}' AND viewPerSon.IsUsed='1' "; + + List listStr = new List(); + if (BLL.PostTrainingRecordDetailService.GetRecordDetailByRecordId(this.RecordId).Count() > 0) + { + strSql += $@" AND (viewPerSon.PersonId NOT IN ( + SELECT PersonId FROM PostTraining_Record AS R + LEFT JOIN PostTraining_Record_Detail AS D ON R.Id = D.RecordId + WHERE R.ProjectId='{this.ProjectId}' AND R.Id = '{this.RecordId}')) "; + } + + strSql += $@" AND viewPerSon.PostTrainingRoleId IN ({roleIdStr})"; + + //if (!trainType.IsRepeat.HasValue || trainType.IsRepeat == false) + //{ + // strSql += @" AND viewPerSon.PersonId NOT IN + // (SELECT PersonId FROM PostTraining_Record AS R + // LEFT JOIN PostTraining_Record_Detail AS D ON R.RecordId = D.RecordId + // WHERE R.ProjectId='" + this.ProjectId + "' AND R.TrainTypeId ='" + type + "' AND D.CheckResult = 1)"; + //} + + if (this.drpUnit.SelectedValue != BLL.Const._Null) + { + strSql += " AND viewPerSon.UnitId=@UnitId"; + listStr.Add(new SqlParameter("@UnitId", this.drpUnit.SelectedValue)); + } + if (!string.IsNullOrEmpty(this.txtPersonName.Text.Trim())) + { + strSql += " AND viewPerSon.PersonName LIKE @PersonName"; + listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text.Trim() + "%")); + } + + if (!string.IsNullOrEmpty(this.txtCardNo.Text.Trim())) + { + strSql += " AND viewPerSon.CardNo LIKE @CardNo"; + listStr.Add(new SqlParameter("@CardNo", "%" + this.txtCardNo.Text.Trim() + "%")); + } + if (!string.IsNullOrEmpty(this.txtRoleName.Text.Trim())) + { + strSql += " AND viewPerSon.PostTrainingRoleName LIKE @RoleName"; + listStr.Add(new SqlParameter("@RoleName", "%" + this.txtRoleName.Text.Trim() + "%")); + } + //if (ckPostType2.Checked) + //{ + // strSql += " AND viewPerSon.PostType = @PostType"; + // listStr.Add(new SqlParameter("@PostType", BLL.Const.PostType_2)); + //} + //if (ckIsHsse.Checked) + //{ + // strSql += " AND IsHsse = @IsHsse"; + // listStr.Add(new SqlParameter("@IsHsse", true)); + //} + strSql += " group by viewPerSon.PersonId,viewPerSon.UnitName,viewPerSon.PersonName,viewPerSon.CardNo,viewPerSon.Sex,PostTrainingRoleId,PostTrainingRoleName,viewPerSon.IdentityCard,TeamGroupName,WorkAreaName,InTime,SexName"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + Grid1.RecordCount = tb.Rows.Count; + var table1 = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table1; + Grid1.DataBind(); + } + } + #endregion + + #region 排序 + /// + /// Grid1排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + #endregion + + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/SelectPerson.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/SelectPerson.aspx.designer.cs new file mode 100644 index 0000000..4656544 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/SelectPerson.aspx.designer.cs @@ -0,0 +1,107 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.PostTraining +{ + + + public partial class SelectPerson + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// drpUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnit; + + /// + /// txtPersonName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPersonName; + + /// + /// txtCardNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCardNo; + + /// + /// txtRoleName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRoleName; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx b/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx index 1f1e9a6..e57e760 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx @@ -61,7 +61,11 @@ +<<<<<<< HEAD >>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 TextAlign="Center"> diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx.cs index 6bd61a0..fb6c1b4 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx.cs @@ -4,7 +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; @@ -100,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) diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardDataIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardDataIn.aspx.cs index 685bf90..8973758 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardDataIn.aspx.cs @@ -6,8 +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 { diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardEdit.aspx.cs index 8c9ae00..12b8c1f 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/StandardEdit.aspx.cs @@ -1,7 +1,11 @@ using BLL; +<<<<<<< HEAD using Microsoft.Office.Interop.Excel; using System; using System.Web; +======= +using System; +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 namespace FineUIPro.Web.HSSE.PostTraining { @@ -156,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; diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/Teachers.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/Teachers.aspx.cs index 42dbd43..b3e69a6 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/Teachers.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/Teachers.aspx.cs @@ -1,10 +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; diff --git a/SGGL/FineUIPro.Web/HSSE/PostTraining/TeachersEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PostTraining/TeachersEdit.aspx.cs index 5a42664..84bed8c 100644 --- a/SGGL/FineUIPro.Web/HSSE/PostTraining/TeachersEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/PostTraining/TeachersEdit.aspx.cs @@ -1,6 +1,9 @@ using BLL; using System; +<<<<<<< HEAD using System.Web; +======= +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 namespace FineUIPro.Web.HSSE.PostTraining { diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx index afbe6aa..2840727 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx @@ -58,6 +58,9 @@ + + @@ -113,6 +116,9 @@ + + <%-- --%> diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs index f8e913b..995df8b 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs @@ -65,6 +65,7 @@ namespace FineUIPro.Web.HSSE.SitePerson this.btnMenuDelete.ConfirmText = String.Format("你确定要删除选中的  行数据吗？", Grid1.GetSelectedCountReference()); this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); BLL.WorkPostService.InitWorkPostDropDownList(this.drpPost, true); + PostTrainingRoleService.InitPostTrainingRoleDropDownList(this.drpRole, true); this.InitTreeMenu();//加载树 } } @@ -293,6 +294,22 @@ namespace FineUIPro.Web.HSSE.SitePerson strSql += ")"; } + if (this.drpRole.SelectedItemArray.Count() > 1 || (this.drpRole.SelectedValue != BLL.Const._Null && this.drpRole.SelectedItemArray.Count() == 1)) + { + strSql += " AND (1=2 "; + int i = 0; + foreach (var item in this.drpRole.SelectedValueArray) + { + if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null) + { + strSql += " OR PostTrainingRoleId = @PostTrainingRoleId" + i.ToString(); + listStr.Add(new SqlParameter("@PostTrainingRoleId" + i.ToString(), item)); + } + i++; + } + strSql += ")"; + } + if (this.ckTrain.Checked) { strSql += " AND TrainCount is null "; diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs index 213f092..bc9164c 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs @@ -131,6 +131,15 @@ namespace FineUIPro.Web.HSSE.SitePerson /// protected global::FineUIPro.DropDownList drpPost; + /// + /// drpRole 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpRole; + /// /// drpTreamGroup 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx index 010f3a0..37ad482 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx @@ -144,6 +144,8 @@ + + diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs index 03ad527..90165ab 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs @@ -113,6 +113,10 @@ namespace FineUIPro.Web.HSSE.SitePerson { this.drpPost.SelectedValue = person.WorkPostId; } + if (!string.IsNullOrEmpty(person.PostTrainingRoleId)) + { + this.drpRole.SelectedValue = person.PostTrainingRoleId; + } if (!string.IsNullOrEmpty(person.PositionId)) { this.drpPosition.SelectedValue = person.PositionId; @@ -264,7 +268,10 @@ namespace FineUIPro.Web.HSSE.SitePerson { gvWorkArea.DataSource = BLL.UnitWorkService.GetUnitWorkLists(this.ProjectId); gvWorkArea.DataBind();//单位工程 + //所属岗位 WorkPostService.InitWorkPostDropDownList(this.drpPost, true); + //培训岗位 + PostTrainingRoleService.InitPostTrainingRoleDropDownList(this.drpRole, true); PositionService.InitPositionDropDownList(this.drpPosition, true); PostTitleService.InitPostTitleDropDownList(this.drpTitle, true); TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, this.ProjectId, this.UnitId, true); @@ -326,6 +333,11 @@ namespace FineUIPro.Web.HSSE.SitePerson ShowNotify("请选择所属岗位！", MessageBoxIcon.Warning); return; } + if (this.drpRole.SelectedValue == BLL.Const._Null) + { + ShowNotify("请选择培训岗位！", MessageBoxIcon.Warning); + return; + } if (string.IsNullOrEmpty(this.txtInTime.Text)) { ShowNotify("入场时间不能为空！", MessageBoxIcon.Warning); @@ -386,6 +398,10 @@ namespace FineUIPro.Web.HSSE.SitePerson { person.WorkPostId = this.drpPost.SelectedValue; } + if (this.drpRole.SelectedValue != BLL.Const._Null) + { + person.PostTrainingRoleId = this.drpRole.SelectedValue; + } if (this.drpPosition.SelectedValue != BLL.Const._Null) { person.PositionId = this.drpPosition.SelectedValue; diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs index 7982003..a9808df 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs @@ -401,6 +401,15 @@ namespace FineUIPro.Web.HSSE.SitePerson /// protected global::FineUIPro.RadioButtonList rblIsUsed; + /// + /// drpRole 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpRole; + /// /// Panel5 控件。 /// diff --git a/SGGL/FineUIPro.Web/common/PageBase.cs b/SGGL/FineUIPro.Web/common/PageBase.cs index e03489b..4a488fd 100644 --- a/SGGL/FineUIPro.Web/common/PageBase.cs +++ b/SGGL/FineUIPro.Web/common/PageBase.cs @@ -1,5 +1,4 @@ using BLL; -using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; @@ -7,7 +6,6 @@ using System.Data; using System.IO; using System.Linq; using System.Reflection; -using System.Security.Policy; using System.Text; using System.Web; using System.Web.Security; diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 2ba1216..fc3f682 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1814,6 +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); @@ -7510,6 +7519,25 @@ namespace Model } } +<<<<<<< HEAD +======= + public System.Data.Linq.Table PostTraining_Record + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table PostTraining_Record_Detail + { + get + { + return this.GetTable(); + } + } + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 public System.Data.Linq.Table PostTraining_Role { get @@ -10630,6 +10658,14 @@ namespace Model } } + public System.Data.Linq.Table View_PostTraining_RecordDetail + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table View_ProcessControl_InspectionManagement { get @@ -28494,6 +28530,8 @@ namespace Model private EntitySet _HJGL_WeldingDaily; + private EntitySet _PostTraining_Record; + private EntitySet _ProcessControl_HotProessManage; private EntitySet _ProcessControl_InspectionManagement; @@ -28960,6 +28998,7 @@ namespace Model this._PersonTrain_TrainContent = new EntitySet(new Action(this.attach_PersonTrain_TrainContent), new Action(this.detach_PersonTrain_TrainContent)); this._PersonTrain_TrainPlan = new EntitySet(new Action(this.attach_PersonTrain_TrainPlan), new Action(this.detach_PersonTrain_TrainPlan)); this._HJGL_WeldingDaily = new EntitySet(new Action(this.attach_HJGL_WeldingDaily), new Action(this.detach_HJGL_WeldingDaily)); + this._PostTraining_Record = new EntitySet(new Action(this.attach_PostTraining_Record), new Action(this.detach_PostTraining_Record)); this._ProcessControl_HotProessManage = new EntitySet(new Action(this.attach_ProcessControl_HotProessManage), new Action(this.detach_ProcessControl_HotProessManage)); this._ProcessControl_InspectionManagement = new EntitySet(new Action(this.attach_ProcessControl_InspectionManagement), new Action(this.detach_ProcessControl_InspectionManagement)); this._ProcessControl_NondestructiveTest = new EntitySet(new Action(this.attach_ProcessControl_NondestructiveTest), new Action(this.detach_ProcessControl_NondestructiveTest)); @@ -32651,6 +32690,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_Base_Project", Storage="_PostTraining_Record", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet PostTraining_Record + { + get + { + return this._PostTraining_Record; + } + set + { + this._PostTraining_Record.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ProcessControl_HotProessManage_Base_Project", Storage="_ProcessControl_HotProessManage", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet ProcessControl_HotProessManage { @@ -36355,6 +36407,18 @@ namespace Model entity.Base_Project = null; } + private void attach_PostTraining_Record(PostTraining_Record entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_PostTraining_Record(PostTraining_Record entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_ProcessControl_HotProessManage(ProcessControl_HotProessManage entity) { this.SendPropertyChanging(); @@ -287953,6 +288017,11 @@ namespace Model private EntitySet _PostTraining_Course; +<<<<<<< HEAD +======= + private EntitySet _PostTraining_Record; + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -287975,6 +288044,10 @@ namespace Model { this._Sys_User = default(EntityRef); this._PostTraining_Course = new EntitySet(new Action(this.attach_PostTraining_Course), new Action(this.detach_PostTraining_Course)); +<<<<<<< HEAD +======= + this._PostTraining_Record = new EntitySet(new Action(this.attach_PostTraining_Record), new Action(this.detach_PostTraining_Record)); +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 OnCreated(); } @@ -288149,6 +288222,22 @@ 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 + { + get + { + return this._PostTraining_Record; + } + set + { + this._PostTraining_Record.Assign(value); + } + } + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -288180,6 +288269,21 @@ namespace Model this.SendPropertyChanging(); entity.PostTraining_Category = null; } +<<<<<<< HEAD +======= + + private void attach_PostTraining_Record(PostTraining_Record entity) + { + this.SendPropertyChanging(); + entity.PostTraining_Category = this; + } + + private void detach_PostTraining_Record(PostTraining_Record entity) + { + this.SendPropertyChanging(); + entity.PostTraining_Category = null; + } +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PostTraining_Course")] @@ -288216,6 +288320,11 @@ namespace Model private EntityRef _Sys_User; +<<<<<<< HEAD +======= + private EntitySet _PostTraining_Record; + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 private EntitySet _PostTraining_Standard; #region 可扩展性方法定义 @@ -288252,6 +288361,10 @@ namespace Model { this._PostTraining_Category = default(EntityRef); this._Sys_User = default(EntityRef); +<<<<<<< HEAD +======= + this._PostTraining_Record = new EntitySet(new Action(this.attach_PostTraining_Record), new Action(this.detach_PostTraining_Record)); +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 this._PostTraining_Standard = new EntitySet(new Action(this.attach_PostTraining_Standard), new Action(this.detach_PostTraining_Standard)); OnCreated(); } @@ -288572,6 +288685,22 @@ 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 + { + get + { + return this._PostTraining_Record; + } + set + { + this._PostTraining_Record.Assign(value); + } + } + +>>>>>>> 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 { @@ -288605,6 +288734,21 @@ namespace Model } } +<<<<<<< HEAD +======= + private void attach_PostTraining_Record(PostTraining_Record entity) + { + this.SendPropertyChanging(); + entity.PostTraining_Course = this; + } + + private void detach_PostTraining_Record(PostTraining_Record entity) + { + this.SendPropertyChanging(); + entity.PostTraining_Course = null; + } + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 private void attach_PostTraining_Standard(PostTraining_Standard entity) { this.SendPropertyChanging(); @@ -288841,6 +288985,870 @@ namespace Model } } +<<<<<<< HEAD +======= + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PostTraining_Record")] + public partial class PostTraining_Record : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ProjectId; + + private string _Code; + + private string _Name; + + private string _Content; + + private string _CategoryId; + + private string _CategoryName; + + private string _CourseId; + + private string _CourseName; + + private string _Location; + + private string _Method; + + private string _Lecturer; + + private string _UnitIds; + + private string _RoleIds; + + private int _PersonNum; + + private System.DateTime _TrainingTime; + + private decimal _Duration; + + private string _Remark; + + private System.Nullable _CompileDate; + + private string _CompileMan; + + private EntityRef _Base_Project; + + private EntitySet _PostTraining_Record_Detail; + + private EntityRef _PostTraining_Category; + + private EntityRef _PostTraining_Course; + + private EntityRef _Sys_User; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnCodeChanging(string value); + partial void OnCodeChanged(); + partial void OnNameChanging(string value); + partial void OnNameChanged(); + partial void OnContentChanging(string value); + partial void OnContentChanged(); + partial void OnCategoryIdChanging(string value); + partial void OnCategoryIdChanged(); + partial void OnCategoryNameChanging(string value); + partial void OnCategoryNameChanged(); + partial void OnCourseIdChanging(string value); + partial void OnCourseIdChanged(); + partial void OnCourseNameChanging(string value); + partial void OnCourseNameChanged(); + partial void OnLocationChanging(string value); + partial void OnLocationChanged(); + partial void OnMethodChanging(string value); + partial void OnMethodChanged(); + partial void OnLecturerChanging(string value); + partial void OnLecturerChanged(); + partial void OnUnitIdsChanging(string value); + partial void OnUnitIdsChanged(); + partial void OnRoleIdsChanging(string value); + partial void OnRoleIdsChanged(); + partial void OnPersonNumChanging(int value); + partial void OnPersonNumChanged(); + partial void OnTrainingTimeChanging(System.DateTime value); + partial void OnTrainingTimeChanged(); + partial void OnDurationChanging(decimal value); + partial void OnDurationChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnCompileDateChanging(System.Nullable value); + partial void OnCompileDateChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); + #endregion + + public PostTraining_Record() + { + this._Base_Project = default(EntityRef); + this._PostTraining_Record_Detail = new EntitySet(new Action(this.attach_PostTraining_Record_Detail), new Action(this.detach_PostTraining_Record_Detail)); + this._PostTraining_Category = default(EntityRef); + this._PostTraining_Course = default(EntityRef); + this._Sys_User = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Code", DbType="NVarChar(50)")] + public string Code + { + get + { + return this._Code; + } + set + { + if ((this._Code != value)) + { + this.OnCodeChanging(value); + this.SendPropertyChanging(); + this._Code = value; + this.SendPropertyChanged("Code"); + this.OnCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")] + public string Name + { + get + { + return this._Name; + } + set + { + if ((this._Name != value)) + { + this.OnNameChanging(value); + this.SendPropertyChanging(); + this._Name = value; + this.SendPropertyChanged("Name"); + this.OnNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Content", DbType="NVarChar(500)")] + public string Content + { + get + { + return this._Content; + } + set + { + if ((this._Content != value)) + { + this.OnContentChanging(value); + this.SendPropertyChanging(); + this._Content = value; + this.SendPropertyChanged("Content"); + this.OnContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CategoryId", DbType="NVarChar(50)")] + public string CategoryId + { + get + { + return this._CategoryId; + } + set + { + if ((this._CategoryId != value)) + { + if (this._PostTraining_Category.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnCategoryIdChanging(value); + this.SendPropertyChanging(); + this._CategoryId = value; + this.SendPropertyChanged("CategoryId"); + this.OnCategoryIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CategoryName", DbType="NVarChar(200)")] + public string CategoryName + { + get + { + return this._CategoryName; + } + set + { + if ((this._CategoryName != value)) + { + this.OnCategoryNameChanging(value); + this.SendPropertyChanging(); + this._CategoryName = value; + this.SendPropertyChanged("CategoryName"); + this.OnCategoryNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CourseId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string CourseId + { + get + { + return this._CourseId; + } + set + { + if ((this._CourseId != value)) + { + if (this._PostTraining_Course.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnCourseIdChanging(value); + this.SendPropertyChanging(); + this._CourseId = value; + this.SendPropertyChanged("CourseId"); + this.OnCourseIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CourseName", DbType="NVarChar(200)")] + public string CourseName + { + get + { + return this._CourseName; + } + set + { + if ((this._CourseName != value)) + { + this.OnCourseNameChanging(value); + this.SendPropertyChanging(); + this._CourseName = value; + this.SendPropertyChanged("CourseName"); + this.OnCourseNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Location", DbType="NVarChar(200)")] + public string Location + { + get + { + return this._Location; + } + set + { + if ((this._Location != value)) + { + this.OnLocationChanging(value); + this.SendPropertyChanging(); + this._Location = value; + this.SendPropertyChanged("Location"); + this.OnLocationChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Method", DbType="NVarChar(200)")] + public string Method + { + get + { + return this._Method; + } + set + { + if ((this._Method != value)) + { + this.OnMethodChanging(value); + this.SendPropertyChanging(); + this._Method = value; + this.SendPropertyChanged("Method"); + this.OnMethodChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Lecturer", DbType="NVarChar(200)")] + public string Lecturer + { + get + { + return this._Lecturer; + } + set + { + if ((this._Lecturer != value)) + { + this.OnLecturerChanging(value); + this.SendPropertyChanging(); + this._Lecturer = value; + this.SendPropertyChanged("Lecturer"); + this.OnLecturerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitIds", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string UnitIds + { + get + { + return this._UnitIds; + } + set + { + if ((this._UnitIds != value)) + { + this.OnUnitIdsChanging(value); + this.SendPropertyChanging(); + this._UnitIds = value; + this.SendPropertyChanged("UnitIds"); + this.OnUnitIdsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RoleIds", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string RoleIds + { + get + { + return this._RoleIds; + } + set + { + if ((this._RoleIds != value)) + { + this.OnRoleIdsChanging(value); + this.SendPropertyChanging(); + this._RoleIds = value; + this.SendPropertyChanged("RoleIds"); + this.OnRoleIdsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonNum", DbType="Int NOT NULL")] + public int PersonNum + { + get + { + return this._PersonNum; + } + set + { + if ((this._PersonNum != value)) + { + this.OnPersonNumChanging(value); + this.SendPropertyChanging(); + this._PersonNum = value; + this.SendPropertyChanged("PersonNum"); + this.OnPersonNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainingTime", DbType="DateTime NOT NULL")] + public System.DateTime TrainingTime + { + get + { + return this._TrainingTime; + } + set + { + if ((this._TrainingTime != value)) + { + this.OnTrainingTimeChanging(value); + this.SendPropertyChanging(); + this._TrainingTime = value; + this.SendPropertyChanged("TrainingTime"); + this.OnTrainingTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Duration", DbType="Decimal(10,2) NOT NULL")] + public decimal Duration + { + get + { + return this._Duration; + } + set + { + if ((this._Duration != value)) + { + this.OnDurationChanging(value); + this.SendPropertyChanging(); + this._Duration = value; + this.SendPropertyChanged("Duration"); + this.OnDurationChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(1000)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] + public System.Nullable CompileDate + { + get + { + return this._CompileDate; + } + set + { + if ((this._CompileDate != value)) + { + this.OnCompileDateChanging(value); + this.SendPropertyChanging(); + this._CompileDate = value; + this.SendPropertyChanged("CompileDate"); + this.OnCompileDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] + public string CompileMan + { + get + { + return this._CompileMan; + } + set + { + if ((this._CompileMan != value)) + { + if (this._Sys_User.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnCompileManChanging(value); + this.SendPropertyChanging(); + this._CompileMan = value; + this.SendPropertyChanged("CompileMan"); + this.OnCompileManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.PostTraining_Record.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.PostTraining_Record.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_Detail_PostTraining_Record", Storage="_PostTraining_Record_Detail", ThisKey="Id", OtherKey="RecordId", DeleteRule="NO ACTION")] + public EntitySet PostTraining_Record_Detail + { + get + { + return this._PostTraining_Record_Detail; + } + set + { + this._PostTraining_Record_Detail.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_PostTraining_Category", Storage="_PostTraining_Category", ThisKey="CategoryId", OtherKey="Id", IsForeignKey=true)] + public PostTraining_Category PostTraining_Category + { + get + { + return this._PostTraining_Category.Entity; + } + set + { + PostTraining_Category previousValue = this._PostTraining_Category.Entity; + if (((previousValue != value) + || (this._PostTraining_Category.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._PostTraining_Category.Entity = null; + previousValue.PostTraining_Record.Remove(this); + } + this._PostTraining_Category.Entity = value; + if ((value != null)) + { + value.PostTraining_Record.Add(this); + this._CategoryId = value.Id; + } + else + { + this._CategoryId = default(string); + } + this.SendPropertyChanged("PostTraining_Category"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_PostTraining_Course", Storage="_PostTraining_Course", ThisKey="CourseId", OtherKey="Id", IsForeignKey=true)] + public PostTraining_Course PostTraining_Course + { + get + { + return this._PostTraining_Course.Entity; + } + set + { + PostTraining_Course previousValue = this._PostTraining_Course.Entity; + if (((previousValue != value) + || (this._PostTraining_Course.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._PostTraining_Course.Entity = null; + previousValue.PostTraining_Record.Remove(this); + } + this._PostTraining_Course.Entity = value; + if ((value != null)) + { + value.PostTraining_Record.Add(this); + this._CourseId = value.Id; + } + else + { + this._CourseId = default(string); + } + this.SendPropertyChanged("PostTraining_Course"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] + public Sys_User Sys_User + { + get + { + return this._Sys_User.Entity; + } + set + { + Sys_User previousValue = this._Sys_User.Entity; + if (((previousValue != value) + || (this._Sys_User.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Sys_User.Entity = null; + previousValue.PostTraining_Record.Remove(this); + } + this._Sys_User.Entity = value; + if ((value != null)) + { + value.PostTraining_Record.Add(this); + this._CompileMan = value.UserId; + } + else + { + this._CompileMan = default(string); + } + this.SendPropertyChanged("Sys_User"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + + private void attach_PostTraining_Record_Detail(PostTraining_Record_Detail entity) + { + this.SendPropertyChanging(); + entity.PostTraining_Record = this; + } + + private void detach_PostTraining_Record_Detail(PostTraining_Record_Detail entity) + { + this.SendPropertyChanging(); + entity.PostTraining_Record = null; + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PostTraining_Record_Detail")] + public partial class PostTraining_Record_Detail : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _RecordId; + + private string _PersonId; + + private EntityRef _PostTraining_Record; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnRecordIdChanging(string value); + partial void OnRecordIdChanged(); + partial void OnPersonIdChanging(string value); + partial void OnPersonIdChanged(); + #endregion + + public PostTraining_Record_Detail() + { + this._PostTraining_Record = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordId", DbType="NVarChar(50)")] + public string RecordId + { + get + { + return this._RecordId; + } + set + { + if ((this._RecordId != value)) + { + if (this._PostTraining_Record.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnRecordIdChanging(value); + this.SendPropertyChanging(); + this._RecordId = value; + this.SendPropertyChanged("RecordId"); + this.OnRecordIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonId", DbType="NVarChar(50)")] + public string PersonId + { + get + { + return this._PersonId; + } + set + { + if ((this._PersonId != value)) + { + this.OnPersonIdChanging(value); + this.SendPropertyChanging(); + this._PersonId = value; + this.SendPropertyChanged("PersonId"); + this.OnPersonIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PostTraining_Record_Detail_PostTraining_Record", Storage="_PostTraining_Record", ThisKey="RecordId", OtherKey="Id", IsForeignKey=true)] + public PostTraining_Record PostTraining_Record + { + get + { + return this._PostTraining_Record.Entity; + } + set + { + PostTraining_Record previousValue = this._PostTraining_Record.Entity; + if (((previousValue != value) + || (this._PostTraining_Record.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._PostTraining_Record.Entity = null; + previousValue.PostTraining_Record_Detail.Remove(this); + } + this._PostTraining_Record.Entity = value; + if ((value != null)) + { + value.PostTraining_Record_Detail.Add(this); + this._RecordId = value.Id; + } + else + { + this._RecordId = default(string); + } + this.SendPropertyChanged("PostTraining_Record"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PostTraining_Role")] public partial class PostTraining_Role : INotifyPropertyChanging, INotifyPropertyChanged { @@ -343965,6 +344973,8 @@ namespace Model private string _States; + private string _PostTrainingRoleId; + private EntitySet _Accident_AccidentPersonRecord; private EntitySet _Accident_AccidentReportOtherItem; @@ -344151,6 +345161,8 @@ namespace Model partial void OnBlackReasonChanged(); partial void OnStatesChanging(string value); partial void OnStatesChanged(); + partial void OnPostTrainingRoleIdChanging(string value); + partial void OnPostTrainingRoleIdChanged(); #endregion public SitePerson_Person() @@ -345516,6 +346528,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PostTrainingRoleId", DbType="NVarChar(50)")] + public string PostTrainingRoleId + { + get + { + return this._PostTrainingRoleId; + } + set + { + if ((this._PostTrainingRoleId != value)) + { + this.OnPostTrainingRoleIdChanging(value); + this.SendPropertyChanging(); + this._PostTrainingRoleId = value; + this.SendPropertyChanged("PostTrainingRoleId"); + this.OnPostTrainingRoleIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentPersonRecord_SitePerson_Person", Storage="_Accident_AccidentPersonRecord", ThisKey="PersonId", OtherKey="PersonId", DeleteRule="NO ACTION")] public EntitySet Accident_AccidentPersonRecord { @@ -374275,6 +375307,11 @@ namespace Model private EntitySet _PostTraining_Method; +<<<<<<< HEAD +======= + private EntitySet _PostTraining_Record; + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 private EntitySet _PostTraining_Role; private EntitySet _PostTraining_Standard; @@ -374836,6 +375873,10 @@ namespace Model this._PostTraining_Category = new EntitySet(new Action(this.attach_PostTraining_Category), new Action(this.detach_PostTraining_Category)); this._PostTraining_Course = new EntitySet(new Action(this.attach_PostTraining_Course), new Action(this.detach_PostTraining_Course)); this._PostTraining_Method = new EntitySet(new Action(this.attach_PostTraining_Method), new Action(this.detach_PostTraining_Method)); +<<<<<<< HEAD +======= + this._PostTraining_Record = new EntitySet(new Action(this.attach_PostTraining_Record), new Action(this.detach_PostTraining_Record)); +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 this._PostTraining_Role = new EntitySet(new Action(this.attach_PostTraining_Role), new Action(this.detach_PostTraining_Role)); this._PostTraining_Standard = new EntitySet(new Action(this.attach_PostTraining_Standard), new Action(this.detach_PostTraining_Standard)); this._PostTraining_Teachers = new EntitySet(new Action(this.attach_PostTraining_Teachers), new Action(this.detach_PostTraining_Teachers)); @@ -379452,6 +380493,22 @@ 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 + { + get + { + return this._PostTraining_Record; + } + set + { + this._PostTraining_Record.Assign(value); + } + } + +>>>>>>> 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 { @@ -383834,6 +384891,21 @@ namespace Model entity.Sys_User = null; } +<<<<<<< HEAD +======= + private void attach_PostTraining_Record(PostTraining_Record entity) + { + this.SendPropertyChanging(); + entity.Sys_User = this; + } + + private void detach_PostTraining_Record(PostTraining_Record entity) + { + this.SendPropertyChanging(); + entity.Sys_User = null; + } + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 private void attach_PostTraining_Role(PostTraining_Role entity) { this.SendPropertyChanging(); @@ -451965,6 +453037,141 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_PostTraining_RecordDetail")] + public partial class View_PostTraining_RecordDetail + { + + private string _DetailId; + + private string _RecordId; + + private string _PersonId; + + private string _UnitId; + + private string _UnitName; + + private string _PersonName; + + private string _RoleName; + + public View_PostTraining_RecordDetail() + { + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DetailId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string DetailId + { + get + { + return this._DetailId; + } + set + { + if ((this._DetailId != value)) + { + this._DetailId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordId", DbType="NVarChar(50)")] + public string RecordId + { + get + { + return this._RecordId; + } + set + { + if ((this._RecordId != value)) + { + this._RecordId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonId", DbType="NVarChar(50)")] + public string PersonId + { + get + { + return this._PersonId; + } + set + { + if ((this._PersonId != value)) + { + this._PersonId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")] + public string UnitId + { + get + { + return this._UnitId; + } + set + { + if ((this._UnitId != value)) + { + this._UnitId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(200)")] + public string UnitName + { + get + { + return this._UnitName; + } + set + { + if ((this._UnitName != value)) + { + this._UnitName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonName", DbType="NVarChar(50)")] + public string PersonName + { + get + { + return this._PersonName; + } + set + { + if ((this._PersonName != value)) + { + this._PersonName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RoleName", DbType="NVarChar(200)")] + public string RoleName + { + get + { + return this._RoleName; + } + set + { + if ((this._RoleName != value)) + { + this._RoleName = value; + } + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_ProcessControl_InspectionManagement")] public partial class View_ProcessControl_InspectionManagement { @@ -456000,6 +457207,10 @@ namespace Model private System.Nullable _LevelValue; + private string _PostTrainingRoleId; + + private string _PostTrainingRoleName; + public View_SitePerson_Person() { } @@ -457219,6 +458430,38 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PostTrainingRoleId", DbType="NVarChar(50)")] + public string PostTrainingRoleId + { + get + { + return this._PostTrainingRoleId; + } + set + { + if ((this._PostTrainingRoleId != value)) + { + this._PostTrainingRoleId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PostTrainingRoleName", DbType="NVarChar(200)")] + public string PostTrainingRoleName + { + get + { + return this._PostTrainingRoleName; + } + set + { + if ((this._PostTrainingRoleName != value)) + { + this._PostTrainingRoleName = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_SitePerson_PersonList")] @@ -457271,6 +458514,13 @@ namespace Model private string _PoliticsStatusName; +<<<<<<< HEAD +======= + private string _PostTrainingRoleId; + + private string _PostTrainingRoleName; + +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 public View_SitePerson_PersonList() { } @@ -457642,6 +458892,41 @@ namespace Model } } } +<<<<<<< HEAD +======= + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PostTrainingRoleId", DbType="NVarChar(50)")] + public string PostTrainingRoleId + { + get + { + return this._PostTrainingRoleId; + } + set + { + if ((this._PostTrainingRoleId != value)) + { + this._PostTrainingRoleId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PostTrainingRoleName", DbType="NVarChar(200)")] + public string PostTrainingRoleName + { + get + { + return this._PostTrainingRoleName; + } + set + { + if ((this._PostTrainingRoleName != value)) + { + this._PostTrainingRoleName = value; + } + } + } +>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74 } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Solution_LargerHazardListItem")]