diff --git a/DataBase/版本日志/SGGLDB_V2025-02-17-geh.sql b/DataBase/版本日志/SGGLDB_V2025-02-17-geh.sql new file mode 100644 index 0000000..fae4d11 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-02-17-geh.sql @@ -0,0 +1,38 @@ +alter table dbo.Training_TestPlan add TrainTypeId nvarchar(50); +go + + +alter TABLE [dbo].[Training_CompanyTrainingItem]add + [TestTrainingIds] [nvarchar](max) NULL ; + +alter TABLE [dbo].[Training_CompanyTrainingItem]add + [LearningTime] [int] NULL ; + +alter TABLE [dbo].[Training_CompanyTrainingItem]add + [Durations] [float](53) NULL ; + +alter TABLE [dbo].[Training_TestRecord]add + [CompanyTrainingItemId] [nvarchar](50) NULL ; + +update sys_menu set IsUsed=0 where menuid='EF99E038-5A12-4E02-B925-6671F9AE16CA'; +update sys_menu set IsUsed=0 where menuid='10736CAC-A343-4D73-9D03-E6A3D1909A7B'; +update sys_menu set IsUsed=0 where menuid='6C314522-AF62-4476-893E-5F42C09C3077'; +update sys_menu set menuname='ѵ¼' where menuid='1182E353-FAB9-4DB1-A1EC-F41A00892128'; +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('ACF2CAB1-CE56-4CED-B252-692558F9E36F','ѵ¼','HSSE/EduTrain/Trainingrecords.aspx',50,'6A0506EB-05CE-4BB3-9BA9-866389F01E1C','Menu_HSSE',0,1,1); +go + + + + + + + + + + + + + + + diff --git a/DataBase/版本日志/SGGLDB_V2025-02-19-geh.sql b/DataBase/版本日志/SGGLDB_V2025-02-19-geh.sql new file mode 100644 index 0000000..3590e0d --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-02-19-geh.sql @@ -0,0 +1,334 @@ +CREATE TABLE [dbo].[Technique_ProtectionStandards] ( + [ProtectionStandardsId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL, + [ProtectionStandardsCode] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [ProtectionStandardsName] nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL, + [CompileMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [CompileDate] datetime NULL, + [AttachUrl] nvarchar(2000) COLLATE Chinese_PRC_CI_AS NULL, + [AuditMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [AuditDate] datetime NULL, + [IsPass] bit NULL, + [IsBuild] bit NULL, + [UpState] char(1) COLLATE Chinese_PRC_CI_AS NULL, + CONSTRAINT [PK_Technique_ProtectionStandards] PRIMARY KEY CLUSTERED ([ProtectionStandardsId]) +WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) +ON [PRIMARY], + +) +ON [PRIMARY] +GO + +ALTER TABLE [dbo].[Technique_ProtectionStandards] SET (LOCK_ESCALATION = TABLE) +GO + + +EXEC sp_addextendedproperty +'MS_Description', N'编号', +'SCHEMA', N'dbo', +'TABLE', N'Technique_ProtectionStandards', +'COLUMN', N'ProtectionStandardsCode' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'名称', +'SCHEMA', N'dbo', +'TABLE', N'Technique_ProtectionStandards', +'COLUMN', N'ProtectionStandardsName' +GO + + +EXEC sp_addextendedproperty +'MS_Description', N'编制人', +'SCHEMA', N'dbo', +'TABLE', N'Technique_ProtectionStandards', +'COLUMN', N'CompileMan' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'编制日期', +'SCHEMA', N'dbo', +'TABLE', N'Technique_ProtectionStandards', +'COLUMN', N'CompileDate' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'附件', +'SCHEMA', N'dbo', +'TABLE', N'Technique_ProtectionStandards', +'COLUMN', N'AttachUrl' +GO + + +EXEC sp_addextendedproperty +'MS_Description', N'防护标准表', +'SCHEMA', N'dbo', +'TABLE', N'Technique_ProtectionStandards' + +INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) +VALUES (N'8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201', N'防护标准', NULL, N'HSSE/Technique/ProtectionStandards.aspx', 90, N'D70D9BF5-C72E-414D-941B-CF9B4065F6BA', N'Menu_DigData', '1', '1', '1', NULL); + + + +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201', N'增加', 1); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201', N'修改', 2); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201', N'删除', 3); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201', N'保存', 4); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201', N'导出', 5); + + + +CREATE TABLE [dbo].[Technique_SafetyResponsibilities] ( + [SafetyResponsibilitiesId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL, + [SafetyResponsibilitiesCode] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [SafetyResponsibilitiesName] nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL, + [CompileMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [CompileDate] datetime NULL, + [AttachUrl] nvarchar(2000) COLLATE Chinese_PRC_CI_AS NULL, + [AuditMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [AuditDate] datetime NULL, + [IsPass] bit NULL, + [IsBuild] bit NULL, + [UpState] char(1) COLLATE Chinese_PRC_CI_AS NULL, + CONSTRAINT [PK_Technique_SafetyResponsibilities] PRIMARY KEY CLUSTERED ([SafetyResponsibilitiesId]) +WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) +ON [PRIMARY], + +) +ON [PRIMARY] +GO + +ALTER TABLE [dbo].[Technique_SafetyResponsibilities] SET (LOCK_ESCALATION = TABLE) +GO + + +EXEC sp_addextendedproperty +'MS_Description', N'编号', +'SCHEMA', N'dbo', +'TABLE', N'Technique_SafetyResponsibilities', +'COLUMN', N'SafetyResponsibilitiesCode' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'名称', +'SCHEMA', N'dbo', +'TABLE', N'Technique_SafetyResponsibilities', +'COLUMN', N'SafetyResponsibilitiesName' +GO + + +EXEC sp_addextendedproperty +'MS_Description', N'编制人', +'SCHEMA', N'dbo', +'TABLE', N'Technique_SafetyResponsibilities', +'COLUMN', N'CompileMan' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'编制日期', +'SCHEMA', N'dbo', +'TABLE', N'Technique_SafetyResponsibilities', +'COLUMN', N'CompileDate' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'附件', +'SCHEMA', N'dbo', +'TABLE', N'Technique_SafetyResponsibilities', +'COLUMN', N'AttachUrl' +GO + + +EXEC sp_addextendedproperty +'MS_Description', N'安全职责表', +'SCHEMA', N'dbo', +'TABLE', N'Technique_SafetyResponsibilities' + +INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) +VALUES (N'6D75EA6C-0E49-4B04-850B-930B628EE1DF', N'安全职责', NULL, N'HSSE/Technique/SafetyResponsibilities.aspx', 100, N'D70D9BF5-C72E-414D-941B-CF9B4065F6BA', N'Menu_DigData', '1', '1', '1', NULL); + +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'6D75EA6C-0E49-4B04-850B-930B628EE1DF', N'增加', 1); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'6D75EA6C-0E49-4B04-850B-930B628EE1DF', N'修改', 2); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'6D75EA6C-0E49-4B04-850B-930B628EE1DF', N'删除', 3); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'6D75EA6C-0E49-4B04-850B-930B628EE1DF', N'保存', 4); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'6D75EA6C-0E49-4B04-850B-930B628EE1DF', N'导出', 5); + + + +CREATE TABLE [dbo].[Technique_ConstructionStandards] ( + [ConstructionStandardsId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL, + [ConstructionStandardsCode] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [ConstructionStandardsName] nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL, + [CompileMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [CompileDate] datetime NULL, + [AttachUrl] nvarchar(2000) COLLATE Chinese_PRC_CI_AS NULL, + [AuditMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [AuditDate] datetime NULL, + [IsPass] bit NULL, + [IsBuild] bit NULL, + [UpState] char(1) COLLATE Chinese_PRC_CI_AS NULL, + CONSTRAINT [PK_Technique_ConstructionStandards] PRIMARY KEY CLUSTERED ([ConstructionStandardsId]) +WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) +ON [PRIMARY], + +) +ON [PRIMARY] +GO + +ALTER TABLE [dbo].[Technique_ConstructionStandards] SET (LOCK_ESCALATION = TABLE) +GO + + +EXEC sp_addextendedproperty +'MS_Description', N'编号', +'SCHEMA', N'dbo', +'TABLE', N'Technique_ConstructionStandards', +'COLUMN', N'ConstructionStandardsCode' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'名称', +'SCHEMA', N'dbo', +'TABLE', N'Technique_ConstructionStandards', +'COLUMN', N'ConstructionStandardsName' +GO + + +EXEC sp_addextendedproperty +'MS_Description', N'编制人', +'SCHEMA', N'dbo', +'TABLE', N'Technique_ConstructionStandards', +'COLUMN', N'CompileMan' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'编制日期', +'SCHEMA', N'dbo', +'TABLE', N'Technique_ConstructionStandards', +'COLUMN', N'CompileDate' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'附件', +'SCHEMA', N'dbo', +'TABLE', N'Technique_ConstructionStandards', +'COLUMN', N'AttachUrl' +GO + + +EXEC sp_addextendedproperty +'MS_Description', N'队伍文明施工标准表', +'SCHEMA', N'dbo', +'TABLE', N'Technique_ConstructionStandards' + + +INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) +VALUES (N'23ACEE2E-0E56-4136-9DFB-C971B3C4EA60', N'队伍文明施工标准', NULL, N'HSSE/Technique/ConstructionStandards.aspx', 110, N'D70D9BF5-C72E-414D-941B-CF9B4065F6BA', N'Menu_DigData', '1', '1', '1', NULL); + +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'23ACEE2E-0E56-4136-9DFB-C971B3C4EA60', N'增加', 1); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'23ACEE2E-0E56-4136-9DFB-C971B3C4EA60', N'修改', 2); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'23ACEE2E-0E56-4136-9DFB-C971B3C4EA60', N'删除', 3); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'23ACEE2E-0E56-4136-9DFB-C971B3C4EA60', N'保存', 4); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'23ACEE2E-0E56-4136-9DFB-C971B3C4EA60', N'导出', 5); + + + +CREATE TABLE [dbo].[Technique_AwardStandards] ( + [AwardStandardsId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL, + [AwardStandardsCode] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [AwardStandardsName] nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL, + [CompileMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [CompileDate] datetime NULL, + [AttachUrl] nvarchar(2000) COLLATE Chinese_PRC_CI_AS NULL, + [AuditMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [AuditDate] datetime NULL, + [IsPass] bit NULL, + [IsBuild] bit NULL, + [UpState] char(1) COLLATE Chinese_PRC_CI_AS NULL, + CONSTRAINT [PK_Technique_AwardStandards] PRIMARY KEY CLUSTERED ([AwardStandardsId]) +WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) +ON [PRIMARY], + +) +ON [PRIMARY] +GO + +ALTER TABLE [dbo].[Technique_AwardStandards] SET (LOCK_ESCALATION = TABLE) +GO + + +EXEC sp_addextendedproperty +'MS_Description', N'编号', +'SCHEMA', N'dbo', +'TABLE', N'Technique_AwardStandards', +'COLUMN', N'AwardStandardsCode' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'名称', +'SCHEMA', N'dbo', +'TABLE', N'Technique_AwardStandards', +'COLUMN', N'AwardStandardsName' +GO + + +EXEC sp_addextendedproperty +'MS_Description', N'编制人', +'SCHEMA', N'dbo', +'TABLE', N'Technique_AwardStandards', +'COLUMN', N'CompileMan' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'编制日期', +'SCHEMA', N'dbo', +'TABLE', N'Technique_AwardStandards', +'COLUMN', N'CompileDate' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'附件', +'SCHEMA', N'dbo', +'TABLE', N'Technique_AwardStandards', +'COLUMN', N'AttachUrl' +GO + + +EXEC sp_addextendedproperty +'MS_Description', N'奖罚标准表', +'SCHEMA', N'dbo', +'TABLE', N'Technique_AwardStandards' + +INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) +VALUES (N'E4FD28A8-9715-452F-BB16-5FF87BE7D32B', N'奖罚标准', NULL, N'HSSE/Technique/AwardStandards.aspx', 120, N'D70D9BF5-C72E-414D-941B-CF9B4065F6BA', N'Menu_DigData', '1', '1', '1', NULL); + +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'E4FD28A8-9715-452F-BB16-5FF87BE7D32B', N'增加', 1); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'E4FD28A8-9715-452F-BB16-5FF87BE7D32B', N'修改', 2); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'E4FD28A8-9715-452F-BB16-5FF87BE7D32B', N'删除', 3); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'E4FD28A8-9715-452F-BB16-5FF87BE7D32B', N'保存', 4); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (NewID(), N'E4FD28A8-9715-452F-BB16-5FF87BE7D32B', N'导出', 5); + + +alter table dbo.Technique_ProtectionStandards add Remark nvarchar(500); +alter table dbo.Technique_SafetyResponsibilities add Remark nvarchar(500); +alter table dbo.Technique_ConstructionStandards add Remark nvarchar(500); +alter table dbo.Technique_AwardStandards add Remark nvarchar(500); \ No newline at end of file diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs index 6ad72c7..971e790 100644 --- a/SGGL/BLL/API/APIPersonService.cs +++ b/SGGL/BLL/API/APIPersonService.cs @@ -476,73 +476,159 @@ namespace BLL /// 培训岗位ID /// 培训类型ID /// - public static List getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId) + public static List getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string departIds, string trainTypeId,string InTime,string strParam) { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { + DateTime inDateTime=DateTime.Now; + if (!string.IsNullOrEmpty(InTime)&&!"null".Equals(InTime)) + { + inDateTime = DateTime.Parse(InTime); + } + List unitIdList = Funs.GetStrListByStr(unitIds, ','); - var getPersons = from x in db.View_SitePerson_Person - where x.ProjectId == projectId && unitIdList.Contains(x.UnitId) && x.IsUsed == true + var getPersons = (from x in db.View_SitePerson_Person + where x.ProjectId == projectId && unitIdList.Contains(x.UnitId) && x.IsUsed == true &&(string.IsNullOrEmpty(strParam)||x.PersonName.Contains(strParam)) && (string.IsNullOrEmpty(InTime) || x.InTime < inDateTime) && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime >= DateTime.Now) select new Model.PersonItem - { - PersonId = x.PersonId, - CardNo = x.CardNo, - PersonName = x.PersonName, - SexName = x.SexName, - IdentityCard = x.IdentityCard, - Address = x.Address, - ProjectId = x.ProjectId, - ProjectCode = x.ProjectCode, - ProjectName = x.ProjectName, - UnitId = x.UnitId, - UnitCode = x.UnitCode, - UnitName = x.UnitName, - TeamGroupId = x.TeamGroupId, - TeamGroupName = x.TeamGroupName, - WorkPostId = x.WorkPostId, - WorkPostName = x.WorkPostName, - InTime = string.Format("{0:yyyy-MM-dd}", x.InTime), - OutTime = string.Format("{0:yyyy-MM-dd}", x.OutTime), - OutResult = x.OutResult, - Telephone = x.Telephone, - PhotoUrl = x.PhotoUrl, - DepartName = x.DepartName, - }; + { + PersonId = x.PersonId, + CardNo = x.CardNo, + PersonName = x.PersonName, + SexName = x.SexName, + IdentityCard = x.IdentityCard, + Address = x.Address, + ProjectId = x.ProjectId, + ProjectCode = x.ProjectCode, + ProjectName = x.ProjectName, + UnitId = x.UnitId, + UnitCode = x.UnitCode, + UnitName = x.UnitName, + TeamGroupId = x.TeamGroupId, + TeamGroupName = x.TeamGroupName, + WorkPostId = x.WorkPostId, + WorkPostName = x.WorkPostName, + InTime = string.Format("{0:yyyy-MM-dd}", x.InTime), + OutTime = string.Format("{0:yyyy-MM-dd}", x.OutTime), + OutResult = x.OutResult, + Telephone = x.Telephone, + PhotoUrl = x.PhotoUrl, + DepartName = x.DepartName, + }).ToList(); + + + + if (!string.IsNullOrEmpty(workPostIds)) { List workPostIdList = Funs.GetStrListByStr(workPostIds, ','); - getPersons = getPersons.Where(x => workPostIdList.Contains(x.WorkPostId)); + getPersons = getPersons.Where(x => workPostIdList.Contains(x.WorkPostId)).ToList(); + } + if (!string.IsNullOrEmpty(trainTypeId) &&trainTypeId == Const.SpecialSafeTrainId)//专项安全培训 + { + var ids = db.Base_WorkPost.Where(x => x.PostType == "2").Select(x => x.WorkPostId).ToList(); + getPersons = getPersons.Where(x => ids.Contains(x.WorkPostId)).ToList(); } - List getTrainPersonList = new List(); var getTrainType = TrainTypeService.GetTrainTypeById(trainTypeId); - if (getTrainType != null && (!getTrainType.IsRepeat.HasValue || getTrainType.IsRepeat == false)) - { - foreach (var item in getPersons) - { - var getTrainPersonIdList1 = (from x in db.EduTrain_TrainRecordDetail - join y in db.EduTrain_TrainRecord on x.TrainingId equals y.TrainingId - where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && x.CheckResult == true && x.PersonId == item.PersonId - select x).FirstOrDefault(); - if (getTrainPersonIdList1 == null) - { - var getTrainPersonIdList2 = (from x in db.Training_Task - join y in db.Training_Plan on x.PlanId equals y.PlanId - where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.UserId == item.PersonId - select x).FirstOrDefault(); - if (getTrainPersonIdList2 == null) - { - getTrainPersonList.Add(item); - } - } - } - return getTrainPersonList; - } - else - { - return getPersons.ToList(); - } + if (getTrainType != null && (!getTrainType.IsRepeat.HasValue || getTrainType.IsRepeat.Value == false)) + { + int score = 80; + var sysTestRule = db.Sys_TestRule.FirstOrDefault(); + if (sysTestRule != null) + { + if (sysTestRule.PassingScore > 0) + { + score = sysTestRule.PassingScore; + } + } + foreach (var item in getPersons) + { + var getTrainPersonIdList3 = (from x in db.Training_TestRecord + join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId + where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId + where x.TestScores > score + select x).FirstOrDefault(); + if (getTrainPersonIdList3 != null) + { + continue; + } + var getTrainPersonIdList1 = (from x in db.EduTrain_TrainRecordDetail + join y in db.EduTrain_TrainRecord on x.TrainingId equals y.TrainingId + where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && x.CheckResult == true && x.PersonId == item.PersonId + select x).FirstOrDefault(); + if (getTrainPersonIdList1 == null) + { + var getTrainPersonIdList2 = (from x in db.Training_Task + join y in db.Training_Plan on x.PlanId equals y.PlanId + where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.UserId == item.PersonId + + select x).FirstOrDefault(); + if (getTrainPersonIdList2 == null) + { + getTrainPersonList.Add(item); + } + } + } + return getTrainPersonList; + } + else if (getTrainType != null && getTrainType.IsRepeat.HasValue && getTrainType.IsRepeat.Value == true)//重复的 过滤人员 + { + foreach (var item in getPersons) + { + //int score = 80; + //var sysTestRule = db.Sys_TestRule.FirstOrDefault(); + //if (sysTestRule != null) + //{ + // if (sysTestRule.PassingScore > 0) + // { + // score = sysTestRule.PassingScore; + // } + //} + //var getTrainPersonIdList2 = (from x in db.Training_TestRecord + // join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId + // where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId + // where x.TestScores > score + // select x).FirstOrDefault(); + //if (getTrainPersonIdList2 != null) + //{ + // continue; + //} + getTrainPersonList.Add(item); + } + return getTrainPersonList; + } + //else if (getTrainType != null && (!getTrainType.IsRepeat.HasValue || getTrainType.IsRepeat == false))//重复的 过滤人员 + //{ + // int score = 80; + // var sysTestRule = db.Sys_TestRule.FirstOrDefault(); + // if (sysTestRule != null) + // { + // if (sysTestRule.PassingScore > 0) + // { + // score = sysTestRule.PassingScore; + // } + // } + // foreach (var item in getPersons) + // { + + // var getTrainPersonIdList2 = (from x in db.Training_TestRecord + // join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId + // where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId + // where x.TestScores > score + // select x).FirstOrDefault(); + // if (getTrainPersonIdList2 != null) + // { + // continue; + // } + // getTrainPersonList.Add(item); + // } + // return getTrainPersonList; + //} + else + { + return getPersons.ToList(); + } } } #endregion diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index ceeee26..c23fab7 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -81,6 +81,7 @@ False ..\Lib\Microsoft.SQLServer.ManagedDTS.dll + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll @@ -716,13 +717,17 @@ + + + + diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 2ccb2d2..873ddc7 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -1890,6 +1890,25 @@ namespace BLL /// 施工方案 /// public const string SpecialSchemeMenuId = "3E2F2FFD-ED2E-4914-8370-D97A68398814"; + + /// + /// 防护标准 + /// + public const string ProtectionStandardsMenuId = "8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201"; + + /// + /// 安全职责 + /// + public const string SafetyResponsibilitiesMenuId = "6D75EA6C-0E49-4B04-850B-930B628EE1DF"; + /// + /// 队伍文明施工标准 + /// + public const string ConstructionStandardsMenuId = "23ACEE2E-0E56-4136-9DFB-C971B3C4EA60"; + /// + /// 奖罚标准 + /// + public const string AwardStandardsMenuId = "E4FD28A8-9715-452F-BB16-5FF87BE7D32B"; + #endregion #region 标牌管理 @@ -6267,6 +6286,10 @@ namespace BLL public const string InterFaceSetMenuId = "FFD221D7-AE05-447F-8727-80058A04F401"; public const string InterFaceTaskMenuId = "FFD221D7-AE05-447F-8727-80058A04F402"; public const string IFLogListMenuId = "FFD221D7-AE05-447F-8727-80058A04F404"; + /// + /// 专项安全培训 id + /// + public static string SpecialSafeTrainId = "0e7fdf78-eaa0-4d00-a60b-490040bbea18"; #endregion #region 数据同步状态 diff --git a/SGGL/BLL/HSSE/Technique/AwardStandardsService.cs b/SGGL/BLL/HSSE/Technique/AwardStandardsService.cs new file mode 100644 index 0000000..fc19e82 --- /dev/null +++ b/SGGL/BLL/HSSE/Technique/AwardStandardsService.cs @@ -0,0 +1,182 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +namespace BLL; + +public class AwardStandardsService +{ + public static Model.SGGLDB db = Funs.DB; + + /// + /// 根据主键获取 + /// + /// + /// + public static Model.Technique_AwardStandards GetAwardStandardsListById(string AwardStandardsId) + { + return Funs.DB.Technique_AwardStandards.FirstOrDefault(e => + e.AwardStandardsId == AwardStandardsId); + } + + /// + /// 获取集合 + /// + /// + /// + public static List GetAwardStandardsList(int PageNumber, int PageSize) + { + List getDataLists = (from x in Funs.DB.Technique_AwardStandards + select new AwardStandardsItem + { + AwardStandardsId = x.AwardStandardsId, + AwardStandardsCode = x.AwardStandardsCode, + AwardStandardsName = x.AwardStandardsName, + AttachUrl = x.AttachUrl, + CompileMan = x.CompileMan, + CompileDate = x.CompileDate, + IsPass = x.IsPass, + UpState = x.UpState, + Remark = x.Remark + }).ToList(); + if (PageNumber > 0 && PageSize > 0) + { + getDataLists = getDataLists.Skip((PageNumber - 1) * PageSize).Take(PageSize).ToList(); + } + + return getDataLists; + } + + /// + /// 添加 + /// + /// + public static void AddAwardStandardsList(Model.Technique_AwardStandards AwardStandardsList) + { + Model.SGGLDB db = Funs.DB; + Model.Technique_AwardStandards newAwardStandardsList = new Model.Technique_AwardStandards + { + AwardStandardsId = AwardStandardsList.AwardStandardsId, + AwardStandardsCode = AwardStandardsList.AwardStandardsCode, + AwardStandardsName = AwardStandardsList.AwardStandardsName, + AttachUrl = AwardStandardsList.AttachUrl, + CompileMan = AwardStandardsList.CompileMan, + CompileDate = AwardStandardsList.CompileDate, + }; + newAwardStandardsList.CompileMan = AwardStandardsList.CompileMan; + newAwardStandardsList.CompileDate = AwardStandardsList.CompileDate; + newAwardStandardsList.IsPass = AwardStandardsList.IsPass; + newAwardStandardsList.UpState = AwardStandardsList.UpState; + newAwardStandardsList.Remark = AwardStandardsList.Remark; + db.Technique_AwardStandards.InsertOnSubmit(newAwardStandardsList); + db.SubmitChanges(); + } + + /// + /// 修改 + /// + /// + public static void UpdateAwardStandardsList(Model.Technique_AwardStandards AwardStandardsList) + { + Model.SGGLDB db = Funs.DB; + Model.Technique_AwardStandards newAwardStandardsList = + db.Technique_AwardStandards.FirstOrDefault(e => + e.AwardStandardsId == AwardStandardsList.AwardStandardsId); + if (newAwardStandardsList != null) + { + newAwardStandardsList.AwardStandardsCode = AwardStandardsList.AwardStandardsCode; + newAwardStandardsList.AwardStandardsName = AwardStandardsList.AwardStandardsName; + newAwardStandardsList.AttachUrl = AwardStandardsList.AttachUrl; + newAwardStandardsList.CompileMan = AwardStandardsList.CompileMan; + newAwardStandardsList.CompileDate = AwardStandardsList.CompileDate; + newAwardStandardsList.UpState = AwardStandardsList.UpState; + newAwardStandardsList.Remark = AwardStandardsList.Remark; + db.SubmitChanges(); + } + } + + + /// + ///根据主键删除 + /// + /// + public static void DeleteAwardStandardsListById(string AwardStandardsId) + { + Model.SGGLDB db = Funs.DB; + Model.Technique_AwardStandards AwardStandardsList = + db.Technique_AwardStandards.FirstOrDefault(e => e.AwardStandardsId == AwardStandardsId); + if (AwardStandardsList != null) + { + if (!string.IsNullOrEmpty(AwardStandardsList.AttachUrl)) + { + BLL.UploadFileService.DeleteFile(Funs.RootPath, AwardStandardsList.AttachUrl); + } + + ////删除附件表 + BLL.CommonService.DeleteAttachFileById(AwardStandardsList.AwardStandardsId); + + db.Technique_AwardStandards.DeleteOnSubmit(AwardStandardsList); + db.SubmitChanges(); + } + } + + public class AwardStandardsItem + { + + public string AwardStandardsId + { + get; + set; + } + + public string AwardStandardsCode + { + get; + set; + } + + public string AwardStandardsName + { + get; + set; + } + + public string AttachUrl + { + get; + set; + } + + public string CompileMan + { + get; + set; + } + + public System.Nullable CompileDate + { + get; + set; + } + + public System.Nullable IsPass + { + get; + set; + } + + public string UpState + { + get; + set; + } + + public string Remark + { + get; + set; + } + + } + +} \ No newline at end of file diff --git a/SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs b/SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs new file mode 100644 index 0000000..001c5b3 --- /dev/null +++ b/SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs @@ -0,0 +1,181 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +namespace BLL; + +public class ConstructionStandardsService +{ + public static Model.SGGLDB db = Funs.DB; + + /// + /// 根据主键获取 + /// + /// + /// + public static Model.Technique_ConstructionStandards GetConstructionStandardsListById(string ConstructionStandardsId) + { + return Funs.DB.Technique_ConstructionStandards.FirstOrDefault(e => + e.ConstructionStandardsId == ConstructionStandardsId); + } + + /// + /// 获取集合 + /// + /// + /// + public static List GetConstructionStandardsList(int PageNumber, int PageSize) + { + List getDataLists = (from x in Funs.DB.Technique_ConstructionStandards + select new ConstructionStandardsItem + { + ConstructionStandardsId = x.ConstructionStandardsId, + ConstructionStandardsCode = x.ConstructionStandardsCode, + ConstructionStandardsName = x.ConstructionStandardsName, + AttachUrl = x.AttachUrl, + CompileMan = x.CompileMan, + CompileDate = x.CompileDate, + IsPass = x.IsPass, + UpState = x.UpState, + Remark = x.Remark + }).ToList(); + if (PageNumber > 0 && PageSize > 0) + { + getDataLists = getDataLists.Skip((PageNumber - 1) * PageSize).Take(PageSize).ToList(); + } + return getDataLists; + } + + /// + /// 添加 + /// + /// + public static void AddConstructionStandardsList(Model.Technique_ConstructionStandards ConstructionStandardsList) + { + Model.SGGLDB db = Funs.DB; + Model.Technique_ConstructionStandards newConstructionStandardsList = new Model.Technique_ConstructionStandards + { + ConstructionStandardsId = ConstructionStandardsList.ConstructionStandardsId, + ConstructionStandardsCode = ConstructionStandardsList.ConstructionStandardsCode, + ConstructionStandardsName = ConstructionStandardsList.ConstructionStandardsName, + AttachUrl = ConstructionStandardsList.AttachUrl, + CompileMan = ConstructionStandardsList.CompileMan, + CompileDate = ConstructionStandardsList.CompileDate, + }; + newConstructionStandardsList.CompileMan = ConstructionStandardsList.CompileMan; + newConstructionStandardsList.CompileDate = ConstructionStandardsList.CompileDate; + newConstructionStandardsList.IsPass = ConstructionStandardsList.IsPass; + newConstructionStandardsList.UpState = ConstructionStandardsList.UpState; + newConstructionStandardsList.Remark = ConstructionStandardsList.Remark; + db.Technique_ConstructionStandards.InsertOnSubmit(newConstructionStandardsList); + db.SubmitChanges(); + } + + /// + /// 修改 + /// + /// + public static void UpdateConstructionStandardsList(Model.Technique_ConstructionStandards ConstructionStandardsList) + { + Model.SGGLDB db = Funs.DB; + Model.Technique_ConstructionStandards newConstructionStandardsList = + db.Technique_ConstructionStandards.FirstOrDefault(e => + e.ConstructionStandardsId == ConstructionStandardsList.ConstructionStandardsId); + if (newConstructionStandardsList != null) + { + newConstructionStandardsList.ConstructionStandardsCode = ConstructionStandardsList.ConstructionStandardsCode; + newConstructionStandardsList.ConstructionStandardsName = ConstructionStandardsList.ConstructionStandardsName; + newConstructionStandardsList.AttachUrl = ConstructionStandardsList.AttachUrl; + newConstructionStandardsList.CompileMan = ConstructionStandardsList.CompileMan; + newConstructionStandardsList.CompileDate = ConstructionStandardsList.CompileDate; + newConstructionStandardsList.UpState = ConstructionStandardsList.UpState; + newConstructionStandardsList.Remark = ConstructionStandardsList.Remark; + db.SubmitChanges(); + } + } + + + + /// + ///根据主键删除 + /// + /// + public static void DeleteConstructionStandardsListById(string ConstructionStandardsId) + { + Model.SGGLDB db = Funs.DB; + Model.Technique_ConstructionStandards ConstructionStandardsList = + db.Technique_ConstructionStandards.FirstOrDefault(e => e.ConstructionStandardsId == ConstructionStandardsId); + if (ConstructionStandardsList != null) + { + if (!string.IsNullOrEmpty(ConstructionStandardsList.AttachUrl)) + { + BLL.UploadFileService.DeleteFile(Funs.RootPath, ConstructionStandardsList.AttachUrl); + } + + ////删除附件表 + BLL.CommonService.DeleteAttachFileById(ConstructionStandardsList.ConstructionStandardsId); + + db.Technique_ConstructionStandards.DeleteOnSubmit(ConstructionStandardsList); + db.SubmitChanges(); + } + } + public class ConstructionStandardsItem + { + + public string ConstructionStandardsId + { + get; + set; + } + + public string ConstructionStandardsCode + { + get; + set; + } + + public string ConstructionStandardsName + { + get; + set; + } + + public string AttachUrl + { + get; + set; + } + + public string CompileMan + { + get; + set; + } + + public System.Nullable CompileDate + { + get; + set; + } + + public System.Nullable IsPass + { + get; + set; + } + + public string UpState + { + get; + set; + } + + public string Remark + { + get; + set; + } + + } + +} \ No newline at end of file diff --git a/SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs b/SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs new file mode 100644 index 0000000..6c48948 --- /dev/null +++ b/SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs @@ -0,0 +1,184 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Model; + +namespace BLL; + +public class ProtectionStandardsService +{ + public static Model.SGGLDB db = Funs.DB; + + /// + /// 根据主键获取 + /// + /// + /// + public static Model.Technique_ProtectionStandards GetProtectionStandardsListById(string ProtectionStandardsId) + { + return Funs.DB.Technique_ProtectionStandards.FirstOrDefault(e => + e.ProtectionStandardsId == ProtectionStandardsId); + } + + /// + /// 获取集合 + /// + /// + /// + public static List GetProtectionStandardsList(int PageNumber, int PageSize) + { + List getDataLists = (from x in Funs.DB.Technique_ProtectionStandards + select new ProtectionStandardsItem + { + ProtectionStandardsId = x.ProtectionStandardsId, + ProtectionStandardsCode = x.ProtectionStandardsCode, + ProtectionStandardsName = x.ProtectionStandardsName, + AttachUrl = x.AttachUrl, + CompileMan = x.CompileMan, + CompileDate = x.CompileDate, + IsPass = x.IsPass, + UpState = x.UpState, + Remark = x.Remark + }).ToList(); + if (PageNumber > 0 && PageSize > 0) + { + getDataLists = getDataLists.Skip((PageNumber - 1) * PageSize).Take(PageSize).ToList(); + } + return getDataLists; + } + + /// + /// 添加 + /// + /// + public static void AddProtectionStandardsList(Model.Technique_ProtectionStandards ProtectionStandardsList) + { + Model.SGGLDB db = Funs.DB; + Model.Technique_ProtectionStandards newProtectionStandardsList = new Model.Technique_ProtectionStandards + { + ProtectionStandardsId = ProtectionStandardsList.ProtectionStandardsId, + ProtectionStandardsCode = ProtectionStandardsList.ProtectionStandardsCode, + ProtectionStandardsName = ProtectionStandardsList.ProtectionStandardsName, + AttachUrl = ProtectionStandardsList.AttachUrl, + CompileMan = ProtectionStandardsList.CompileMan, + CompileDate = ProtectionStandardsList.CompileDate, + }; + newProtectionStandardsList.CompileMan = ProtectionStandardsList.CompileMan; + newProtectionStandardsList.CompileDate = ProtectionStandardsList.CompileDate; + newProtectionStandardsList.IsPass = ProtectionStandardsList.IsPass; + newProtectionStandardsList.UpState = ProtectionStandardsList.UpState; + newProtectionStandardsList.Remark = ProtectionStandardsList.Remark; + db.Technique_ProtectionStandards.InsertOnSubmit(newProtectionStandardsList); + db.SubmitChanges(); + } + + /// + /// 修改 + /// + /// + public static void UpdateProtectionStandardsList(Model.Technique_ProtectionStandards ProtectionStandardsList) + { + Model.SGGLDB db = Funs.DB; + Model.Technique_ProtectionStandards newProtectionStandardsList = + db.Technique_ProtectionStandards.FirstOrDefault(e => + e.ProtectionStandardsId == ProtectionStandardsList.ProtectionStandardsId); + if (newProtectionStandardsList != null) + { + newProtectionStandardsList.ProtectionStandardsCode = ProtectionStandardsList.ProtectionStandardsCode; + newProtectionStandardsList.ProtectionStandardsName = ProtectionStandardsList.ProtectionStandardsName; + newProtectionStandardsList.AttachUrl = ProtectionStandardsList.AttachUrl; + newProtectionStandardsList.CompileMan = ProtectionStandardsList.CompileMan; + newProtectionStandardsList.CompileDate = ProtectionStandardsList.CompileDate; + newProtectionStandardsList.UpState = ProtectionStandardsList.UpState; + newProtectionStandardsList.Remark = ProtectionStandardsList.Remark; + db.SubmitChanges(); + } + } + + + /// + ///根据主键删除 + /// + /// + public static void DeleteProtectionStandardsListById(string ProtectionStandardsId) + { + Model.SGGLDB db = Funs.DB; + Model.Technique_ProtectionStandards ProtectionStandardsList = + db.Technique_ProtectionStandards.FirstOrDefault(e => e.ProtectionStandardsId == ProtectionStandardsId); + if (ProtectionStandardsList != null) + { + if (!string.IsNullOrEmpty(ProtectionStandardsList.AttachUrl)) + { + BLL.UploadFileService.DeleteFile(Funs.RootPath, ProtectionStandardsList.AttachUrl); + } + + ////删除附件表 + BLL.CommonService.DeleteAttachFileById(ProtectionStandardsList.ProtectionStandardsId); + + db.Technique_ProtectionStandards.DeleteOnSubmit(ProtectionStandardsList); + db.SubmitChanges(); + } + } + + + public class ProtectionStandardsItem + { + + public string ProtectionStandardsId + { + get; + set; + } + + public string ProtectionStandardsCode + { + get; + set; + } + + public string ProtectionStandardsName + { + get; + set; + } + + public string AttachUrl + { + get; + set; + } + + public string CompileMan + { + get; + set; + } + + public System.Nullable CompileDate + { + get; + set; + } + + public System.Nullable IsPass + { + get; + set; + } + + public string UpState + { + get; + set; + } + + public string Remark + { + get; + set; + } + + } + +} \ No newline at end of file diff --git a/SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs b/SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs new file mode 100644 index 0000000..5fb65b5 --- /dev/null +++ b/SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs @@ -0,0 +1,182 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +namespace BLL; + +public class SafetyResponsibilitiesService +{ + public static Model.SGGLDB db = Funs.DB; + + /// + /// 根据主键 + /// + /// + /// + public static Model.Technique_SafetyResponsibilities GetSafetyResponsibilitiesListById(string SafetyResponsibilitiesId) + { + return Funs.DB.Technique_SafetyResponsibilities.FirstOrDefault(e => + e.SafetyResponsibilitiesId == SafetyResponsibilitiesId); + } + + /// + /// 获取集合 + /// + /// + /// + public static List GetSafetyResponsibilitiesList(int PageNumber, int PageSize) + { + List getDataLists = (from x in Funs.DB.Technique_SafetyResponsibilities + select new SafetyResponsibilitiesItem + { + SafetyResponsibilitiesId = x.SafetyResponsibilitiesId, + SafetyResponsibilitiesCode = x.SafetyResponsibilitiesCode, + SafetyResponsibilitiesName = x.SafetyResponsibilitiesName, + AttachUrl = x.AttachUrl, + CompileMan = x.CompileMan, + CompileDate = x.CompileDate, + IsPass = x.IsPass, + UpState = x.UpState, + Remark = x.Remark + }).ToList(); + if (PageNumber > 0 && PageSize > 0) + { + getDataLists = getDataLists.Skip((PageNumber - 1) * PageSize).Take(PageSize).ToList(); + } + return getDataLists; + } + + /// + /// 添加专项方案 + /// + /// + public static void AddSafetyResponsibilitiesList(Model.Technique_SafetyResponsibilities SafetyResponsibilitiesList) + { + Model.SGGLDB db = Funs.DB; + Model.Technique_SafetyResponsibilities newSafetyResponsibilitiesList = new Model.Technique_SafetyResponsibilities + { + SafetyResponsibilitiesId = SafetyResponsibilitiesList.SafetyResponsibilitiesId, + SafetyResponsibilitiesCode = SafetyResponsibilitiesList.SafetyResponsibilitiesCode, + SafetyResponsibilitiesName = SafetyResponsibilitiesList.SafetyResponsibilitiesName, + AttachUrl = SafetyResponsibilitiesList.AttachUrl, + CompileMan = SafetyResponsibilitiesList.CompileMan, + CompileDate = SafetyResponsibilitiesList.CompileDate, + }; + newSafetyResponsibilitiesList.CompileMan = SafetyResponsibilitiesList.CompileMan; + newSafetyResponsibilitiesList.CompileDate = SafetyResponsibilitiesList.CompileDate; + newSafetyResponsibilitiesList.IsPass = SafetyResponsibilitiesList.IsPass; + newSafetyResponsibilitiesList.UpState = SafetyResponsibilitiesList.UpState; + newSafetyResponsibilitiesList.Remark = SafetyResponsibilitiesList.Remark; + db.Technique_SafetyResponsibilities.InsertOnSubmit(newSafetyResponsibilitiesList); + db.SubmitChanges(); + } + + /// + /// 修改 + /// + /// + public static void UpdateSafetyResponsibilitiesList(Model.Technique_SafetyResponsibilities SafetyResponsibilitiesList) + { + Model.SGGLDB db = Funs.DB; + Model.Technique_SafetyResponsibilities newSafetyResponsibilitiesList = + db.Technique_SafetyResponsibilities.FirstOrDefault(e => + e.SafetyResponsibilitiesId == SafetyResponsibilitiesList.SafetyResponsibilitiesId); + if (newSafetyResponsibilitiesList != null) + { + newSafetyResponsibilitiesList.SafetyResponsibilitiesCode = SafetyResponsibilitiesList.SafetyResponsibilitiesCode; + newSafetyResponsibilitiesList.SafetyResponsibilitiesName = SafetyResponsibilitiesList.SafetyResponsibilitiesName; + newSafetyResponsibilitiesList.AttachUrl = SafetyResponsibilitiesList.AttachUrl; + newSafetyResponsibilitiesList.CompileMan = SafetyResponsibilitiesList.CompileMan; + newSafetyResponsibilitiesList.CompileDate = SafetyResponsibilitiesList.CompileDate; + newSafetyResponsibilitiesList.UpState = SafetyResponsibilitiesList.UpState; + newSafetyResponsibilitiesList.Remark = SafetyResponsibilitiesList.Remark; + db.SubmitChanges(); + } + } + + + + /// + ///根据主键删 + /// + /// + public static void DeleteSafetyResponsibilitiesListById(string SafetyResponsibilitiesId) + { + Model.SGGLDB db = Funs.DB; + Model.Technique_SafetyResponsibilities SafetyResponsibilitiesList = + db.Technique_SafetyResponsibilities.FirstOrDefault(e => e.SafetyResponsibilitiesId == SafetyResponsibilitiesId); + if (SafetyResponsibilitiesList != null) + { + if (!string.IsNullOrEmpty(SafetyResponsibilitiesList.AttachUrl)) + { + BLL.UploadFileService.DeleteFile(Funs.RootPath, SafetyResponsibilitiesList.AttachUrl); + } + + ////删除附件表 + BLL.CommonService.DeleteAttachFileById(SafetyResponsibilitiesList.SafetyResponsibilitiesId); + + db.Technique_SafetyResponsibilities.DeleteOnSubmit(SafetyResponsibilitiesList); + db.SubmitChanges(); + } + } + + public class SafetyResponsibilitiesItem + { + + public string SafetyResponsibilitiesId + { + get; + set; + } + + public string SafetyResponsibilitiesCode + { + get; + set; + } + + public string SafetyResponsibilitiesName + { + get; + set; + } + + public string AttachUrl + { + get; + set; + } + + public string CompileMan + { + get; + set; + } + + public System.Nullable CompileDate + { + get; + set; + } + + public System.Nullable IsPass + { + get; + set; + } + + public string UpState + { + get; + set; + } + + public string Remark + { + get; + set; + } + + } + +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx index 82cb308..55e1f44 100644 --- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx @@ -175,7 +175,7 @@ Schedule manage - 进度管理 + 工程管理 Choice language diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx index 79978a1..49eb719 100644 --- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx @@ -160,7 +160,7 @@ 刷新本页 - 进度管理 + 工程管理 选择语言 diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx index 9b48139..63324e0 100644 --- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx @@ -160,7 +160,7 @@ 刷新本页 - 进度管理 + 工程管理 选择语言 diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 196121a..836b105 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1877,6 +1877,7 @@ + @@ -2291,11 +2292,15 @@ + + + + @@ -2309,10 +2314,14 @@ + + + + @@ -12749,6 +12758,10 @@ TaskNoticeEdit.aspx + + ASPXCodeBehind + + TrainTestRecordEdit.aspx ASPXCodeBehind @@ -15647,6 +15660,20 @@ SolutionTemplateView.aspx + + AwardStandards.aspx + ASPXCodeBehind + + + AwardStandards.aspx + + + AwardStandardsEdit.aspx + ASPXCodeBehind + + + AwardStandardsEdit.aspx + CheckItemDetailEdit.aspx ASPXCodeBehind @@ -15682,6 +15709,20 @@ CompanyHazardList.aspx + + ConstructionStandards.aspx + ASPXCodeBehind + + + ConstructionStandards.aspx + + + ConstructionStandardsEdit.aspx + ASPXCodeBehind + + + ConstructionStandardsEdit.aspx + Emergency.aspx ASPXCodeBehind @@ -15773,6 +15814,20 @@ HazardListTypeEdit.aspx + + ProtectionStandards.aspx + ASPXCodeBehind + + + ProtectionStandards.aspx + + + ProtectionStandardsEdit.aspx + ASPXCodeBehind + + + ProtectionStandardsEdit.aspx + Rectify.aspx ASPXCodeBehind @@ -15801,6 +15856,20 @@ RectifySelectCloumn.aspx + + SafetyResponsibilities.aspx + ASPXCodeBehind + + + SafetyResponsibilities.aspx + + + SafetyResponsibilitiesEdit.aspx + ASPXCodeBehind + + + SafetyResponsibilitiesEdit.aspx + SpecialScheme.aspx ASPXCodeBehind @@ -19589,7 +19658,7 @@ - +