From 13364fcbf77d4ed3656371e51714e12842c74ff4 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Mon, 16 Mar 2026 14:38:56 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=BD=A6=E8=BE=86=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=AE=A1=E7=90=86=EF=BC=8C=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86=EF=BC=9A=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E9=80=80=E5=9C=BA=E5=92=8C=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9B=202=E3=80=81=E5=8D=B1=E5=A4=A7?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E6=96=B9=E6=A1=88=E8=B0=83=E6=95=B4=203?= =?UTF-8?q?=E3=80=81=E4=BC=81=E4=B8=9A=E5=AE=89=E5=85=A8=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E8=B0=83=E6=95=B4=204=E3=80=81=E5=AE=89=E5=85=A8=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SUBQHSE_V2026-03-11-xiaj.sql | 156 ++++- SGGL/BLL/BLL.csproj | 1 + SGGL/BLL/BaseInfo/ActivityTypeService.cs | 96 +++ .../Comprehensive/MajorPlanApprovalService.cs | 2 + SGGL/BLL/Common/Const.cs | 14 + .../HSSE/Administrative/CarManagerService.cs | 6 +- .../PromotionalActivitiesService.cs | 4 +- SGGL/BLL/HSSE/Solution/LargerHazardService.cs | 6 +- SGGL/BLL/SysManage/UserService.cs | 34 + .../BLL/ZHGL/DataSync/HSSEData_HSSEService.cs | 70 +- .../Project_HSSEData_HSSEService.cs | 138 +++- SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx | 159 +++++ .../BaseInfo/ActivityType.aspx.cs | 277 ++++++++ .../BaseInfo/ActivityType.aspx.designer.cs | 197 ++++++ .../Excel/DataIn/专项检查明细导入模板.xls | Bin 19456 -> 19456 bytes .../Excel/DataIn/企业大检查明细导入模板.xls | Bin 0 -> 18944 bytes .../Excel/DataIn/现场车辆管理导入模板.xls | Bin 0 -> 18432 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 24 + .../HSSE/Administrative/CarManager.aspx | 213 ++++--- .../HSSE/Administrative/CarManager.aspx.cs | 80 ++- .../CarManager.aspx.designer.cs | 80 ++- .../HSSE/Administrative/CarManagerEdit.aspx | 9 + .../Administrative/CarManagerEdit.aspx.cs | 6 + .../CarManagerEdit.aspx.designer.cs | 57 +- .../HSSE/Administrative/CarManagerIn.aspx | 80 +++ .../HSSE/Administrative/CarManagerIn.aspx.cs | 520 +++++++++++++++ .../CarManagerIn.aspx.designer.cs | 143 +++++ .../HSSE/Administrative/CarManagerView.aspx | 8 + .../Administrative/CarManagerView.aspx.cs | 7 +- .../CarManagerView.aspx.designer.cs | 53 +- .../PromotionalActivities.aspx | 11 +- .../PromotionalActivities.aspx.cs | 20 +- .../PromotionalActivities.aspx.designer.cs | 57 +- .../PromotionalActivitiesEdit.aspx | 8 +- .../PromotionalActivitiesEdit.aspx.cs | 10 + ...PromotionalActivitiesEdit.aspx.designer.cs | 55 +- .../PromotionalActivitiesView.aspx | 8 +- .../PromotionalActivitiesView.aspx.cs | 10 +- ...PromotionalActivitiesView.aspx.designer.cs | 51 +- .../HSSE/Solution/LargerHazardEdit.aspx | 22 +- .../HSSE/Solution/LargerHazardEdit.aspx.cs | 4 +- .../LargerHazardEdit.aspx.designer.cs | 36 +- .../HSSE/Solution/LargerHazardList.aspx | 6 +- .../HSSE/Solution/LargerHazardList.aspx.cs | 6 +- .../HSSE/Solution/LargerHazardView.aspx | 426 +++++++------ .../HSSE/Solution/LargerHazardView.aspx.cs | 9 +- .../LargerHazardView.aspx.designer.cs | 27 + .../ZHGL/Supervise/UnitHazardRegister.aspx | 29 +- .../ZHGL/Supervise/UnitHazardRegister.aspx.cs | 3 +- .../Supervise/UnitHazardRegisterDetailIn.aspx | 80 +++ .../UnitHazardRegisterDetailIn.aspx.cs | 450 +++++++++++++ ...nitHazardRegisterDetailIn.aspx.designer.cs | 143 +++++ .../Supervise/UnitHazardRegisterEdit.aspx | 21 +- .../Supervise/UnitHazardRegisterEdit.aspx.cs | 301 ++++++--- .../UnitHazardRegisterEdit.aspx.designer.cs | 27 + .../Supervise/UnitHazardRegisterRecord.aspx | 4 +- .../UnitHazardRegisterRecordEdit.aspx | 24 +- .../UnitHazardRegisterRecordEdit.aspx.cs | 3 +- ...tHazardRegisterRecordEdit.aspx.designer.cs | 54 +- SGGL/FineUIPro.Web/common/Menu_CQMS.xml | 3 +- SGGL/FineUIPro.Web/common/Menu_HSSE.xml | 8 +- SGGL/FineUIPro.Web/common/Menu_SysSet.xml | 1 + SGGL/FineUIPro.Web/common/Menu_ZHGL.xml | 6 +- SGGL/Model/Model.cs | 598 ++++++++++++++++-- SGGL/Model/ZHGL/DataSync/HSSEDataItem.cs | 10 +- .../ZHGL/DataSync/LargeEngineeringOutput.cs | 24 + SGGL/Model/ZHGL/UnitHazardRegisterInput.cs | 5 + SGGL/Model/ZHGL/UnitHazardRegisterOutput.cs | 13 +- .../PublishProfiles/FolderProfile.pubxml.user | 24 +- 69 files changed, 4291 insertions(+), 746 deletions(-) create mode 100644 SGGL/BLL/BaseInfo/ActivityTypeService.cs create mode 100644 SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx create mode 100644 SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx.cs create mode 100644 SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/企业大检查明细导入模板.xls create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/现场车辆管理导入模板.xls create mode 100644 SGGL/FineUIPro.Web/HSSE/Administrative/CarManagerIn.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/Administrative/CarManagerIn.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/Administrative/CarManagerIn.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegisterDetailIn.aspx create mode 100644 SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegisterDetailIn.aspx.cs create mode 100644 SGGL/FineUIPro.Web/ZHGL/Supervise/UnitHazardRegisterDetailIn.aspx.designer.cs diff --git a/DataBase/版本日志/SUBQHSE_V2026-03-11-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2026-03-11-xiaj.sql index df77bc43..2a6ab548 100644 --- a/DataBase/版本日志/SUBQHSE_V2026-03-11-xiaj.sql +++ b/DataBase/版本日志/SUBQHSE_V2026-03-11-xiaj.sql @@ -1,5 +1,11 @@ - +--ֳֶΡ״̬ +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Administrative_CarManager' AND COLUMN_NAME = 'InOutState') +BEGIN + ALTER TABLE Administrative_CarManager ADD InOutState char(1); + EXEC sp_addextendedproperty 'MS_Description', N'״̬(0˳1ڳ)','SCHEMA', N'dbo','TABLE', N'Administrative_CarManager','COLUMN', N'InOutState' +END +GO IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'HSSEData_HSSE' AND COLUMN_NAME = 'LargerClosedNum') @@ -21,3 +27,151 @@ END GO + + +update Sys_Menu +set MenuName='ȫ',SortIndex=115 +where MenuName='Ϣ' and MenuId='66DFD649-FBC2-463F-BD1A-04095D713C8E' +GO + + +update Sys_Menu +set SortIndex=05 +where MenuId='16092FE7-938B-4713-8084-4FBFA030F386' +GO + + + +--ȫ +IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '79116536-BE80-4323-A46F-10222601D5B5') +BEGIN +INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed) +VALUES (N'79116536-BE80-4323-A46F-10222601D5B5', N'', N'BaseInfo/ActivityType.aspx', 150, '8A2CEE72-2793-49C6-9E2E-E83B2676E2DD', 'Menu_SysSet', 1,1, 1); +END +-- +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '79116536-BE80-4323-A46F-10222601D5B5') +BEGIN +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'475413A5-7551-4732-9603-6C8EAE5D69F5', N'79116536-BE80-4323-A46F-10222601D5B5', N'', 1); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'A8E7C65C-4BAC-48EC-B577-8626091334F2', N'79116536-BE80-4323-A46F-10222601D5B5', N'޸', 2); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'1CFD4BA8-3808-4CF0-8343-DA94457A5E7E', N'79116536-BE80-4323-A46F-10222601D5B5', N'ɾ', 3); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'CE1C1EFF-86A6-4DA5-85E0-3F1FC6A80821', N'79116536-BE80-4323-A46F-10222601D5B5', N'', 4); +END +GO + + + + +--ȫ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Base_ActivityType') AND type = N'U') +BEGIN +CREATE TABLE [dbo].[Base_ActivityType]( + [ActivityTypeId] [nvarchar](50) NOT NULL, + [ActivityTypeCode] [nvarchar](50) NULL, + [ActivityTypeName] [nvarchar](50) NULL, + [Remark] [nvarchar](500) NULL, + CONSTRAINT [PK_Base_ActivityType] PRIMARY KEY CLUSTERED +( + [ActivityTypeId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ActivityType', @level2type=N'COLUMN',@level2name=N'ActivityTypeId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ActivityType', @level2type=N'COLUMN',@level2name=N'ActivityTypeCode' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ActivityType', @level2type=N'COLUMN',@level2name=N'ActivityTypeName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ActivityType', @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'Base_ActivityType' +END + +GO + +--ʼȫ +IF NOT EXISTS (SELECT * FROM Base_ActivityType WHERE ActivityTypeId = 'b8fc5fc8-7a40-4f0b-acf3-cee5f79322ed') +BEGIN +INSERT [dbo].[Base_ActivityType] ([ActivityTypeId], [ActivityTypeCode], [ActivityTypeName], [Remark]) +VALUES (N'b8fc5fc8-7a40-4f0b-acf3-cee5f79322ed', N'001', N'', N'') +INSERT [dbo].[Base_ActivityType] ([ActivityTypeId], [ActivityTypeCode], [ActivityTypeName], [Remark]) +VALUES (N'734ab4ff-5ec0-4ee2-bafa-b46b984f57ba', N'002', N'ȫ»', N'') +INSERT [dbo].[Base_ActivityType] ([ActivityTypeId], [ActivityTypeCode], [ActivityTypeName], [Remark]) +VALUES (N'e00606a2-977f-40f7-9e13-5cb049927cae', N'003', N'ж', N'') +END +GO + + + + +--ȫid +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'InformationProject_PromotionalActivities' AND COLUMN_NAME = 'ActivityTypeId') +BEGIN + ALTER TABLE InformationProject_PromotionalActivities ADD ActivityTypeId nvarchar(50); + EXEC sp_addextendedproperty 'MS_Description', N'ȫ','SCHEMA', N'dbo','TABLE', N'InformationProject_PromotionalActivities','COLUMN', N'ActivityTypeId'; +END +GO + + +--Σ󹤳̷ֶΡ״̬ 0ˡ1С2ɡ +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Solution_LargerHazard' AND COLUMN_NAME = 'ApprovalState') +BEGIN + ALTER TABLE Solution_LargerHazard ADD ApprovalState char(1); + EXEC sp_addextendedproperty 'MS_Description', N'״̬(0ˡ1С2)','SCHEMA', N'dbo','TABLE', N'Solution_LargerHazard','COLUMN', N'ApprovalState' +END +GO + + +--Σ󹤳̷ʷݡ״̬߼ +--ҵ״̬Ϊδʼ״̬ĬΪˣҵ״̬Ϊҵк깤״̬ĬΪ +--update Solution_LargerHazard set ApprovalState='0' where ApprovalState is null and States = '1' +--GO +update Solution_LargerHazard set ApprovalState='2' where ApprovalState is null and States <>'0' +GO + + +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'HSSEData_HSSE' AND COLUMN_NAME = 'AwaitApprovalNum') +BEGIN + ALTER TABLE HSSEData_HSSE ADD AwaitApprovalNum int; + ALTER TABLE HSSEData_HSSE ADD PendingApprovalNum int; + ALTER TABLE HSSEData_HSSE ADD CompletedApprovalNum int; + ALTER TABLE HSSEData_HSSE ADD SuperAwaitApprovalNum int; + ALTER TABLE HSSEData_HSSE ADD SuperPendingApprovalNum int; + ALTER TABLE HSSEData_HSSE ADD SuperCompletedApprovalNum int; + EXEC sp_addextendedproperty 'MS_Description', N'Σ󹤳̴˸','SCHEMA', N'dbo','TABLE', N'HSSEData_HSSE','COLUMN', N'AwaitApprovalNum'; + EXEC sp_addextendedproperty 'MS_Description', N'Σ󹤳и','SCHEMA', N'dbo','TABLE', N'HSSEData_HSSE','COLUMN', N'PendingApprovalNum'; + EXEC sp_addextendedproperty 'MS_Description', N'Σ󹤳ɸ','SCHEMA', N'dbo','TABLE', N'HSSEData_HSSE','COLUMN', N'CompletedApprovalNum'; + EXEC sp_addextendedproperty 'MS_Description', N'Σ󹤳̴˸','SCHEMA', N'dbo','TABLE', N'HSSEData_HSSE','COLUMN', N'SuperAwaitApprovalNum'; + EXEC sp_addextendedproperty 'MS_Description', N'Σ󹤳и','SCHEMA', N'dbo','TABLE', N'HSSEData_HSSE','COLUMN', N'SuperPendingApprovalNum'; + EXEC sp_addextendedproperty 'MS_Description', N'Σ󹤳ɸ','SCHEMA', N'dbo','TABLE', N'HSSEData_HSSE','COLUMN', N'SuperCompletedApprovalNum'; +END +GO + +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Project_HSSEData_HSSE' AND COLUMN_NAME = 'AwaitApprovalNum') +BEGIN + ALTER TABLE Project_HSSEData_HSSE ADD AwaitApprovalNum int; + ALTER TABLE Project_HSSEData_HSSE ADD PendingApprovalNum int; + ALTER TABLE Project_HSSEData_HSSE ADD CompletedApprovalNum int; + ALTER TABLE Project_HSSEData_HSSE ADD SuperAwaitApprovalNum int; + ALTER TABLE Project_HSSEData_HSSE ADD SuperPendingApprovalNum int; + ALTER TABLE Project_HSSEData_HSSE ADD SuperCompletedApprovalNum int; + EXEC sp_addextendedproperty 'MS_Description', N'Σ󹤳̴˸','SCHEMA', N'dbo','TABLE', N'Project_HSSEData_HSSE','COLUMN', N'AwaitApprovalNum'; + EXEC sp_addextendedproperty 'MS_Description', N'Σ󹤳и','SCHEMA', N'dbo','TABLE', N'Project_HSSEData_HSSE','COLUMN', N'PendingApprovalNum'; + EXEC sp_addextendedproperty 'MS_Description', N'Σ󹤳ɸ','SCHEMA', N'dbo','TABLE', N'Project_HSSEData_HSSE','COLUMN', N'CompletedApprovalNum'; + EXEC sp_addextendedproperty 'MS_Description', N'Σ󹤳̴˸','SCHEMA', N'dbo','TABLE', N'Project_HSSEData_HSSE','COLUMN', N'SuperAwaitApprovalNum'; + EXEC sp_addextendedproperty 'MS_Description', N'Σ󹤳и','SCHEMA', N'dbo','TABLE', N'Project_HSSEData_HSSE','COLUMN', N'SuperPendingApprovalNum'; + EXEC sp_addextendedproperty 'MS_Description', N'Σ󹤳ɸ','SCHEMA', N'dbo','TABLE', N'Project_HSSEData_HSSE','COLUMN', N'SuperCompletedApprovalNum'; +END +GO + + +--ȥҵĿ +ALTER TABLE [Supervise_UnitHazardRegister] +DROP CONSTRAINT [FK_UnitHazardRegister_Project]; +GO +--ҵ鲹ֶΡ鵥λ +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Supervise_UnitHazardRegister' AND COLUMN_NAME = 'InspectionUnit') +BEGIN + ALTER TABLE Supervise_UnitHazardRegister ADD InspectionUnit nvarchar(50); + EXEC sp_addextendedproperty 'MS_Description', N'鵥λ','SCHEMA', N'dbo','TABLE', N'Supervise_UnitHazardRegister','COLUMN', N'InspectionUnit' +END +GO + diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 5edb7082..175f3343 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -132,6 +132,7 @@ + diff --git a/SGGL/BLL/BaseInfo/ActivityTypeService.cs b/SGGL/BLL/BaseInfo/ActivityTypeService.cs new file mode 100644 index 00000000..936d59bf --- /dev/null +++ b/SGGL/BLL/BaseInfo/ActivityTypeService.cs @@ -0,0 +1,96 @@ +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 活动类型 + /// + public static class ActivityTypeService + { + /// + /// 根据主键获取活动类型 + /// + /// + /// + public static Model.Base_ActivityType GetActivityTypeById(string ActivityTypeId) + { + return Funs.DB.Base_ActivityType.FirstOrDefault(e => e.ActivityTypeId == ActivityTypeId); + } + + /// + /// 添加活动类型 + /// + /// + public static void AddActivityType(Model.Base_ActivityType ActivityType) + { + Model.Base_ActivityType newActivityType = new Model.Base_ActivityType + { + ActivityTypeId = ActivityType.ActivityTypeId, + ActivityTypeCode = ActivityType.ActivityTypeCode, + ActivityTypeName = ActivityType.ActivityTypeName, + Remark = ActivityType.Remark + }; + Funs.DB.Base_ActivityType.InsertOnSubmit(newActivityType); + Funs.DB.SubmitChanges(); + } + + /// + /// 修改活动类型 + /// + /// + public static void UpdateActivityType(Model.Base_ActivityType ActivityType) + { + Model.Base_ActivityType newActivityType = Funs.DB.Base_ActivityType.FirstOrDefault(e => e.ActivityTypeId == ActivityType.ActivityTypeId); + if (newActivityType != null) + { + newActivityType.ActivityTypeCode = ActivityType.ActivityTypeCode; + newActivityType.ActivityTypeName = ActivityType.ActivityTypeName; + newActivityType.Remark = ActivityType.Remark; + Funs.DB.SubmitChanges(); + } + } + + /// + /// 根据主键删除活动类型 + /// + /// + public static void DeleteActivityTypeById(string ActivityTypeId) + { + Model.Base_ActivityType ActivityType = Funs.DB.Base_ActivityType.FirstOrDefault(e => e.ActivityTypeId == ActivityTypeId); + if (ActivityType != null) + { + Funs.DB.Base_ActivityType.DeleteOnSubmit(ActivityType); + Funs.DB.SubmitChanges(); + } + } + + /// + ///获取活动类型下拉选择项 + /// + /// + public static List GetActivityTypeList() + { + return (from x in Funs.DB.Base_ActivityType orderby x.ActivityTypeCode select x).ToList(); + } + + #region 活动类型下拉框 + /// + /// 活动类型下拉框 + /// + /// 下拉框名字 + /// 是否显示请选择 + public static void InitActivityTypeDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease) + { + dropName.DataValueField = "ActivityTypeId"; + dropName.DataTextField = "ActivityTypeName"; + dropName.DataSource = GetActivityTypeList(); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + #endregion + } +} diff --git a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs index e821fcfa..3c7dee69 100644 --- a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs @@ -225,6 +225,7 @@ namespace BLL States = majorPlanApproval.States, TrainPersonNum = majorPlanApproval.TrainPersonNum, OperativesNum = majorPlanApproval.OperativesNum, + ApprovalState = "2", IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false, }; @@ -252,6 +253,7 @@ namespace BLL newLargerHazard.States = majorPlanApproval.States; newLargerHazard.TrainPersonNum = majorPlanApproval.TrainPersonNum; newLargerHazard.OperativesNum = majorPlanApproval.OperativesNum; + newLargerHazard.ApprovalState = "2"; newLargerHazard.IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false; db.SubmitChanges(); } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 8ced9896..9fe42db7 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -1130,6 +1130,10 @@ namespace BLL /// 移交专业 /// public const string TransferMajorMenuId = "D0850615-BF32-4CFA-84CA-EEA261676EA8"; + /// + /// 活动类型 + /// + public const string ActivityTypeMenuId = "79116536-BE80-4323-A46F-10222601D5B5"; #endregion #region 质量基础信息 @@ -3197,6 +3201,11 @@ namespace BLL /// 专项检查明细导入模板 /// public const string CheckSpecialDetailTemplateUrl = "File\\Excel\\DataIn\\专项检查明细导入模板.xls"; + /// + /// 企业大检查明细导入模板 + /// + public const string UnitHazardRegisterDetailTemplateUrl = "File\\Excel\\DataIn\\企业大检查明细导入模板.xls"; + /// /// 综合检查导入模板 /// @@ -3457,6 +3466,11 @@ namespace BLL /// 资料收发文登记记录导入模板原始虚拟路径 /// public const string CQMS_DataReceivingDocTempUrl = "File\\Excel\\DataIn\\资料收发文登记记录导入模板.xls"; + /// + /// 现场车辆管理导入模板 + /// + public const string CarManagerTemplateUrl = "File\\Excel\\DataIn\\现场车辆管理导入模板.xls"; + /// /// 培训记录导入模板原始虚拟路径 diff --git a/SGGL/BLL/HSSE/Administrative/CarManagerService.cs b/SGGL/BLL/HSSE/Administrative/CarManagerService.cs index 2c5c7807..a92064cf 100644 --- a/SGGL/BLL/HSSE/Administrative/CarManagerService.cs +++ b/SGGL/BLL/HSSE/Administrative/CarManagerService.cs @@ -40,7 +40,8 @@ namespace BLL Remark = carManager.Remark, CompileMan = carManager.CompileMan, CompileDate = carManager.CompileDate, - States = carManager.States + States = carManager.States, + InOutState = carManager.InOutState, }; Funs.DB.Administrative_CarManager.InsertOnSubmit(newCarManager); Funs.DB.SubmitChanges(); @@ -66,7 +67,8 @@ namespace BLL newCarManager.Remark = carManager.Remark; newCarManager.CompileMan = carManager.CompileMan; newCarManager.CompileDate = carManager.CompileDate; - newCarManager.States = carManager.States; + newCarManager.States = carManager.States; + newCarManager.InOutState = carManager.InOutState; Funs.DB.SubmitChanges(); } } diff --git a/SGGL/BLL/HSSE/InformationProject/PromotionalActivitiesService.cs b/SGGL/BLL/HSSE/InformationProject/PromotionalActivitiesService.cs index 7edd1b4d..557fdbf2 100644 --- a/SGGL/BLL/HSSE/InformationProject/PromotionalActivitiesService.cs +++ b/SGGL/BLL/HSSE/InformationProject/PromotionalActivitiesService.cs @@ -64,7 +64,8 @@ namespace BLL AttachUrl = promotionalActivities.AttachUrl, CompileMan = promotionalActivities.CompileMan, CompileDate = System.DateTime.Now, - States = promotionalActivities.States + States = promotionalActivities.States, + ActivityTypeId = promotionalActivities.ActivityTypeId }; Funs.DB.InformationProject_PromotionalActivities.InsertOnSubmit(newPromotionalActivities); Funs.DB.SubmitChanges(); @@ -93,6 +94,7 @@ namespace BLL newPromotionalActivities.CompileMan = promotionalActivities.CompileMan; newPromotionalActivities.CompileDate = promotionalActivities.CompileDate; newPromotionalActivities.States = promotionalActivities.States; + newPromotionalActivities.ActivityTypeId = promotionalActivities.ActivityTypeId; Funs.DB.SubmitChanges(); } } diff --git a/SGGL/BLL/HSSE/Solution/LargerHazardService.cs b/SGGL/BLL/HSSE/Solution/LargerHazardService.cs index d305c919..3db04d45 100644 --- a/SGGL/BLL/HSSE/Solution/LargerHazardService.cs +++ b/SGGL/BLL/HSSE/Solution/LargerHazardService.cs @@ -45,7 +45,8 @@ namespace BLL TrainPersonNum = largerHazard.TrainPersonNum, IsSuperLargerHazard = largerHazard.IsSuperLargerHazard, Descriptions = largerHazard.Descriptions, - OperativesNum = largerHazard.OperativesNum + OperativesNum = largerHazard.OperativesNum, + ApprovalState = largerHazard.ApprovalState, }; db.Solution_LargerHazard.InsertOnSubmit(newLargerHazard); @@ -88,7 +89,8 @@ namespace BLL newLargerHazard.IsSuperLargerHazard = largerHazard.IsSuperLargerHazard; newLargerHazard.Descriptions = largerHazard.Descriptions; newLargerHazard.IsUpdate = null; - newLargerHazard.OperativesNum = largerHazard.OperativesNum; + newLargerHazard.OperativesNum = largerHazard.OperativesNum; + newLargerHazard.ApprovalState = largerHazard.ApprovalState; db.SubmitChanges(); //判断是否有数据 有数据则更新 没有数据则添加 var majorPlanApproval = BLL.MajorPlanApprovalService.GetMajorPlanApprovalById(largerHazard.HazardId); diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs index 06d3b907..1933990f 100644 --- a/SGGL/BLL/SysManage/UserService.cs +++ b/SGGL/BLL/SysManage/UserService.cs @@ -1519,6 +1519,40 @@ namespace BLL } } + /// + /// ݵλIdȡûѡλְԱ + /// + /// + public static List GetIsOfficeUserListByUnitId(string unitId) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + List list = new List(); + list = (from x in db.Sys_User + where x.UnitId == unitId && x.IsOffice == true && x.IsPost == true + orderby x.UserName + select x).ToList(); + return list; + } + } + + /// + /// û + /// + /// + /// Ƿʾѡ + public static void InitIsOfficeUserUnitIdDropDownList(FineUIPro.DropDownList dropName, string unitId, bool isShowPlease) + { + dropName.DataValueField = "UserId"; + dropName.DataTextField = "UserName"; + dropName.DataSource = BLL.UserService.GetIsOfficeUserListByUnitId(unitId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + /// /// û /// diff --git a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs index 595ef5b8..4530ff62 100644 --- a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs @@ -122,6 +122,12 @@ namespace BLL SuperConstructionNum = newtable.SuperConstructionNum, SuperFinishedNum = newtable.SuperFinishedNum, SuperArgumentNum = newtable.SuperArgumentNum, + AwaitApprovalNum = newtable.AwaitApprovalNum, + PendingApprovalNum = newtable.PendingApprovalNum, + CompletedApprovalNum = newtable.CompletedApprovalNum, + SuperAwaitApprovalNum = newtable.SuperAwaitApprovalNum, + SuperPendingApprovalNum = newtable.SuperPendingApprovalNum, + SuperCompletedApprovalNum = newtable.SuperCompletedApprovalNum, State = newtable.State, CreateDate = newtable.CreateDate, CreateMan = newtable.CreateMan @@ -250,6 +256,12 @@ namespace BLL item.SuperTrainPersonNum = dataHsse.SuperTrainPersonNum; item.SuperOperativesNum = dataHsse.SuperOperativesNum; item.SuperArgumentNum = dataHsse.SuperArgumentNum; + item.AwaitApprovalNum = dataHsse.AwaitApprovalNum; + item.PendingApprovalNum = dataHsse.PendingApprovalNum; + item.CompletedApprovalNum = dataHsse.CompletedApprovalNum; + item.SuperAwaitApprovalNum = dataHsse.SuperAwaitApprovalNum; + item.SuperPendingApprovalNum = dataHsse.SuperPendingApprovalNum; + item.SuperCompletedApprovalNum = dataHsse.SuperCompletedApprovalNum; item.TotalEnergyConsumption = dataHsse.TotalEnergyConsumption; item.TotalWorkingHour = dataHsse.TotalWorkingHour; item.TrainPersonNum = dataHsse.TrainPersonNum; @@ -375,6 +387,12 @@ namespace BLL item.SuperArgumentNum = dataHsse.SuperArgumentNum; item.SuperTrainPersonNum = dataHsse.SuperTrainPersonNum; item.SuperOperativesNum = dataHsse.SuperOperativesNum; + item.AwaitApprovalNum = dataHsse.AwaitApprovalNum; + item.PendingApprovalNum = dataHsse.PendingApprovalNum; + item.CompletedApprovalNum = dataHsse.CompletedApprovalNum; + item.SuperAwaitApprovalNum = dataHsse.SuperAwaitApprovalNum; + item.SuperPendingApprovalNum = dataHsse.SuperPendingApprovalNum; + item.SuperCompletedApprovalNum = dataHsse.SuperCompletedApprovalNum; item.TotalEnergyConsumption = dataHsse.TotalEnergyConsumption; item.TotalWorkingHour = dataHsse.TotalWorkingHour; item.TrainPersonNum = dataHsse.TrainPersonNum; @@ -551,6 +569,12 @@ namespace BLL SuperTrainPersonNum = projectData.Sum(x => x.SuperTrainPersonNum), SuperConstructionNum = projectData.Sum(x => x.SuperConstructionNum), SuperFinishedNum = projectData.Sum(x => x.SuperFinishedNum), + AwaitApprovalNum = projectData.Sum(x => x.AwaitApprovalNum), + PendingApprovalNum = projectData.Sum(x => x.PendingApprovalNum), + CompletedApprovalNum = projectData.Sum(x => x.CompletedApprovalNum), + SuperAwaitApprovalNum = projectData.Sum(x => x.SuperAwaitApprovalNum), + SuperPendingApprovalNum = projectData.Sum(x => x.SuperPendingApprovalNum), + SuperCompletedApprovalNum = projectData.Sum(x => x.SuperCompletedApprovalNum), CreateMan = Const.sysglyId, CreateDate = DateTime.Now }; @@ -640,7 +664,7 @@ namespace BLL var licensesTask = HSSEData_HSSEService.GetLicensesAsync(); var licensesCloseTask = HSSEData_HSSEService.GetLicensesCloseAsync(); var generalHiddenRectificationOutputsTask = HSSEData_HSSEService.GetGeneralHiddenRectificationOutputsAsync(); - var largerHiddenRectificationOutputsTask = HSSEData_HSSEService.GetLargerHiddenRectificationOutputsAsync(); + var largerHiddenRectificationOutputsTask = HSSEData_HSSEService.GetLargerHiddenRectificationOutputsAsync(); var majorHiddenRectificationOutputsTask = HSSEData_HSSEService.GetMajorHiddenRectificationOutputsAsync(); // 等待所有异步方法执行完成 @@ -880,7 +904,13 @@ namespace BLL SuperOperativesNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperOperativesNum), SuperConstructionNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperConstructionNum), SuperFinishedNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperFinishedNum), - SuperArgumentNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperArgumentNum) + SuperArgumentNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperArgumentNum), + AwaitApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.AwaitApprovalNum), + PendingApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.PendingApprovalNum), + CompletedApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.CompletedApprovalNum), + SuperAwaitApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperAwaitApprovalNum), + SuperPendingApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperPendingApprovalNum), + SuperCompletedApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperCompletedApprovalNum), }; #region 添加项目统计数据 @@ -936,7 +966,13 @@ namespace BLL SuperOperativesNum = g.Sum(x => x.SuperOperativesNum), SuperConstructionNum = g.Sum(x => x.SuperConstructionNum), SuperFinishedNum = g.Sum(x => x.SuperFinishedNum), - SuperArgumentNum = g.Sum(x => x.SuperArgumentNum) + SuperArgumentNum = g.Sum(x => x.SuperArgumentNum), + AwaitApprovalNum = g.Sum(x => x.AwaitApprovalNum), + PendingApprovalNum = g.Sum(x => x.PendingApprovalNum), + CompletedApprovalNum = g.Sum(x => x.CompletedApprovalNum), + SuperAwaitApprovalNum = g.Sum(x => x.SuperAwaitApprovalNum), + SuperPendingApprovalNum = g.Sum(x => x.SuperPendingApprovalNum), + SuperCompletedApprovalNum = g.Sum(x => x.SuperCompletedApprovalNum), } ); foreach (var projectid in BeUnderConstructionList) @@ -1041,7 +1077,13 @@ namespace BLL SuperOperativesNum = largeEngineeringOutputs?.SuperOperativesNum ?? 0, SuperConstructionNum = largeEngineeringOutputs?.SuperConstructionNum ?? 0, SuperFinishedNum = largeEngineeringOutputs?.SuperFinishedNum ?? 0, - SuperArgumentNum = largeEngineeringOutputs?.SuperArgumentNum ?? 0 + SuperArgumentNum = largeEngineeringOutputs?.SuperArgumentNum ?? 0, + AwaitApprovalNum = largeEngineeringOutputs?.AwaitApprovalNum ?? 0, + PendingApprovalNum = largeEngineeringOutputs?.PendingApprovalNum ?? 0, + CompletedApprovalNum = largeEngineeringOutputs?.CompletedApprovalNum ?? 0, + SuperAwaitApprovalNum = largeEngineeringOutputs?.SuperAwaitApprovalNum ?? 0, + SuperPendingApprovalNum = largeEngineeringOutputs?.SuperPendingApprovalNum ?? 0, + SuperCompletedApprovalNum = largeEngineeringOutputs?.SuperCompletedApprovalNum ?? 0, }; Project_HSSEData_HSSEService.AddProject_HSSEData_HSSE(projectHsseData); } @@ -1167,7 +1209,13 @@ namespace BLL table.SuperOperativesNum = newtable.SuperOperativesNum; table.SuperConstructionNum = newtable.SuperConstructionNum; table.SuperFinishedNum = newtable.SuperFinishedNum; - table.SuperArgumentNum = newtable.SuperArgumentNum; + table.SuperArgumentNum = newtable.SuperArgumentNum; + table.AwaitApprovalNum = newtable.AwaitApprovalNum; + table.PendingApprovalNum = newtable.PendingApprovalNum; + table.CompletedApprovalNum = newtable.CompletedApprovalNum; + table.SuperAwaitApprovalNum = newtable.SuperAwaitApprovalNum; + table.SuperPendingApprovalNum = newtable.SuperPendingApprovalNum; + table.SuperCompletedApprovalNum = newtable.SuperCompletedApprovalNum; table.State = newtable.State; table.CreateMan = newtable.CreateMan; table.CreateDate = newtable.CreateDate; @@ -4136,6 +4184,12 @@ namespace BLL SuperConstructionNum = gg.Count(x => x.States == "2" && x.IsSuperLargerHazard == true), SuperFinishedNum = gg.Count(x => x.States == "3" && x.IsSuperLargerHazard == true), SuperArgumentNum = gg.Count(x => x.IsArgument == true && x.IsSuperLargerHazard == true), + AwaitApprovalNum = gg.Count(x => x.ApprovalState == "0" && x.IsSuperLargerHazard == false), + PendingApprovalNum = gg.Count(x => x.ApprovalState == "1" && x.IsSuperLargerHazard == false), + CompletedApprovalNum = gg.Count(x => x.ApprovalState == "2" && x.IsSuperLargerHazard == false), + SuperAwaitApprovalNum = gg.Count(x => x.ApprovalState == "0" && x.IsSuperLargerHazard == true), + SuperPendingApprovalNum = gg.Count(x => x.ApprovalState == "1" && x.IsSuperLargerHazard == true), + SuperCompletedApprovalNum = gg.Count(x => x.ApprovalState == "2" && x.IsSuperLargerHazard == true), }).ToList(); return query; } @@ -4376,6 +4430,12 @@ namespace BLL x.SuperConstructionNum, x.SuperFinishedNum, x.SuperArgumentNum, + x.AwaitApprovalNum, + x.PendingApprovalNum, + x.CompletedApprovalNum, + x.SuperAwaitApprovalNum, + x.SuperPendingApprovalNum, + x.SuperCompletedApprovalNum, x.State, x.CreateDate, x.CreateMan diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs index ee6144d8..a4bee192 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs @@ -207,7 +207,13 @@ namespace BLL SuperOperativesNum = newtable.SuperOperativesNum, SuperConstructionNum = newtable.SuperConstructionNum, SuperFinishedNum = newtable.SuperFinishedNum, - SuperArgumentNum = newtable.SuperArgumentNum + SuperArgumentNum = newtable.SuperArgumentNum, + AwaitApprovalNum = newtable.AwaitApprovalNum, + PendingApprovalNum = newtable.PendingApprovalNum, + CompletedApprovalNum = newtable.CompletedApprovalNum, + SuperAwaitApprovalNum = newtable.SuperAwaitApprovalNum, + SuperPendingApprovalNum = newtable.SuperPendingApprovalNum, + SuperCompletedApprovalNum = newtable.SuperCompletedApprovalNum, }; db.Project_HSSEData_HSSE.InsertOnSubmit(table); db.SubmitChanges(); @@ -347,7 +353,15 @@ namespace BLL table.SuperTrainPersonNum = newtable.SuperTrainPersonNum; table.SuperOperativesNum = newtable.SuperOperativesNum; table.SuperConstructionNum = newtable.SuperConstructionNum; - table.SuperFinishedNum = newtable.SuperFinishedNum; + table.SuperFinishedNum = newtable.SuperFinishedNum; + table.ArgumentNum = newtable.ArgumentNum; + table.SuperArgumentNum = newtable.SuperArgumentNum; + table.AwaitApprovalNum = newtable.AwaitApprovalNum; + table.PendingApprovalNum = newtable.PendingApprovalNum; + table.CompletedApprovalNum = newtable.CompletedApprovalNum; + table.SuperAwaitApprovalNum = newtable.SuperAwaitApprovalNum; + table.SuperPendingApprovalNum = newtable.SuperPendingApprovalNum; + table.SuperCompletedApprovalNum = newtable.SuperCompletedApprovalNum; db.SubmitChanges(); } } @@ -623,7 +637,15 @@ namespace BLL table.SuperTrainPersonNum = GetSuperTrainPersonNum(projectid); table.SuperOperativesNum = GetSuperOperativesNum(projectid); table.SuperConstructionNum = GetSuperConstructionNum(projectid); - table.SuperFinishedNum = GetSuperFinishedNum(projectid); + table.SuperFinishedNum = GetSuperFinishedNum(projectid); + table.ArgumentNum = GetArgumentNum(projectid); + table.SuperArgumentNum = GetSuperArgumentNum(projectid); + table.AwaitApprovalNum = GetAwaitApprovalNum(projectid); + table.PendingApprovalNum = GetPendingApprovalNum(projectid); + table.CompletedApprovalNum = GetCompletedApprovalNum(projectid); + table.SuperAwaitApprovalNum = GetSuperAwaitApprovalNum(projectid); + table.SuperPendingApprovalNum = GetSuperPendingApprovalNum(projectid); + table.SuperCompletedApprovalNum = GetSuperCompletedApprovalNum(projectid); } if (IsReportByToday(projectid)) @@ -1589,6 +1611,106 @@ namespace BLL return result; } + /// + /// 获取危大工程论证个数 + /// + /// + public static int GetArgumentNum(string projectid) + { + var result = (from x in Funs.DB.Solution_LargerHazard + where x.ProjectId == projectid && x.IsArgument == true && x.IsSuperLargerHazard == false && + x.RecordTime > Const.DtmarkTime + select x).Count(); + return result; + } + + /// + /// 获取超危大工程论证个数 + /// + /// + public static int GetSuperArgumentNum(string projectid) + { + var result = (from x in Funs.DB.Solution_LargerHazard + where x.ProjectId == projectid && x.IsArgument == true && x.IsSuperLargerHazard == true && + x.RecordTime > Const.DtmarkTime + select x).Count(); + return result; + } + + /// + /// 获取危大工程待审核个数 + /// + /// + public static int GetAwaitApprovalNum(string projectid) + { + var result = (from x in Funs.DB.Solution_LargerHazard + where x.ProjectId == projectid && x.ApprovalState == "0" && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime + select x).Count(); + return result; + } + + /// + /// 获取超危大工程待审核个数 + /// + /// + public static int GetSuperAwaitApprovalNum(string projectid) + { + var result = (from x in Funs.DB.Solution_LargerHazard + where x.ProjectId == projectid && x.ApprovalState == "0" && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime + select x).Count(); + return result; + } + + /// + /// 获取危大工程审核中个数 + /// + /// + public static int GetPendingApprovalNum(string projectid) + { + var result = (from x in Funs.DB.Solution_LargerHazard + where x.ProjectId == projectid && x.ApprovalState == "1" && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime + select x).Count(); + return result; + } + + /// + /// 获取超危大工程审核中个数 + /// + /// + public static int GetSuperPendingApprovalNum(string projectid) + { + var result = (from x in Funs.DB.Solution_LargerHazard + where x.ProjectId == projectid && x.ApprovalState == "1" && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime + select x).Count(); + return result; + } + + /// + /// 获取危大工程已完成个数 + /// + /// + public static int GetCompletedApprovalNum(string projectid) + { + var result = (from x in Funs.DB.Solution_LargerHazard + where x.ProjectId == projectid && x.ApprovalState == "2" && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime + select x).Count(); + return result; + } + + /// + /// 获取超危大工程已完成个数 + /// + /// + public static int GetSuperCompletedApprovalNum(string projectid) + { + var result = (from x in Funs.DB.Solution_LargerHazard + where x.ProjectId == projectid && x.ApprovalState == "2" && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime + select x).Count(); + return result; + } + + + /// /// 获取超危大工程审批完成数 /// @@ -1765,7 +1887,15 @@ namespace BLL x.SuperCompletedNum, x.SuperTrainPersonNum, x.SuperConstructionNum, - x.SuperFinishedNum + x.SuperFinishedNum, + x.ArgumentNum, + x.SuperArgumentNum, + x.AwaitApprovalNum, + x.PendingApprovalNum, + x.CompletedApprovalNum, + x.SuperAwaitApprovalNum, + x.SuperPendingApprovalNum, + x.SuperCompletedApprovalNum, }; } diff --git a/SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx b/SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx new file mode 100644 index 00000000..64d05c8c --- /dev/null +++ b/SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx @@ -0,0 +1,159 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ActivityType.aspx.cs" Inherits="FineUIPro.Web.BaseInfo.ActivityType" %> + + + + + + + 活动类型 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx.cs new file mode 100644 index 00000000..6e303c4a --- /dev/null +++ b/SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx.cs @@ -0,0 +1,277 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.BaseInfo +{ + public partial class ActivityType : PageBase + { + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + ////权限按钮方法 + this.GetButtonPower(); + ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + // 绑定表格 + BindGrid(); + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + var q = from x in Funs.DB.Base_ActivityType orderby x.ActivityTypeCode select x; + Grid1.RecordCount = q.Count(); + // 2.获取当前分页数据 + var table = GetPagedDataTable(Grid1.PageIndex, Grid1.PageSize); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页 + /// + /// + private List GetPagedDataTable(int pageIndex, int pageSize) + { + List source = (from x in BLL.Funs.DB.Base_ActivityType orderby x.ActivityTypeCode select x).ToList(); + List paged = new List(); + + int rowbegin = pageIndex * pageSize; + int rowend = (pageIndex + 1) * pageSize; + if (rowend > source.Count()) + { + rowend = source.Count(); + } + + for (int i = rowbegin; i < rowend; i++) + { + paged.Add(source[i]); + } + + return paged; + } + + /// + /// 过滤表头 + /// + /// + /// + protected void Grid1_FilterChange(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + #endregion + + #region 分页下拉选择 + /// + /// 分页下拉选择 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + #endregion + + #region 删除 + /// + /// 删除 + /// + /// + /// + protected void btnDelete_Click(object sender, EventArgs e) + { + var ActivityType = BLL.ActivityTypeService.GetActivityTypeById(hfFormID.Text); + if (ActivityType != null) + { + BLL.LogService.AddSys_Log(this.CurrUser, ActivityType.ActivityTypeCode, ActivityType.ActivityTypeId, BLL.Const.ActivityTypeMenuId, BLL.Const.BtnDelete); + + BLL.ActivityTypeService.DeleteActivityTypeById(hfFormID.Text); + // 重新绑定表格，并模拟点击[新增按钮] + BindGrid(); + PageContext.RegisterStartupScript("onNewButtonClick();"); + } + } + + /// + /// 右键删除事件 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + this.DeleteData(); + } + + /// + /// 删除方法 + /// + private void DeleteData() + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + var ActivityType = BLL.ActivityTypeService.GetActivityTypeById(rowID); + if (ActivityType != null) + { + BLL.LogService.AddSys_Log(this.CurrUser, ActivityType.ActivityTypeCode, ActivityType.ActivityTypeId, BLL.Const.ActivityTypeMenuId, BLL.Const.BtnDelete); + BLL.ActivityTypeService.DeleteActivityTypeById(rowID); + } + } + + BindGrid(); + PageContext.RegisterStartupScript("onNewButtonClick();"); + } + } + #endregion + + #region 编辑 + /// + /// 右键编辑事件 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string Id = Grid1.SelectedRowID; + var ActivityType = BLL.ActivityTypeService.GetActivityTypeById(Id); + if (ActivityType != null) + { + this.txtActivityTypeCode.Text = ActivityType.ActivityTypeCode; + this.txtActivityTypeName.Text = ActivityType.ActivityTypeName; + this.txtRemark.Text = ActivityType.Remark; + hfFormID.Text = Id; + this.btnDelete.Enabled = true; + } + } + #endregion + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + string strRowID = hfFormID.Text; + Model.Base_ActivityType ActivityType = new Model.Base_ActivityType + { + ActivityTypeCode = this.txtActivityTypeCode.Text.Trim(), + ActivityTypeName = this.txtActivityTypeName.Text.Trim(), + Remark = txtRemark.Text.Trim() + }; + if (string.IsNullOrEmpty(strRowID)) + { + ActivityType.ActivityTypeId = SQLHelper.GetNewID(typeof(Model.Base_ActivityType)); + BLL.ActivityTypeService.AddActivityType(ActivityType); + BLL.LogService.AddSys_Log(this.CurrUser, ActivityType.ActivityTypeCode, ActivityType.ActivityTypeId, BLL.Const.ActivityTypeMenuId, BLL.Const.BtnAdd); + } + else + { + ActivityType.ActivityTypeId = strRowID; + BLL.ActivityTypeService.UpdateActivityType(ActivityType); + BLL.LogService.AddSys_Log(this.CurrUser, ActivityType.ActivityTypeCode, ActivityType.ActivityTypeId, BLL.Const.ActivityTypeMenuId, BLL.Const.BtnModify); + } + this.SimpleForm1.Reset(); + // 重新绑定表格，并点击当前编辑或者新增的行 + BindGrid(); + PageContext.RegisterStartupScript(String.Format("F('{0}').selectRow('{1}');", Grid1.ClientID, ActivityType.ActivityTypeId)); + } + #endregion + + #region 验证费用类别名称、编号是否存在 + /// + /// 验证费用类别名称、编号是否存在 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + var q = Funs.DB.Base_ActivityType.FirstOrDefault(x => x.ActivityTypeCode == this.txtActivityTypeCode.Text.Trim() && (x.ActivityTypeId != hfFormID.Text || (hfFormID.Text == null && x.ActivityTypeId != null))); + if (q != null) + { + ShowNotify("输入的类别编号已存在！", MessageBoxIcon.Warning); + } + + var q2 = Funs.DB.Base_ActivityType.FirstOrDefault(x => x.ActivityTypeName == this.txtActivityTypeName.Text.Trim() && (x.ActivityTypeId != hfFormID.Text || (hfFormID.Text == null && x.ActivityTypeId != null))); + if (q2 != null) + { + ShowNotify("输入的类别名称已存在！", MessageBoxIcon.Warning); + } + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ActivityTypeMenuId); + 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.btnDelete.Hidden = false; + this.btnMenuDelete.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnSave)) + { + this.btnSave.Hidden = false; + } + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx.designer.cs new file mode 100644 index 00000000..bb0e3eb3 --- /dev/null +++ b/SGGL/FineUIPro.Web/BaseInfo/ActivityType.aspx.designer.cs @@ -0,0 +1,197 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.BaseInfo +{ + + + public partial class ActivityType + { + + /// + /// 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; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.SimpleForm SimpleForm1; + + /// + /// hfFormID 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox hfFormID; + + /// + /// txtActivityTypeCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtActivityTypeCode; + + /// + /// txtActivityTypeName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtActivityTypeName; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRemark; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// btnDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnDelete; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/专项检查明细导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/专项检查明细导入模板.xls index 2d227a2fb9214804b0eb12053fe42bda696d7e36..e5d2a2345d32c71c64d7058d09a961f77139f05c 100644 GIT binary patch delta 61 zcmZpe!Pqc^aYGIZYlBS2ilEJfEWuWsEDQ_`>_E&q`K(bS) delta 61 zcmZpe!Pqc^aYGIZ>xRn?RpFZpS%R%Nc^McO*nyaD@>#nUZe9j9Ae)hamw|V4jQve^ N7C%X#LQD7KEC2%`503x< diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/企业大检查明细导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/企业大检查明细导入模板.xls new file mode 100644 index 0000000000000000000000000000000000000000..e4add0550258620d7903b79a8170e22e4937c5b8 GIT binary patch literal 18944 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 b4;(wtbXPdy7s;+PswaJ9#v`!)+lT)Fd+TJd literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/现场车辆管理导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/现场车辆管理导入模板.xls new file mode 100644 index 0000000000000000000000000000000000000000..5aa8c669d811e65467e5cab0006589c2a6ac1ab1 GIT binary patch literal 18432 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 literal 0 HcmV?d00001 diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 3e942c2d..4768a7d1 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -234,6 +234,7 @@ + @@ -965,6 +966,7 @@ + @@ -2426,6 +2428,7 @@ + @@ -6621,6 +6624,13 @@ AccidentType.aspx + + ActivityType.aspx + ASPXCodeBehind + + + ActivityType.aspx + BaseFactory.aspx ASPXCodeBehind @@ -11244,6 +11254,13 @@ CarManagerEdit.aspx + + CarManagerIn.aspx + ASPXCodeBehind + + + CarManagerIn.aspx + CarManagerView.aspx ASPXCodeBehind @@ -20260,6 +20277,13 @@ UnitHazardRegister.aspx + + UnitHazardRegisterDetailIn.aspx + ASPXCodeBehind + + + UnitHazardRegisterDetailIn.aspx + UnitHazardRegisterEdit.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HSSE/Administrative/CarManager.aspx b/SGGL/FineUIPro.Web/HSSE/Administrative/CarManager.aspx index 2717ad18..3d3b3e9a 100644 --- a/SGGL/FineUIPro.Web/HSSE/Administrative/CarManager.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Administrative/CarManager.aspx @@ -4,109 +4,126 @@ - + 现场车辆管理
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +