From 02ba872ceef425733a8f4d0326acfea9b55f2a3c Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Wed, 5 Mar 2025 17:00:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=81=E5=9F=B9=E8=AE=AD=E8=AE=A1=E5=88=92=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E4=BC=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_V2025-02-13-xiaj.sql | 236 -------- SGGL/BLL/API/APIPersonService.cs | 68 +-- SGGL/BLL/API/HSSE/APITrainingTaskService.cs | 27 +- SGGL/BLL/Common/Const.cs | 9 +- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 16 + SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx | 192 +++--- SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx.cs | 75 ++- .../HSSE/EduTrain/Plan.aspx.designer.cs | 18 + .../HSSE/EduTrain/PlanEdit.aspx.cs | 4 +- SGGL/FineUIPro.Web/common/mainNew.aspx | 549 ------------------ SGGL/FineUIPro.Web/common/mainNew.aspx.cs | 233 -------- .../common/mainNew.aspx.designer.cs | 404 ------------- SGGL/Model/APIItem/HSSE/PersonInfoItem.cs | 62 ++ SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs | 10 + SGGL/Model/Model.csproj | 1 + .../HSSE/TrainingTaskController.cs | 17 +- .../{ => Person}/PersonController.cs | 74 ++- SGGL/WebAPI/Filter/TestPermissionAttribute.cs | 60 +- .../PublishProfiles/FolderProfile.pubxml | 2 +- SGGL/WebAPI/WebAPI.csproj | 2 +- 20 files changed, 422 insertions(+), 1637 deletions(-) delete mode 100644 SGGL/FineUIPro.Web/common/mainNew.aspx delete mode 100644 SGGL/FineUIPro.Web/common/mainNew.aspx.cs delete mode 100644 SGGL/FineUIPro.Web/common/mainNew.aspx.designer.cs create mode 100644 SGGL/Model/APIItem/HSSE/PersonInfoItem.cs rename SGGL/WebAPI/Controllers/{ => Person}/PersonController.cs (96%) diff --git a/DataBase/版本日志/SGGLDB_V2025-02-13-xiaj.sql b/DataBase/版本日志/SGGLDB_V2025-02-13-xiaj.sql index 1e606ee..37933ea 100644 --- a/DataBase/版本日志/SGGLDB_V2025-02-13-xiaj.sql +++ b/DataBase/版本日志/SGGLDB_V2025-02-13-xiaj.sql @@ -303,240 +303,4 @@ GO ---˰ȫжƻ - -IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Examine_PersonalSafetyActionPlan') AND type = N'U') -BEGIN - -CREATE TABLE [dbo].[Examine_PersonalSafetyActionPlan]( - [Id] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [Code] [nvarchar](50) NULL, - [Name] [nvarchar](200) NULL, - [UserId] [nvarchar](50) NULL, - [DateTime] [datetime] NULL, - [Content] [nvarchar](1000) NULL, - [Remark] [nvarchar](1000) NULL, - [CompileDate] [datetime] NULL, - [CompileMan] [nvarchar](50) NULL, - CONSTRAINT [PK_Examine_PersonalSafetyActionPlan] PRIMARY KEY CLUSTERED -( - [Id] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] -ALTER TABLE [dbo].[Examine_PersonalSafetyActionPlan] WITH CHECK ADD CONSTRAINT [FK_Examine_PersonalSafetyActionPlan_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -ALTER TABLE [dbo].[Examine_PersonalSafetyActionPlan] CHECK CONSTRAINT [FK_Examine_PersonalSafetyActionPlan_Base_Project] -ALTER TABLE [dbo].[Examine_PersonalSafetyActionPlan] WITH CHECK ADD CONSTRAINT [FK_Examine_PersonalSafetyActionPlan_User] FOREIGN KEY([UserId]) -REFERENCES [dbo].[Sys_User] ([UserId]) -ALTER TABLE [dbo].[Examine_PersonalSafetyActionPlan] CHECK CONSTRAINT [FK_Examine_PersonalSafetyActionPlan_User] -ALTER TABLE [dbo].[Examine_PersonalSafetyActionPlan] WITH CHECK ADD CONSTRAINT [FK_Examine_PersonalSafetyActionPlan_Sys_User] FOREIGN KEY([CompileMan]) -REFERENCES [dbo].[Sys_User] ([UserId]) -ALTER TABLE [dbo].[Examine_PersonalSafetyActionPlan] CHECK CONSTRAINT [FK_Examine_PersonalSafetyActionPlan_Sys_User] -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'Id' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'ProjectId' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'Code' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'Name' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'UserId' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'DateTime' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'Content' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @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'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'CompileMan' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'CompileDate' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˰ȫжƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan' -END - -GO - - ---ȫ - -IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Examine_SharingOfSafetyExperience') AND type = N'U') -BEGIN - -CREATE TABLE [dbo].[Examine_SharingOfSafetyExperience]( - [Id] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [Code] [nvarchar](50) NULL, - [Name] [nvarchar](200) NULL, - [UserId] [nvarchar](50) NULL, - [DateTime] [datetime] NULL, - [Content] [nvarchar](1000) NULL, - [Remark] [nvarchar](1000) NULL, - [CompileDate] [datetime] NULL, - [CompileMan] [nvarchar](50) NULL, - CONSTRAINT [PK_Examine_SharingOfSafetyExperience] PRIMARY KEY CLUSTERED -( - [Id] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] -ALTER TABLE [dbo].[Examine_SharingOfSafetyExperience] WITH CHECK ADD CONSTRAINT [FK_Examine_SharingOfSafetyExperience_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -ALTER TABLE [dbo].[Examine_SharingOfSafetyExperience] CHECK CONSTRAINT [FK_Examine_SharingOfSafetyExperience_Base_Project] -ALTER TABLE [dbo].[Examine_SharingOfSafetyExperience] WITH CHECK ADD CONSTRAINT [FK_Examine_SharingOfSafetyExperience_User] FOREIGN KEY([UserId]) -REFERENCES [dbo].[Sys_User] ([UserId]) -ALTER TABLE [dbo].[Examine_SharingOfSafetyExperience] CHECK CONSTRAINT [FK_Examine_SharingOfSafetyExperience_User] -ALTER TABLE [dbo].[Examine_SharingOfSafetyExperience] WITH CHECK ADD CONSTRAINT [FK_Examine_SharingOfSafetyExperience_Sys_User] FOREIGN KEY([CompileMan]) -REFERENCES [dbo].[Sys_User] ([UserId]) -ALTER TABLE [dbo].[Examine_SharingOfSafetyExperience] CHECK CONSTRAINT [FK_Examine_SharingOfSafetyExperience_Sys_User] -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'Id' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'ProjectId' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'Code' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'Name' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'UserId' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'DateTime' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'Content' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @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'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'CompileMan' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'CompileDate' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ȫ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience' -END - -GO - - - ---쵼ԱμӰҵ - -IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Examine_LeadershipJoinHomeworkAnalysisMeeting') AND type = N'U') -BEGIN - -CREATE TABLE [dbo].[Examine_LeadershipJoinHomeworkAnalysisMeeting]( - [Id] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [Code] [nvarchar](50) NULL, - [Name] [nvarchar](200) NULL, - [UserId] [nvarchar](50) NULL, - [DateTime] [datetime] NULL, - [Content] [nvarchar](1000) NULL, - [Remark] [nvarchar](1000) NULL, - [CompileDate] [datetime] NULL, - [CompileMan] [nvarchar](50) NULL, - CONSTRAINT [PK_Examine_LeadershipJoinHomeworkAnalysisMeeting] PRIMARY KEY CLUSTERED -( - [Id] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] -ALTER TABLE [dbo].[Examine_LeadershipJoinHomeworkAnalysisMeeting] WITH CHECK ADD CONSTRAINT [FK_Examine_LeadershipJoinHomeworkAnalysisMeeting_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -ALTER TABLE [dbo].[Examine_LeadershipJoinHomeworkAnalysisMeeting] CHECK CONSTRAINT [FK_Examine_LeadershipJoinHomeworkAnalysisMeeting_Base_Project] -ALTER TABLE [dbo].[Examine_LeadershipJoinHomeworkAnalysisMeeting] WITH CHECK ADD CONSTRAINT [FK_Examine_LeadershipJoinHomeworkAnalysisMeeting_User] FOREIGN KEY([UserId]) -REFERENCES [dbo].[Sys_User] ([UserId]) -ALTER TABLE [dbo].[Examine_LeadershipJoinHomeworkAnalysisMeeting] CHECK CONSTRAINT [FK_Examine_LeadershipJoinHomeworkAnalysisMeeting_User] -ALTER TABLE [dbo].[Examine_LeadershipJoinHomeworkAnalysisMeeting] WITH CHECK ADD CONSTRAINT [FK_Examine_LeadershipJoinHomeworkAnalysisMeeting_Sys_User] FOREIGN KEY([CompileMan]) -REFERENCES [dbo].[Sys_User] ([UserId]) -ALTER TABLE [dbo].[Examine_LeadershipJoinHomeworkAnalysisMeeting] CHECK CONSTRAINT [FK_Examine_LeadershipJoinHomeworkAnalysisMeeting_Sys_User] -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'Id' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'ProjectId' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'Code' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'Name' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'UserId' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'DateTime' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'Content' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @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'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'CompileMan' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'CompileDate' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'쵼ԱμӰҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting' -END - -GO - - - ---һߵԱϵ鹲 - -IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Examine_CoConstructionActivities') AND type = N'U') -BEGIN - -CREATE TABLE [dbo].[Examine_CoConstructionActivities]( - [Id] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [Code] [nvarchar](50) NULL, - [Name] [nvarchar](200) NULL, - [UserId] [nvarchar](50) NULL, - [DateTime] [datetime] NULL, - [Content] [nvarchar](1000) NULL, - [Remark] [nvarchar](1000) NULL, - [CompileDate] [datetime] NULL, - [CompileMan] [nvarchar](50) NULL, - CONSTRAINT [PK_Examine_CoConstructionActivities] PRIMARY KEY CLUSTERED -( - [Id] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] -ALTER TABLE [dbo].[Examine_CoConstructionActivities] WITH CHECK ADD CONSTRAINT [FK_Examine_CoConstructionActivities_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -ALTER TABLE [dbo].[Examine_CoConstructionActivities] CHECK CONSTRAINT [FK_Examine_CoConstructionActivities_Base_Project] -ALTER TABLE [dbo].[Examine_CoConstructionActivities] WITH CHECK ADD CONSTRAINT [FK_Examine_CoConstructionActivities_User] FOREIGN KEY([UserId]) -REFERENCES [dbo].[Sys_User] ([UserId]) -ALTER TABLE [dbo].[Examine_CoConstructionActivities] CHECK CONSTRAINT [FK_Examine_CoConstructionActivities_User] -ALTER TABLE [dbo].[Examine_CoConstructionActivities] WITH CHECK ADD CONSTRAINT [FK_Examine_CoConstructionActivities_Sys_User] FOREIGN KEY([CompileMan]) -REFERENCES [dbo].[Sys_User] ([UserId]) -ALTER TABLE [dbo].[Examine_CoConstructionActivities] CHECK CONSTRAINT [FK_Examine_CoConstructionActivities_Sys_User] -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'Id' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'ProjectId' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'Code' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'Name' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'UserId' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'DateTime' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'Content' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @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'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'CompileMan' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'CompileDate' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'һߵԱϵ鹲' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities' -END - -GO - - - ---Ϊȫ۲빵ͨ - -IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Examine_BehavioralSafetyObservation') AND type = N'U') -BEGIN - -CREATE TABLE [dbo].[Examine_BehavioralSafetyObservation]( - [Id] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [Code] [nvarchar](50) NULL, - [Name] [nvarchar](200) NULL, - [UserId] [nvarchar](50) NULL, - [DateTime] [datetime] NULL, - [Content] [nvarchar](1000) NULL, - [Remark] [nvarchar](1000) NULL, - [CompileDate] [datetime] NULL, - [CompileMan] [nvarchar](50) NULL, - CONSTRAINT [PK_Examine_BehavioralSafetyObservation] PRIMARY KEY CLUSTERED -( - [Id] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] -ALTER TABLE [dbo].[Examine_BehavioralSafetyObservation] WITH CHECK ADD CONSTRAINT [FK_Examine_BehavioralSafetyObservation_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -ALTER TABLE [dbo].[Examine_BehavioralSafetyObservation] CHECK CONSTRAINT [FK_Examine_BehavioralSafetyObservation_Base_Project] -ALTER TABLE [dbo].[Examine_BehavioralSafetyObservation] WITH CHECK ADD CONSTRAINT [FK_Examine_BehavioralSafetyObservation_User] FOREIGN KEY([UserId]) -REFERENCES [dbo].[Sys_User] ([UserId]) -ALTER TABLE [dbo].[Examine_BehavioralSafetyObservation] CHECK CONSTRAINT [FK_Examine_BehavioralSafetyObservation_User] -ALTER TABLE [dbo].[Examine_BehavioralSafetyObservation] WITH CHECK ADD CONSTRAINT [FK_Examine_BehavioralSafetyObservation_Sys_User] FOREIGN KEY([CompileMan]) -REFERENCES [dbo].[Sys_User] ([UserId]) -ALTER TABLE [dbo].[Examine_BehavioralSafetyObservation] CHECK CONSTRAINT [FK_Examine_BehavioralSafetyObservation_Sys_User] -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'Id' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'ProjectId' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'Code' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'Name' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'UserId' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'DateTime' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'Content' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @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'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'CompileMan' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'CompileDate' -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ϊȫ۲빵ͨ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation' -END - -GO - - - - - diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs index 96394be..2df45b9 100644 --- a/SGGL/BLL/API/APIPersonService.cs +++ b/SGGL/BLL/API/APIPersonService.cs @@ -71,7 +71,7 @@ namespace BLL { var getPerson = from x in db.View_SitePerson_Person where x.PersonId == personId || x.IdentityCard == personId - where x.BlackList==null || x.BlackList==false + where x.BlackList == null || x.BlackList == false select new Model.PersonItem { PersonId = x.PersonId, @@ -474,6 +474,7 @@ namespace BLL /// 项目ID /// 培训单位ID /// 培训岗位ID + /// 培训岗位ID /// 培训类型ID /// public static List getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string departIds, string trainTypeId, string InTime, string strParam) @@ -754,7 +755,7 @@ namespace BLL } else if (!string.IsNullOrEmpty(person.TeamGroupName)) { - var group = db.ProjectData_TeamGroup.FirstOrDefault(x =>x.ProjectId == person.ProjectId && x.TeamGroupName == person.TeamGroupName); + var group = db.ProjectData_TeamGroup.FirstOrDefault(x => x.ProjectId == person.ProjectId && x.TeamGroupName == person.TeamGroupName); if (group != null) { newPerson.TeamGroupId = group.TeamGroupId; @@ -781,7 +782,7 @@ namespace BLL var post = db.Base_WorkPost.FirstOrDefault(x => x.WorkPostName == person.WorkPostName); if (post != null) { - newPerson.WorkPostId = post.WorkPostId; + newPerson.WorkPostId = post.WorkPostId; } } //if (!string.IsNullOrEmpty(person.IdcardType)) @@ -828,7 +829,7 @@ namespace BLL { newPerson.IsUsed = false; } - newPerson.Password = UserService.getInitialPassword(newPerson.UnitId, newPerson.IdentityCard); + newPerson.Password = UserService.getInitialPassword(newPerson.UnitId, newPerson.IdentityCard); string rootUrl = ConfigurationManager.AppSettings["localRoot"]; if (!string.IsNullOrEmpty(rootUrl) && !string.IsNullOrEmpty(person.PhotoUrl)) { @@ -1277,11 +1278,11 @@ namespace BLL #endregion #region 获取项目当日在场人员数据 - public static IEnumerable getPersonPresenceData(string projectId,DateTime dateTime) + public static IEnumerable getPersonPresenceData(string projectId, DateTime dateTime) { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - string url= ConfigurationManager.AppSettings["CEMS_IMG_URL"]; + string url = ConfigurationManager.AppSettings["CEMS_IMG_URL"]; DateTime start = Convert.ToDateTime(dateTime.Date.ToString("D").ToString()); @@ -1290,33 +1291,33 @@ namespace BLL && x.ChangeTime >= start && x.ChangeTime <= end); //获取当前全部数据 getDataList = from x in getDataList - group x by x.PersonId into g - select g.OrderByDescending(t => t.ChangeTime).FirstOrDefault(); //获取每个人最后一条数据 + group x by x.PersonId into g + select g.OrderByDescending(t => t.ChangeTime).FirstOrDefault(); //获取每个人最后一条数据 getDataList = getDataList.Where(x => x.IsIn == true); //取类型是进门的数据来获取当前在场人员 var data = getDataList.ToList(); - var attachfile = db.AttachFile.Where(x => data.Select(y => y.PersonId+"#4").Distinct().ToList().Contains(x.ToKeyId)).ToList(); + var attachfile = db.AttachFile.Where(x => data.Select(y => y.PersonId + "#4").Distinct().ToList().Contains(x.ToKeyId)).ToList(); var result = (from x in data - join y in attachfile on (x.PersonId+"#4") equals y.ToKeyId into temp - from y in temp.DefaultIfEmpty() - select new - { - x.PostType, - x.PersonId, - x.IsIn, - IsInName = (x.IsIn == true ? "进门" : "出门"), - x.ChangeTime, - x.UnitName, - x.WorkPostName, - x.WorkAreaName, - x.PersonName, - x.IdentityCard, - x.InOutWay, - x.Address, - x.Remark, - AttachUrl = (y != null) ? y.AttachUrl.Split(',').Select(item => url + item).ToArray() : null - }).ToList(); - return result; + join y in attachfile on (x.PersonId + "#4") equals y.ToKeyId into temp + from y in temp.DefaultIfEmpty() + select new + { + x.PostType, + x.PersonId, + x.IsIn, + IsInName = (x.IsIn == true ? "进门" : "出门"), + x.ChangeTime, + x.UnitName, + x.WorkPostName, + x.WorkAreaName, + x.PersonName, + x.IdentityCard, + x.InOutWay, + x.Address, + x.Remark, + AttachUrl = (y != null) ? y.AttachUrl.Split(',').Select(item => url + item).ToArray() : null + }).ToList(); + return result; } } #endregion @@ -1726,7 +1727,7 @@ namespace BLL if (isOK) { var faceResult = FaceClass.add(person.PersonId, person.IdentityCard, System.Configuration.ConfigurationManager.AppSettings["CEMS_IMG_URL"].ToString() + person.PhotoUrl, AccessToken.getAccessToken()); - var face = JsonConvert.DeserializeObject(faceResult); + var face = JsonConvert.DeserializeObject(faceResult); // JsonConvert.DeserializeObject(myPunishItem); if (face.error_code == 0 || face.error_code == 223105) { @@ -1739,8 +1740,8 @@ namespace BLL else { message = "注册人脸库失败" + face.error_code + face.error_msg; - - + + } } @@ -1762,8 +1763,7 @@ namespace BLL /// /// 人员出入场 /// - /// w - /// + /// /// /// public static void getPersonInOut(Model.SitePerson_Person getPerson, int isIn, DateTime changeTime) diff --git a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs index 5cd5b78..f909897 100644 --- a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs +++ b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs @@ -12,9 +12,9 @@ namespace BLL /// /// /// - /// 1-培训中；2-已完成 + /// 是否重修：1：重修任务 、0：日常培训任务 /// - public static List getTrainingTaskListByProjectIdPersonId(string projectId, string personId) + public static List getTrainingTaskListByProjectIdPersonId(string projectId, string personId, string isRetakeCourse) { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { @@ -26,25 +26,29 @@ namespace BLL select new Model.TrainingTaskItem { TaskId = x.TaskId, - //PlanId = x.PlanId, + PlanId = x.PlanId, PlanCode = y.PlanCode, PlanName = y.PlanName, TrainStartDate = string.Format("{0:yyyy-MM-dd HH:mm}", y.TrainStartDate), TeachAddress = y.TeachAddress, - //PersonId = x.UserId, + PersonId = x.UserId, PersonName = db.SitePerson_Person.FirstOrDefault(p => p.PersonId == x.UserId).PersonName, TaskDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.TaskDate), TrainTypeName = db.Base_TrainType.FirstOrDefault(b => b.TrainTypeId == y.TrainTypeId).TrainTypeName, TrainLevelName = db.Base_TrainLevel.FirstOrDefault(b => b.TrainLevelId == y.TrainLevelId).TrainLevelName, PlanStatesName = y.States == "3" ? "已完成" : "培训中", - + IsRetakeCourse = y.IsRetakeCourse == 1 ? 1 : 0, }).ToList(); + if (!string.IsNullOrWhiteSpace(isRetakeCourse)) + { + getDataLists = getDataLists.Where(x => x.IsRetakeCourse == int.Parse(isRetakeCourse)).ToList(); + } return getDataLists; } } #endregion - #region 根据TaskId获取培训任务教材明细列表 + #region 根据TaskId获取培训任务教材列表 /// /// 根据TaskId获取培训任务列表 /// @@ -222,12 +226,15 @@ namespace BLL - #region 根据TrainingPlanId获取培训任务教材明细列表 + #region 维护任务学习时长 /// - /// 根据TrainingPlanId获取培训任务教材明细列表 + /// 维护任务学习时长 /// - /// - /// 培训计划人员 + /// + /// + /// + /// + /// public static Model.Training_TaskItem updateTaskItemLearnTime(string taskItemId, DateTime startTime, DateTime endTime, string VideoProgress) { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 068810f..f25882e 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -7,6 +7,7 @@ namespace BLL { public static class Const { + public const string BoardDataMenuId = ""; /// /// 时间书签（用于筛选数据范围） /// @@ -777,6 +778,10 @@ namespace BLL /// public const string EntryTrainTypeId = "dfb6a37e-4412-4ba9-ad59-3bc505bc21f7"; /// + /// 培训类型——专项安全培训ID + /// + public static string SpecialSafeTrainId = "0e7fdf78-eaa0-4d00-a60b-490040bbea18"; + /// /// 培训类型——检查重修培训 /// public const string RetakeCourseTrainTypeId = "2F687916-5E31-4DF3-97A3-E33E108C8070"; @@ -6325,10 +6330,6 @@ namespace BLL /// 实业数据 /// public const string Project_SYHSEData_SYHSEMenuId = ""; - /// - /// 专项安全培训 id - /// - public static string SpecialSafeTrainId = "0e7fdf78-eaa0-4d00-a60b-490040bbea18"; #endregion /// diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 476c613..2f43442 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -305,6 +305,7 @@ + @@ -3424,6 +3425,7 @@ + @@ -8049,6 +8051,13 @@ mainMenu_SYHSEN.aspx + + mainProjectNew.aspx + ASPXCodeBehind + + + mainProjectNew.aspx + mainProjectSY.aspx ASPXCodeBehind @@ -19239,6 +19248,13 @@ SafetyInstitutionEdit.aspx + + BoardData.aspx + ASPXCodeBehind + + + BoardData.aspx + FileCabinetA.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx index 2e88d24..ab3d297 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx @@ -9,100 +9,108 @@
- - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - -
-
-
-
-
-
-
百万工时
-
657.32
-
-
-
-
-
承包商数量
-
0个
-
-
-
-
-
作业人员
-
0人
-
-
-
-
-
培训课时
-
0小时
-
-
- <%--
-
-
特种作业（工作票）
-
0项
-
-
--%> -
-
-
高危作业
-
0项
-
-
-
-
-
项目停工
-
0次
-
-
-
-
天气原因
-
0 次
-
-
-
天气原因
-
0 次
-
-
-
天气原因
-
0 次
-
-
-
- <%--
-
-
项目总数
-
0个
-
-
-
-
A级
-
0 个
-
-
-
B级
-
0 个
-
-
-
C级
-
0 个
-
-
-
--%> -
-
-
安全费用
-
0万元
-
-
-
-
已使用
-
0 万元
-
-
-
未归集
-
0 万元
-
-
-
-
-
-
应急演练
-
0次
-
-
-
应急物品
-
0项
-
-
-
应急药品
-
0项
-
-
- -
-
-
领导个人行动计划
-
0次
-
-
-
安全行为观察与沟通
-
0次
-
-
-
-
-
-
-
0 个
-
在建项目
-
-
-
0 个
-
参建人数
-
-
-
-
-
-
-
-
-
-
-
危害因素
-
0项
-
-
-
-
低风险
-
0 项
-
-
-
一般风险
-
0 项
-
-
-
较大风险
-
0 项
-
-
-
重大风险
-
0 项
-
-
-
-
-
-
-
质量问题
-
0项
-
-
-
-
已整改
-
0项
-
-
-
-
-
安全问题
-
0项
-
-
-
-
已整改
-
0项
-
-
-
-
项目停工
-
0个
-
-
-
-
管控红线问题
-
0 项
-
-
-
较大隐患及停工项问题
-
0 项
-
-
-
-
-
-
特种设备/日检查
-
0次
-
-
-
特种设备/周排查
-
0项
-
-
-
特种设备/月调度情况
-
0项
-
-
-
-
-
参与五星计划
-
0人次
-
-
-
-
五星
-
0 人
-
-
-
四星
-
0 人
-
-
-
三星
-
0 人
-
-
-
二星
-
0 人
-
-
-
- -
-
-
一般隐患
-
0次
-
-
-
较大隐患
-
0次
-
-
- -
-
HSE监管片区责任和网格化管理情况
-
-
-
- <%--
- -
--%> -
-
-
-
-
-
-
-
- - - - - - diff --git a/SGGL/FineUIPro.Web/common/mainNew.aspx.cs b/SGGL/FineUIPro.Web/common/mainNew.aspx.cs deleted file mode 100644 index fb1a2e2..0000000 --- a/SGGL/FineUIPro.Web/common/mainNew.aspx.cs +++ /dev/null @@ -1,233 +0,0 @@ -using BLL; -using FineUIPro.Web.DataShow; -using Newtonsoft.Json; -using NPOI.SS.Util; -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.IO; -using System.Linq; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.common -{ - public partial class mainNew : PageBase - { - protected void Page_Load(object sender, EventArgs e) - { - if (!IsPostBack) { - Model.SGGLDB db = Funs.DB; - - ////项目信息 - getProjectInfo(db); - - //加载看板数据 - loadData(); - } - } - - #region 项目信息 - protected string ProjectInfo; - /// - /// 项目信息 - /// - private List getProjectInfo(Model.SGGLDB db) - { - ProjectInfo = "[]"; - var getProjects = db.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && (x.IsDelete == null || x.IsDelete == false)); - - - string picHtml = ""; - - - var getP = from x in db.InformationProject_Picture - join y in db.AttachFile on x.PictureId equals y.ToKeyId - where y.AttachFileId != null && y.AttachUrl != null - orderby x.UploadDate descending - select new { x.PictureId, x.Title, x.UploadDate, y.AttachUrl }; - - - if (getP.Count() > 0) - { - foreach (var item in getP) - { - var geturl = Funs.GetStrListByStr(item.AttachUrl, ','); - foreach (var itemurl in geturl) - { - if (!string.IsNullOrEmpty(itemurl)) - { - - picHtml += @"
"; - } - } - } - } - - - //foreach (var p in getProjects) - //{ - // try - // { - // string res = AttachFileService.getFileUrl(p.ProjectId, BLL.Const.SeverProjectSetMenuId); - // string[] urls = res.Split(','); - // foreach (string u in urls) - // { - // if (!string.IsNullOrEmpty(u)) - // { - // picHtml += @"
"; - // } - // } - // } - // catch (Exception ex) { } - - //} - //divProjectPic.InnerHtml = picHtml; - var array = new DecimalFormat(",###").Format(getProjects.Count()).ToArray(); - string projectNum = ""; - - foreach (var s in array) - { - if (s != ',') - { - projectNum += "" + s + ""; - } - else - { - projectNum += "" + s + ""; - } - - } - this.divProjectNum.InnerHtml = projectNum; - var persons = from x in db.SitePerson_Person - where x.IsUsed == true - select x; - var array2 = new DecimalFormat(",###").Format(persons.Count()).ToArray(); - string personsNum = ""; - - foreach (var s in array2) - { - if (s != ',') - { - personsNum += "" + s + ""; - } - else - { - personsNum += "" + s + ""; - } - - } - this.divJoinConstructionPersonNum.InnerHtml = personsNum; - var getProjectMap = getProjects.Where(x => x.MapCoordinates.Length > 0); - if (getProjectMap.Count() > 0) - { - List list = new List(); - foreach (var item in getProjectMap) - { - Model.SingleSerie newS = new Model.SingleSerie - { - name = "【项目名称】：" + item.ProjectName - //+ "
【项目状态】：" + GetProjectState(item.ProjectId) - + "
【开工时间】：" + string.Format("{0:yyyy-MM-dd}", item.StartDate) - + "
【竣工时间】：" + string.Format("{0:yyyy-MM-dd}", item.EndDate) - + "
【项目地址】：" + item.ProjectAddress + "@" + "indexProject.aspx?projectId=" + item.ProjectId, - //url = "indexProject.aspx?projectId=" + item.ProjectId, - cityname = "中国" - }; - var strMap = Funs.GetStrListByStr(item.MapCoordinates, ','); - if (strMap.Count > 1) - { - newS.value = new[] { Funs.GetNewDecimalOrZero(strMap[0]), Funs.GetNewDecimalOrZero(strMap[1]) }; - list.Add(newS); - } - } - ProjectInfo = JsonConvert.SerializeObject(list); - } - - return getProjects.ToList(); - } - #endregion - - protected void loadData() { - var data = Funs.DB.Sys_Const.Where(x => x.GroupId == "BoardData").ToList(); - if (data.Count > 0) { - #region 加载数据 - NumberBox1.InnerHtml = data.Where(x => x.ConstText == "NumberBox1").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString(); - - NumberBox2.InnerHtml = data.Where(x => x.ConstText == "NumberBox2").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox3.InnerHtml = data.Where(x => x.ConstText == "NumberBox3").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox4.InnerHtml = data.Where(x => x.ConstText == "NumberBox4").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString(); - //NumberBox5.InnerHtml = data.Where(x => x.ConstText == "NumberBox5").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox6.InnerHtml = data.Where(x => x.ConstText == "NumberBox6").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox7.InnerHtml = data.Where(x => x.ConstText == "NumberBox7").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox8.InnerHtml = data.Where(x => x.ConstText == "NumberBox8").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox9.InnerHtml = data.Where(x => x.ConstText == "NumberBox9").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox10.InnerHtml = data.Where(x => x.ConstText == "NumberBox10").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - //NumberBox11.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox11").ConstValue; - //NumberBox12.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox12").ConstValue; - //NumberBox13.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox13").ConstValue; - //NumberBox14.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox14").ConstValue; - NumberBox15.InnerHtml = data.Where(x => x.ConstText == "NumberBox15").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox16.InnerHtml = data.Where(x => x.ConstText == "NumberBox16").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox17.InnerHtml = data.Where(x => x.ConstText == "NumberBox17").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox18.InnerHtml = data.Where(x => x.ConstText == "NumberBox18").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox19.InnerHtml = data.Where(x => x.ConstText == "NumberBox19").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox20.InnerHtml = data.Where(x => x.ConstText == "NumberBox20").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - - NumberBox21.InnerHtml = data.Where(x => x.ConstText == "NumberBox21").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox22.InnerHtml = data.Where(x => x.ConstText == "NumberBox22").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox23.InnerHtml = data.Where(x => x.ConstText == "NumberBox23").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox24.InnerHtml = data.Where(x => x.ConstText == "NumberBox24").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox25.InnerHtml = data.Where(x => x.ConstText == "NumberBox25").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox26.InnerHtml = data.Where(x => x.ConstText == "NumberBox26").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox27.InnerHtml = data.Where(x => x.ConstText == "NumberBox27").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox28.InnerHtml = data.Where(x => x.ConstText == "NumberBox28").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox29.InnerHtml = data.Where(x => x.ConstText == "NumberBox29").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox30.InnerHtml = data.Where(x => x.ConstText == "NumberBox30").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox31.InnerHtml = data.Where(x => x.ConstText == "NumberBox31").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox32.InnerHtml = data.Where(x => x.ConstText == "NumberBox32").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox33.InnerHtml = data.Where(x => x.ConstText == "NumberBox33").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox34.InnerHtml = data.Where(x => x.ConstText == "NumberBox34").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox35.InnerHtml = data.Where(x => x.ConstText == "NumberBox35").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox36.InnerHtml = data.Where(x => x.ConstText == "NumberBox36").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox37.InnerHtml = data.Where(x => x.ConstText == "NumberBox37").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox38.InnerHtml = data.Where(x => x.ConstText == "NumberBox38").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox39.InnerHtml = data.Where(x => x.ConstText == "NumberBox39").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox40.InnerHtml = data.Where(x => x.ConstText == "NumberBox40").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox41.InnerHtml = data.Where(x => x.ConstText == "NumberBox41").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox42.InnerHtml = data.Where(x => x.ConstText == "NumberBox42").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox43.InnerHtml = data.Where(x => x.ConstText == "NumberBox43").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - NumberBox44.InnerHtml = data.Where(x => x.ConstText == "NumberBox44").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString(); - #endregion - } - - //加载附件图片 - var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.MenuId == "087F4FAF-3B00-462A-9040-4CB3556F8177"); - var swpiperHtml = ""; - if (sour!=null) - { - string url = sour.AttachUrl.Replace('\\', '/'); - List list = Funs.GetStrListByStr(url, ','); - if (list.Count() > 0) - { - int i = 0; - foreach (var item in list) - { - string atturl = Funs.RootPath + item.Replace(';', ' ').Trim(); - if (File.Exists(atturl)) - { - swpiperHtml += "
"; - swpiperHtml += ""; - swpiperHtml += "
"; - } - } - swiper_div.InnerHtml = swpiperHtml; - - - } - } - - } - } -} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/mainNew.aspx.designer.cs b/SGGL/FineUIPro.Web/common/mainNew.aspx.designer.cs deleted file mode 100644 index e21dcca..0000000 --- a/SGGL/FineUIPro.Web/common/mainNew.aspx.designer.cs +++ /dev/null @@ -1,404 +0,0 @@ -//------------------------------------------------------------------------------ -// <自动生成> -// 此代码由工具生成。 -// -// 对此文件的更改可能导致不正确的行为，如果 -// 重新生成代码，则所做更改将丢失。 -// -//------------------------------------------------------------------------------ - -namespace FineUIPro.Web.common -{ - - - public partial class mainNew - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - - /// - /// NumberBox1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox1; - - /// - /// NumberBox2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox2; - - /// - /// NumberBox3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox3; - - /// - /// NumberBox4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox4; - - /// - /// NumberBox6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox6; - - /// - /// NumberBox7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox7; - - /// - /// NumberBox8 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox8; - - /// - /// NumberBox9 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox9; - - /// - /// NumberBox10 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox10; - - /// - /// NumberBox15 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox15; - - /// - /// NumberBox16 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox16; - - /// - /// NumberBox17 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox17; - - /// - /// NumberBox18 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox18; - - /// - /// NumberBox19 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox19; - - /// - /// NumberBox20 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox20; - - /// - /// NumberBox39 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox39; - - /// - /// NumberBox40 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox40; - - /// - /// divProjectNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divProjectNum; - - /// - /// divJoinConstructionPersonNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divJoinConstructionPersonNum; - - /// - /// NumberBox21 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox21; - - /// - /// NumberBox41 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox41; - - /// - /// NumberBox23 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox23; - - /// - /// NumberBox42 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox42; - - /// - /// NumberBox22 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox22; - - /// - /// NumberBox24 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox24; - - /// - /// NumberBox25 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox25; - - /// - /// NumberBox26 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox26; - - /// - /// NumberBox27 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox27; - - /// - /// NumberBox28 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox28; - - /// - /// NumberBox29 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox29; - - /// - /// NumberBox30 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox30; - - /// - /// NumberBox31 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox31; - - /// - /// NumberBox32 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox32; - - /// - /// NumberBox33 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox33; - - /// - /// NumberBox34 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox34; - - /// - /// NumberBox35 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox35; - - /// - /// NumberBox36 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox36; - - /// - /// NumberBox37 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox37; - - /// - /// NumberBox38 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox38; - - /// - /// NumberBox43 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox43; - - /// - /// NumberBox44 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox44; - - /// - /// swiper_div 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl swiper_div; - } -} diff --git a/SGGL/Model/APIItem/HSSE/PersonInfoItem.cs b/SGGL/Model/APIItem/HSSE/PersonInfoItem.cs new file mode 100644 index 0000000..ca34e2a --- /dev/null +++ b/SGGL/Model/APIItem/HSSE/PersonInfoItem.cs @@ -0,0 +1,62 @@ + +namespace Model +{ + public class PersonInfoItem + { + /// + /// 人员主键ID + /// + public string PersonId { get; set; } + ///// + ///// 卡号 + ///// + //public string CardNo { get; set; } + /// + /// 姓名 + /// + public string PersonName { get; set; } + + /// + /// 性别 + /// + public string SexName { get; set; } + /// + /// 身份证号码 + /// + public string IdentityCard { get; set; } + /// + /// 电话 + /// + public string Telephone { get; set; } + /// + /// 单位名称 + /// + public string UnitName { get; set; } + /// + /// 班组名称 + /// + public string TeamGroupName { get; set; } + /// + /// 岗位名称 + /// + public string WorkPostName { get; set; } + /// + /// 入场时间 + /// + public string InTime { get; set; } + /// + /// 照片路径 + /// + public string PhotoUrl { get; set; } + + /// + /// HSE分值（本年） + /// + public int HSEScore { get; set; } + /// + /// HSE学时（本年） + /// + public double LearnHour { get; set; } + + } +} diff --git a/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs b/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs index 1a8b852..ca14e47 100644 --- a/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs +++ b/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs @@ -111,5 +111,15 @@ namespace Model get; set; } + /// + /// 是否是重修任务 + /// + public int IsRetakeCourse + { + get; + set; + } + + } } diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj index c99cbaf..55bf0a4 100644 --- a/SGGL/Model/Model.csproj +++ b/SGGL/Model/Model.csproj @@ -125,6 +125,7 @@ + diff --git a/SGGL/WebAPI/Controllers/HSSE/TrainingTaskController.cs b/SGGL/WebAPI/Controllers/HSSE/TrainingTaskController.cs index d16eb50..1273959 100644 --- a/SGGL/WebAPI/Controllers/HSSE/TrainingTaskController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/TrainingTaskController.cs @@ -13,20 +13,21 @@ namespace WebAPI.Controllers ///
public class TrainingTaskController : ApiController { - #region 根据ProjectId、PersonId获取培训任务教材明细列表 + #region 根据ProjectId、PersonId获取培训任务列表 /// /// 根据ProjectId、PersonId获取培训任务教材明细列表 /// /// /// - /// 1-培训中；2-已完成 + /// 是否重修：1：重修任务 + /// 页码 /// - public Model.ResponeData getTrainingTaskListByProjectIdPersonId(string projectId, string personId, int pageIndex) + public Model.ResponeData getTrainingTaskListByProjectIdPersonId(string projectId, string personId, string isRetakeCourse, int pageIndex) { var responeData = new Model.ResponeData(); try { - var getQualityLists = APITrainingTaskService.getTrainingTaskListByProjectIdPersonId(projectId, personId); + var getQualityLists = APITrainingTaskService.getTrainingTaskListByProjectIdPersonId(projectId, personId, isRetakeCourse); int pageCount = getQualityLists.Count; if (pageCount > 0 && pageIndex > 0) { @@ -128,6 +129,14 @@ namespace WebAPI.Controllers } #endregion + /// + /// 维护任务学习时长 + /// + /// + /// + /// + /// + /// [HttpGet] public Model.ResponeData updateTaskItemLearnTime(string taskItemId, DateTime startTime, DateTime endTime, string VideoProgress) { diff --git a/SGGL/WebAPI/Controllers/PersonController.cs b/SGGL/WebAPI/Controllers/Person/PersonController.cs similarity index 96% rename from SGGL/WebAPI/Controllers/PersonController.cs rename to SGGL/WebAPI/Controllers/Person/PersonController.cs index affd0c0..0ae71a2 100644 --- a/SGGL/WebAPI/Controllers/PersonController.cs +++ b/SGGL/WebAPI/Controllers/Person/PersonController.cs @@ -1,24 +1,55 @@ using BLL; +using Model; using System; -using System.Collections.Generic; using System.Linq; using System.Web.Http; -using SgManager.AI; -using System.Configuration; -using Newtonsoft.Json.Linq; -using Newtonsoft.Json; -using Aspose.Words; -using Microsoft.Office.Interop.Excel; -using System.Net; -using System.Web.Http.Results; namespace WebAPI.Controllers { /// - /// + /// 人员信息 /// public class PersonController : ApiController { + #region 根据personid获取人员档案基本信息 + /// + /// 根据personid获取人员档案基本信息 + /// + /// + /// + public Model.ResponeData getPersonInfoByPersonId(string personId) + { + var responeData = new Model.ResponeData(); + try + { + var personData = APIPersonService.getPersonByPersonId(personId); + PersonInfoItem data = new PersonInfoItem(); + data.PersonId = personData.PersonId; + data.PersonName = personData.PersonName; + data.SexName = personData.SexName; + data.IdentityCard = personData.IdentityCard; + data.Telephone = personData.Telephone; + data.UnitName = personData.UnitName; + data.TeamGroupName = personData.TeamGroupName; + data.WorkPostName = personData.WorkPostName; + data.InTime = personData.InTime; + data.PhotoUrl = personData.PhotoUrl; + + //获取用户本年HSE分值、培训学时（待处理） + data.HSEScore = 0; + data.LearnHour = 0; + + responeData.data = data; + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + #endregion + #region 根据personid获取人员信息 /// /// 根据personid获取人员信息 @@ -37,7 +68,6 @@ namespace WebAPI.Controllers responeData.code = 0; responeData.message = ex.Message; } - return responeData; } #endregion @@ -462,10 +492,10 @@ namespace WebAPI.Controllers if (getPerson != null && getPerson.PersonId != person.PersonId && !string.IsNullOrEmpty(person.PersonId)) { - + getPerson.InTime = Funs.GetNewDateTime(person.InTime); getPerson.OutTime = Funs.GetNewDateTime(person.OutTime); - + if (!string.IsNullOrEmpty(person.TeamGroupId)) { getPerson.TeamGroupId = person.TeamGroupId; @@ -502,7 +532,7 @@ namespace WebAPI.Controllers getPerson.WorkPostId = post.WorkPostId; } } - + if (person.IsUsed == true) { getPerson.IsUsed = true; @@ -683,12 +713,12 @@ namespace WebAPI.Controllers /// /// [HttpGet] - public Model.ResponeData getPersonPresenceData(string projectId,DateTime date) + public Model.ResponeData getPersonPresenceData(string projectId, DateTime date) { var responeData = new Model.ResponeData(); try { - responeData.data= APIPersonService.getPersonPresenceData(projectId, date); + responeData.data = APIPersonService.getPersonPresenceData(projectId, date); } catch (Exception ex) { @@ -814,8 +844,8 @@ namespace WebAPI.Controllers x.ExchangeTime, x.ExchangeTime2, x.PhotoUrl, - IsUsed = x.IsUsed?1:0, - BlackList = x.BlackList.HasValue&& x.BlackList.Value ? 1 : 0 + IsUsed = x.IsUsed ? 1 : 0, + BlackList = x.BlackList.HasValue && x.BlackList.Value ? 1 : 0 }; } catch (Exception ex) @@ -835,7 +865,7 @@ namespace WebAPI.Controllers responeData.data = from x in Funs.DB.SitePerson_Person join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId where x.BlackList == null || x.BlackList == false - where x.ProjectId == projectId + where x.ProjectId == projectId && (!x.OutTime.HasValue || x.OutTime > DateTime.Now) && x.InTime.HasValue && x.InTime < DateTime.Now && x.IsUsed == true && x.PhotoUrl != null @@ -877,8 +907,8 @@ namespace WebAPI.Controllers try { responeData.data = from x in Funs.DB.SitePerson_Person - join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId - where x.ProjectId == projectId + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == projectId select new { x.PersonId, @@ -1126,6 +1156,6 @@ namespace WebAPI.Controllers #endregion - + } } \ No newline at end of file diff --git a/SGGL/WebAPI/Filter/TestPermissionAttribute.cs b/SGGL/WebAPI/Filter/TestPermissionAttribute.cs index d93d03b..94250e5 100644 --- a/SGGL/WebAPI/Filter/TestPermissionAttribute.cs +++ b/SGGL/WebAPI/Filter/TestPermissionAttribute.cs @@ -75,41 +75,41 @@ namespace WebAPI.Filter //} //&& !System.Web.HttpContext.Current.User.Identity.IsAuthenticated - if (isOk && lists.FirstOrDefault(x => x == strValues) == null && actionContext.ActionDescriptor.ControllerDescriptor.ControllerName != "FileUpload") - { - isOk = false; - actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK, - new { code = "0", message = "登录超出，请重新登录！" }, actionContext.ControllerContext.Configuration.Formatters.JsonFormatter); + //if (isOk && lists.FirstOrDefault(x => x == strValues) == null && actionContext.ActionDescriptor.ControllerDescriptor.ControllerName != "FileUpload") + //{ + // isOk = false; + // actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK, + // new { code = "0", message = "登录超出，请重新登录！" }, actionContext.ControllerContext.Configuration.Formatters.JsonFormatter); - } + //} //base.OnActionExecuting(actionContext); if (isOk) { - if (!isWithOut) - { - // 在调用 Action 方法之前执行的代码，可获取请求的接口名称和参数 - IDictionary arguments = actionContext.ActionArguments; // 获取参数 - foreach (KeyValuePair item in arguments) - { - if (item.Key.ToLower() == "projectid") - { - var ProjectItems = APIProjectService.geProjectsByUserId(token.FirstOrDefault()); - List projects = new List(); - if (ProjectItems.Count > 0) - { - projects = ProjectItems.Select(x => x.ProjectId).ToList(); - } - if (item.Value != null && !projects.Contains(item.Value.ToString())) - { + //if (!isWithOut) + //{ + // // 在调用 Action 方法之前执行的代码，可获取请求的接口名称和参数 + // IDictionary arguments = actionContext.ActionArguments; // 获取参数 + // foreach (KeyValuePair item in arguments) + // { + // if (item.Key.ToLower() == "projectid") + // { + // var ProjectItems = APIProjectService.geProjectsByUserId(token.FirstOrDefault()); + // List projects = new List(); + // if (ProjectItems.Count > 0) + // { + // projects = ProjectItems.Select(x => x.ProjectId).ToList(); + // } + // if (item.Value != null && !projects.Contains(item.Value.ToString())) + // { - actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK, - new { code = "0", message = "您没有该项目权限！" }, actionContext.ControllerContext.Configuration.Formatters.JsonFormatter); - return; - } - } - } - } + // actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK, + // new { code = "0", message = "您没有该项目权限！" }, actionContext.ControllerContext.Configuration.Formatters.JsonFormatter); + // return; + // } + // } + // } + //} base.OnActionExecuting(actionContext); } else @@ -120,7 +120,7 @@ namespace WebAPI.Filter } /// - /// + /// 授权接口 /// public static List lists = new List { diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml index 8298118..3981e3f 100644 --- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml +++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml @@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU FileSystem - D:\发布 + G:\发布\新疆油建WebApi FileSystem <_TargetId>Folder diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index 67f1dc7..f0fd3ca 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -228,7 +228,7 @@ - +