From 42d3d45c5cfed9f8463cde40170ff297b7953b0d Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 8 Sep 2023 17:09:44 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2023-09-07.sql | 393 +++ SGGL/BLL/API/HSSE/APICheckSpecialService.cs | 8 +- SGGL/BLL/API/HSSE/APILicenseDataService.cs | 507 +++- SGGL/BLL/Common/Const.cs | 9 + SGGL/BLL/HSSE/License/LicensePublicService.cs | 196 +- SGGL/BLL/HSSE/SitePerson/PersonService.cs | 5 +- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 16 + .../HSSE/License/Electricity.aspx | 122 + .../HSSE/License/Electricity.aspx.cs | 1077 ++++++++ .../HSSE/License/Electricity.aspx.designer.cs | 179 ++ .../HSSE/License/ElectricityView.aspx | 259 ++ .../HSSE/License/ElectricityView.aspx.cs | 242 ++ .../License/ElectricityView.aspx.designer.cs | 467 ++++ SGGL/FineUIPro.Web/common/mainProject2.aspx | 2223 +++++++---------- .../APIItem/HSSE/CheckSpecialDetailItem.cs | 2 +- SGGL/Model/APIItem/HSSE/LicenseDataItem.cs | 113 +- 16 files changed, 4544 insertions(+), 1274 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-09-07.sql create mode 100644 SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.designer.cs diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-07.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-07.sql new file mode 100644 index 00000000..25c4a9e7 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-07.sql @@ -0,0 +1,393 @@ +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B','ҵƱ','HSSE/License/FireWork.aspx',10,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('8DB0EAED-B67D-423A-BA13-E7872A11727A','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('F0283058-2CCF-4195-AEBC-878A2AE5067F','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('2C3CD3AA-C07D-439F-97BE-FEA20CE512CB','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('BBB22814-70D3-4188-A7F8-8C0FD4557A27','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B','',4) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9','ߴҵƱ','HSSE/License/HeightWork.aspx',20,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('B3CD11DC-D359-4D60-8DB4-BD095CE52C17','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('6D9B6919-0677-4892-9C73-CDD6C124B855','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('044C6FF2-2A30-4E08-88A6-9D85722AD89C','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('7C06CD77-402A-4F8C-A41B-1C69301707E5','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9','',4) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('AEC9166D-1C91-45F0-8BFE-D3D0479A28C7','޿ռҵƱ','HSSE/License/LimitedSpace.aspx',30,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('904FD3D2-1520-48FB-BD8F-6BAA000653B7','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('7F372BE4-E264-48FB-ACA6-8E7EE41393EC','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('BE6D9AE8-069A-421A-8E3D-F3DDC18FCDB4','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('8CC252A0-F098-4FE3-AF21-4A7A7030DC5E','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7','',4) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('F72FF20B-D3EB-46A5-97F7-C99B2473A140','ҵƱ','HSSE/License/RadialWork.aspx',40,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('107EA8EA-4D8D-410B-B3DE-F0C29E9C3EDC','F72FF20B-D3EB-46A5-97F7-C99B2473A140','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('89010EF9-9E77-49EB-A00D-3142B9FBC29E','F72FF20B-D3EB-46A5-97F7-C99B2473A140','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('F5EFEB84-7CCC-406D-ACFA-CA36CB6A8A1D','F72FF20B-D3EB-46A5-97F7-C99B2473A140','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('982333DA-42A2-40A3-8F3D-52BA7DE4E19D','F72FF20B-D3EB-46A5-97F7-C99B2473A140','',4) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('4E607E83-41FC-4F49-B26F-A21CFE38328F','·(ռ)ҵƱ','HSSE/License/OpenCircuit.aspx',60,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('6D90E4CD-D932-454A-8A8B-54FA3CC22FD4','4E607E83-41FC-4F49-B26F-A21CFE38328F','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('53BF21A8-38DA-4853-A527-8D392B901554','4E607E83-41FC-4F49-B26F-A21CFE38328F','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('06F8CEAB-7AF8-40C5-B6D0-6A91AE562AD7','4E607E83-41FC-4F49-B26F-A21CFE38328F','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('C8BE46DF-2553-4A64-BE79-B69712C297A5','4E607E83-41FC-4F49-B26F-A21CFE38328F','',4) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('755C6AC9-2E38-4D4F-AF33-33CB1744A907','ҵƱ','HSSE/License/BreakGround.aspx',70,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('F3D52EF3-104F-42CF-B48A-443FCE5C800D','755C6AC9-2E38-4D4F-AF33-33CB1744A907','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('7DFD6886-0F8B-4DA1-9C4B-1847A8B286AF','755C6AC9-2E38-4D4F-AF33-33CB1744A907','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('F5F93A18-438F-4A19-982B-7E9E38EB6AE2','755C6AC9-2E38-4D4F-AF33-33CB1744A907','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('32937824-9F35-4C4E-8E13-984E784F8E9C','755C6AC9-2E38-4D4F-AF33-33CB1744A907','',4) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('7BBAE649-7B00-4475-A911-BFE3A37AC55B','ҹʩҵƱ','HSSE/License/NightWork.aspx',80,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('B040C80B-4216-4AF8-B9C9-A1303E31CFAC','7BBAE649-7B00-4475-A911-BFE3A37AC55B','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('60241503-BF4B-4159-AFA2-41186CD9329B','7BBAE649-7B00-4475-A911-BFE3A37AC55B','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('3A192DC6-2338-4038-ADAD-46FA7364E20F','7BBAE649-7B00-4475-A911-BFE3A37AC55B','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('6239BB95-33AF-4B36-97CB-787EF553D35A','7BBAE649-7B00-4475-A911-BFE3A37AC55B','',4) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('A1BE3AB6-9D4A-41E7-8870-E73423165451','װҵƱ','HSSE/License/LiftingWork.aspx',80,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('BDC9E201-0C51-4C02-9151-B6DF86CE4C27','A1BE3AB6-9D4A-41E7-8870-E73423165451','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('36EBA247-3051-4213-BD95-89DC948006E1','A1BE3AB6-9D4A-41E7-8870-E73423165451','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('46A93981-2D60-49C3-877A-7B66EBCBC927','A1BE3AB6-9D4A-41E7-8870-E73423165451','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('3C5F18F7-459A-4666-B497-9400E637C975','A1BE3AB6-9D4A-41E7-8870-E73423165451','',4) + GO + +update sys_menu set menuname='HSSE¹ʴ' where menuname ='HSSE¹(δ)' + +--Ӷҵֶ +-- +ALTER TABLE License_FireWork +ADD WorkAreaId nvarchar(500) null; +--ԭ +ALTER TABLE License_FireWork +ADD Reason nvarchar(500) null; +--ҵ +ALTER TABLE License_FireWork +ADD FireLevel nvarchar(20) null; + + +--޿ռ +-- +ALTER TABLE License_LimitedSpace +ADD WorkAreaId nvarchar(500) null; +--ռڽ +ALTER TABLE License_LimitedSpace +ADD LimitedDescribe nvarchar(500) null; +--Ƿ +ALTER TABLE License_LimitedSpace +ADD IsBoolOther bit null; +--ҵǷжк +ALTER TABLE License_LimitedSpace +ADD IsBoolHarmfulGas bit null; +--Խ +ALTER TABLE License_LimitedSpace +ADD TestResult nvarchar(500) null; +--ʱ +ALTER TABLE License_LimitedSpace +ADD TestDate datetime null; +-- +ALTER TABLE License_LimitedSpace +ADD TestPerson nvarchar(100) null; +--ͨʩ +ALTER TABLE License_LimitedSpace +ADD VenStep nvarchar(20) null; + + +--ҵƱ +-- +ALTER TABLE License_BreakGround +ADD WorkAreaId nvarchar(500) null; +--ԭ +ALTER TABLE License_BreakGround +ADD Reason nvarchar(500) null; +--໤ +ALTER TABLE License_BreakGround +ADD FireWatchManName nvarchar(500) null; + + +--ߴҵƱ +-- +ALTER TABLE License_HeightWork +ADD WorkAreaId nvarchar(500) null; +--ҵ߶ +ALTER TABLE License_HeightWork +ADD WorkHeight nvarchar(20) null; +--ߴҵ +ALTER TABLE License_HeightWork +ADD HeightLevel nvarchar(20) null; +--໤ +ALTER TABLE License_HeightWork +ADD FireWatchManName nvarchar(500) null; + +-- +ALTER TABLE License_HeightWork +ADD WorkLeaderName nvarchar(200) null; +--˵绰 +ALTER TABLE License_HeightWork +ADD WorkLeaderTel nvarchar(200) null; + +--װ +-- +ALTER TABLE License_LiftingWork +ADD WorkAreaId nvarchar(500) null; +--װ߶ +ALTER TABLE License_LiftingWork +ADD LiftingHeight nvarchar(20) null; + +--໤ +ALTER TABLE License_LiftingWork +ADD FireWatchManName nvarchar(500) null; + +-- +ALTER TABLE License_LiftingWork +ADD WorkLeaderName nvarchar(200) null; +--˵绰 +ALTER TABLE License_LiftingWork +ADD WorkLeaderTel nvarchar(200) null; + +--ع +ALTER TABLE License_LiftingWork +ADD QzgName nvarchar(200) null; +--ع绰 +ALTER TABLE License_LiftingWork +ADD QzgPhone nvarchar(200) null; + +--·ҵ +-- +ALTER TABLE License_OpenCircuit +ADD WorkAreaId nvarchar(500) null; +--·ҵԭ +ALTER TABLE License_OpenCircuit +ADD Reason nvarchar(500) null; +--໤ +ALTER TABLE License_OpenCircuit +ADD FireWatchManName nvarchar(500) null; + + +--ҵ +-- +ALTER TABLE License_RadialWork +ADD WorkAreaId nvarchar(500) null; + +--ʱõ˵ +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF5','ʱõҵƱ','HSSE/License/Electricity.aspx',50,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1) +GO +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('4D6FE464-B5D7-48BE-B68D-C55C9E8E6202','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5','',1) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('0086D338-3864-4C90-BEDB-7E752622837D','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5','޸',2) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('184C6276-C8B6-421B-B0F9-A74CDCBA53E9','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5','ɾ',3) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('065EC96A-1AF4-457F-AA13-CEEAB5A0BD7C','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5','',4) +GO +CREATE TABLE [dbo].[License_Electricity]( + [ElectricityId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [LicenseCode] [nvarchar](50) NULL, + [ApplyUnitId] [nvarchar](50) NULL, + [ApplyManId] [nvarchar](50) NULL, + [ApplyDate] [datetime] NULL, + [WorkPalce] [nvarchar](300) NULL, + [WorkDepth] [nvarchar](50) NULL, + [ValidityStartTime] [datetime] NULL, + [ValidityEndTime] [datetime] NULL, + [WorkMeasures] [nvarchar](500) NULL, + [CancelManId] [nvarchar](50) NULL, + [CancelReasons] [nvarchar](200) NULL, + [CancelTime] [datetime] NULL, + [CloseManId] [nvarchar](50) NULL, + [CloseReasons] [nvarchar](200) NULL, + [CloseTime] [datetime] NULL, + [States] [varchar](2) NULL, + [NextManId] [nvarchar](500) NULL, + [OldLicenseId] [nvarchar](50) NULL, + [WorkAreaId] [nvarchar](500) NULL, + [Reason] [nvarchar](500) NULL, + [FireWatchManName] [nvarchar](500) NULL, + CONSTRAINT [PK_License_Electricity] PRIMARY KEY CLUSTERED +( + [ElectricityId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +SET ANSI_PADDING OFF +GO + +ALTER TABLE [dbo].[License_Electricity] WITH CHECK ADD CONSTRAINT [FK_License_Electricity_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[License_Electricity] CHECK CONSTRAINT [FK_License_Electricity_Base_Project] +GO + +ALTER TABLE [dbo].[License_Electricity] WITH CHECK ADD CONSTRAINT [FK_License_Electricity_Base_Unit] FOREIGN KEY([ApplyUnitId]) +REFERENCES [dbo].[Base_Unit] ([UnitId]) +GO + +ALTER TABLE [dbo].[License_Electricity] CHECK CONSTRAINT [FK_License_Electricity_Base_Unit] +GO + +ALTER TABLE [dbo].[License_Electricity] WITH CHECK ADD CONSTRAINT [FK_License_Electricity_Sys_User] FOREIGN KEY([ApplyManId]) +REFERENCES [dbo].[Sys_User] ([UserId]) +GO + +ALTER TABLE [dbo].[License_Electricity] CHECK CONSTRAINT [FK_License_Electricity_Sys_User] +GO + +ALTER TABLE [dbo].[License_Electricity] WITH CHECK ADD CONSTRAINT [FK_License_Electricity_Sys_User2] FOREIGN KEY([CancelManId]) +REFERENCES [dbo].[Sys_User] ([UserId]) +GO + +ALTER TABLE [dbo].[License_Electricity] CHECK CONSTRAINT [FK_License_Electricity_Sys_User2] +GO + +ALTER TABLE [dbo].[License_Electricity] WITH CHECK ADD CONSTRAINT [FK_License_Electricity_Sys_User3] FOREIGN KEY([CloseManId]) +REFERENCES [dbo].[Sys_User] ([UserId]) +GO + +ALTER TABLE [dbo].[License_Electricity] CHECK CONSTRAINT [FK_License_Electricity_Sys_User3] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'ElectricityId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'LicenseCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'뵥ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'ApplyUnitId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'ApplyManId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'ApplyDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵص' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'WorkPalce' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'WorkDepth' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Чڿʼʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'ValidityStartTime' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Чڽʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'ValidityEndTime' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵݡ߼ȫʩ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'WorkMeasures' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ȡID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'CancelManId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ȡԭ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'CancelReasons' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ȡʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'CancelTime' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'رID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'CloseManId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'رԭ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'CloseReasons' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'رʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'CloseTime' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬(0-ύ1-У2-ɣ3-رգ-1ȡ)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'States' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'²ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'NextManId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԭ֤ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'OldLicenseId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵƱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity' +GO + +--ʱõ簲װ +ALTER TABLE License_Electricity +ADD WorkLeaderName nvarchar(200) null; +--ʱõ簲װ˵绰 +ALTER TABLE License_Electricity +ADD WorkLeaderTel nvarchar(200) null; + +--ʱҵƱ +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF51','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',1,1,1,'ʩλȫԱ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF52','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',2,1,1,'ܰλȫԱ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF53','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',3,1,1,'ܰλרҵʦ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF54','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',3,1,2,'ܰλʩ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF55','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',3,2,1,'λ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF56','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',3,2,2,'ҵλ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF57','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',4,1,1,'',1) + +--ҵ +insert into Sys_Const(id,ConstValue,ConstText,SortIndex,GroupId) +values('8A1DF18E-4CE6-4AA1-AD2C-625823BC4D8E','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5','ʱõҵƱ',9,'LicenseType') + +--ҵһ +delete from Sys_MenuFlowOperate where flowStep!=1 +update Sys_MenuFlowOperate set auditflowname='' + + + diff --git a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs index 7a6318bf..03c4a833 100644 --- a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs +++ b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs @@ -237,7 +237,7 @@ namespace BLL CheckItemDetailSetId = x.CheckItemSetId, CheckItemDetailContent = x.CheckItemSetContent, - Rectification_Date = x.Rectification_Date + Rectification_Date = string.Format("{0:yyyy-MM-dd}", x.Rectification_Date), }; return getInfo.ToList(); } @@ -289,7 +289,7 @@ namespace BLL CheckItemDetailSetId=x.CheckItemSetId, CheckItemDetailContent=x.CheckItemSetContent, - Rectification_Date=x.Rectification_Date + Rectification_Date= string.Format("{0:yyyy-MM-dd}", x.Rectification_Date), }; return getInfo.First(); } @@ -328,7 +328,7 @@ namespace BLL //整改日期、检查内容、检查内容id CheckItemSetId= newDetail.CheckItemDetailSetId, CheckItemSetContent= newDetail.CheckItemDetailContent, - Rectification_Date=newDetail.Rectification_Date + Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date) }; if (newCheckSpecialDetail.CompleteStatus == false && newCheckSpecialDetail.HandleStep.Contains("1") && string.IsNullOrEmpty(newCheckSpecialDetail.HiddenHazardType)) { @@ -374,7 +374,7 @@ namespace BLL //整改日期、检查内容、检查内容id updateDetail.CheckItemSetId = newDetail.CheckItemDetailSetId; updateDetail.CheckItemSetContent = newDetail.CheckItemDetailContent; - updateDetail.Rectification_Date = newDetail.Rectification_Date; + updateDetail.Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date); db.SubmitChanges(); } ////保存附件 diff --git a/SGGL/BLL/API/HSSE/APILicenseDataService.cs b/SGGL/BLL/API/HSSE/APILicenseDataService.cs index 7fcf5dd7..7294d538 100644 --- a/SGGL/BLL/API/HSSE/APILicenseDataService.cs +++ b/SGGL/BLL/API/HSSE/APILicenseDataService.cs @@ -58,6 +58,11 @@ namespace BLL AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.FireWorkId).AttachUrl.Replace('\\', '/'), States = x.States, OldLicenseId = x.OldLicenseId, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + Reason = x.Reason, + FireLevel = x.FireLevel }).FirstOrDefault(); } #endregion @@ -96,6 +101,14 @@ namespace BLL AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.HeightWorkId).AttachUrl.Replace('\\', '/'), States = x.States, OldLicenseId = x.OldLicenseId, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + WorkHeight = x.WorkHeight, + HeightLevel = x.HeightLevel, + FireWatchManName = x.FireWatchManName, + WorkLeaderName = x.WorkLeaderName, + WorkLeaderTel = x.WorkLeaderTel, }).FirstOrDefault(); } #endregion @@ -134,6 +147,16 @@ namespace BLL AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.LimitedSpaceId).AttachUrl.Replace('\\', '/'), States = x.States, OldLicenseId = x.OldLicenseId, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + LimitedDescribe = x.LimitedDescribe, + IsBoolOther = x.IsBoolOther, + IsBoolHarmfulGas = x.IsBoolHarmfulGas, + TestResult = x.TestResult, + TestDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestDate), + TestPerson = x.TestPerson, + VenStep = x.VenStep, }).FirstOrDefault(); } #endregion @@ -177,6 +200,9 @@ namespace BLL AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.RadialWorkId).AttachUrl.Replace('\\', '/'), States = x.States, OldLicenseId = x.OldLicenseId, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), }).FirstOrDefault(); } #endregion @@ -215,6 +241,11 @@ namespace BLL AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.OpenCircuitId).AttachUrl.Replace('\\', '/'), States = x.States, OldLicenseId = x.OldLicenseId, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + Reason = x.Reason, + FireWatchManName = x.FireWatchManName, }).FirstOrDefault(); } #endregion @@ -252,6 +283,11 @@ namespace BLL AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.BreakGroundId).AttachUrl.Replace('\\', '/'), States = x.States, OldLicenseId = x.OldLicenseId, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + Reason = x.Reason, + FireWatchManName = x.FireWatchManName, }).FirstOrDefault(); } #endregion @@ -332,6 +368,60 @@ namespace BLL AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.LiftingWorkId).AttachUrl.Replace('\\', '/'), States = x.States, OldLicenseId = x.OldLicenseId, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + LiftingHeight = x.LiftingHeight, + FireWatchManName = x.FireWatchManName, + WorkLeaderName = x.WorkLeaderName, + WorkLeaderTel = x.WorkLeaderTel, + QzgName = x.QzgName, + QzgPhone = x.QzgPhone, + }).FirstOrDefault(); + } + #endregion + + #region 临时用电作业票 + if (strMenuId == Const.ProjectElectricityMenuId) + { + getInfo = (from x in db.License_Electricity + where x.ElectricityId == id + select new Model.LicenseDataItem + { + LicenseId = x.ElectricityId, + MenuId = strMenuId, + ProjectId = x.ProjectId, + LicenseCode = x.LicenseCode, + ApplyUnitId = x.ApplyUnitId, + ApplyUnitName = db.Base_Unit.First(u => u.UnitId == x.ApplyUnitId).UnitName, + ApplyManId = x.ApplyManId, + ApplyManName = db.Sys_User.First(u => u.UserId == x.ApplyManId).UserName, + ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate), + WorkPalce = x.WorkPalce, + WorkDepth = x.WorkDepth, + ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime), + ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime), + WorkMeasures = x.WorkMeasures, + CancelManId = x.CancelManId, + CancelManName = db.Sys_User.First(u => u.UserId == x.CancelManId).UserName, + CancelReasons = x.CancelReasons, + CancelTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CancelTime), + CloseManId = x.CloseManId, + CloseManName = db.Sys_User.First(u => u.UserId == x.CloseManId).UserName, + CloseReasons = x.CloseReasons, + CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime), + NextManId = x.NextManId, + NextManName = db.Sys_User.First(u => u.UserId == x.NextManId).UserName, + AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.ElectricityId).AttachUrl.Replace('\\', '/'), + States = x.States, + OldLicenseId = x.OldLicenseId, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + Reason = x.Reason, + FireWatchManName = x.FireWatchManName, + WorkLeaderName=x.WorkLeaderName, + WorkLeaderTel=x.WorkLeaderTel }).FirstOrDefault(); } #endregion @@ -419,6 +509,11 @@ namespace BLL CloseReasons = x.CloseReasons, CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime), States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + Reason=x.Reason, + FireLevel=x.FireLevel }).ToList(); } #endregion @@ -455,6 +550,15 @@ namespace BLL CloseReasons = x.CloseReasons, CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime), States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + WorkHeight=x.WorkHeight, + HeightLevel=x.HeightLevel, + FireWatchManName=x.FireWatchManName, + WorkLeaderName=x.WorkLeaderName, + WorkLeaderTel=x.WorkLeaderTel, + }).ToList(); } #endregion @@ -491,6 +595,20 @@ namespace BLL CloseReasons = x.CloseReasons, CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime), States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + LimitedDescribe=x.LimitedDescribe, + IsBoolOther=x.IsBoolOther, + IsBoolHarmfulGas=x.IsBoolHarmfulGas, + TestResult=x.TestResult, + TestDate= string.Format("{0:yyyy-MM-dd HH:mm}", x.TestDate), + TestPerson=x.TestPerson, + VenStep=x.VenStep, + + + + }).ToList(); } #endregion @@ -534,6 +652,10 @@ namespace BLL NextManId = x.NextManId, NextManName = db.Sys_User.First(u => u.UserId == x.NextManId).UserName, States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + }).ToList(); } #endregion @@ -570,6 +692,12 @@ namespace BLL CloseReasons = x.CloseReasons, CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime), States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + Reason=x.Reason, + FireWatchManName=x.FireWatchManName, + }).ToList(); } #endregion @@ -605,6 +733,12 @@ namespace BLL CloseReasons = x.CloseReasons, CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime), States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + Reason=x.Reason, + FireWatchManName=x.FireWatchManName, + }).ToList(); } #endregion @@ -685,6 +819,60 @@ namespace BLL NextManId = x.NextManId, NextManName = db.Sys_User.First(u => u.UserId == x.NextManId).UserName, States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + LiftingHeight=x.LiftingHeight, + FireWatchManName=x.FireWatchManName, + WorkLeaderName=x.WorkLeaderName, + WorkLeaderTel=x.WorkLeaderTel, + QzgName=x.QzgName, + QzgPhone=x.QzgPhone, + + }).ToList(); + } + #endregion + + #region 临时用电作业票 + if (strMenuId == Const.ProjectElectricityMenuId) + { + getInfoList = (from x in db.License_Electricity + where x.ProjectId == projectId && (x.ApplyUnitId == unitId || unitId == null) + && (states == null || x.States == states) + orderby x.LicenseCode descending + select new Model.LicenseDataItem + { + LicenseId = x.ElectricityId, + MenuId = strMenuId, + ProjectId = x.ProjectId, + LicenseCode = x.LicenseCode, + ApplyUnitId = x.ApplyUnitId, + ApplyUnitName = db.Base_Unit.First(u => u.UnitId == x.ApplyUnitId).UnitName, + ApplyManId = x.ApplyManId, + ApplyManName = db.Sys_User.First(u => u.UserId == x.ApplyManId).UserName, + ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate), + WorkPalce = x.WorkPalce, + WorkDepth = x.WorkDepth, + ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime), + ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime), + WorkMeasures = x.WorkMeasures, + CancelManId = x.CancelManId, + CancelManName = db.Sys_User.First(u => u.UserId == x.CancelManId).UserName, + CancelReasons = x.CancelReasons, + CancelTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CancelTime), + CloseManId = x.CloseManId, + CloseManName = db.Sys_User.First(u => u.UserId == x.CloseManId).UserName, + CloseReasons = x.CloseReasons, + CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime), + States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + Reason = x.Reason, + FireWatchManName = x.FireWatchManName, + WorkLeaderName=x.WorkLeaderName, + WorkLeaderTel=x.WorkLeaderTel, + }).ToList(); } #endregion @@ -760,6 +948,11 @@ namespace BLL ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime), ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime), States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + Reason = x.Reason, + FireLevel = x.FireLevel }).ToList(); if (getFireWork.Count() > 0) { @@ -788,6 +981,14 @@ namespace BLL ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime), ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime), States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + WorkHeight = x.WorkHeight, + HeightLevel = x.HeightLevel, + FireWatchManName = x.FireWatchManName, + WorkLeaderName = x.WorkLeaderName, + WorkLeaderTel = x.WorkLeaderTel, }).ToList(); if (getHeightWork.Count() > 0) { @@ -815,6 +1016,17 @@ namespace BLL ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime), ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime), States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + LimitedDescribe = x.LimitedDescribe, + IsBoolOther = x.IsBoolOther, + IsBoolHarmfulGas = x.IsBoolHarmfulGas, + TestResult = x.TestResult, + TestDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestDate), + TestPerson = x.TestPerson, + VenStep = x.VenStep, + }).ToList(); if (getLimitedSpace.Count() > 0) { @@ -843,6 +1055,9 @@ namespace BLL ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime), WorkPalce = x.WorkPalce, States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), }).ToList(); if (getRadialWork.Count() > 0) { @@ -871,6 +1086,11 @@ namespace BLL ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime), RoadName = x.RoadName, States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + Reason = x.Reason, + FireWatchManName = x.FireWatchManName, }).ToList(); if (getOpenCircuit.Count() > 0) { @@ -899,6 +1119,11 @@ namespace BLL ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime), ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime), States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + Reason = x.Reason, + FireWatchManName = x.FireWatchManName, }).ToList(); if (getBreakGround.Count() > 0) { @@ -954,6 +1179,15 @@ namespace BLL ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime), ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime), States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + LiftingHeight = x.LiftingHeight, + FireWatchManName = x.FireWatchManName, + WorkLeaderName = x.WorkLeaderName, + WorkLeaderTel = x.WorkLeaderTel, + QzgName = x.QzgName, + QzgPhone = x.QzgPhone, }).ToList(); if (getLiftingWork.Count() > 0) { @@ -961,6 +1195,41 @@ namespace BLL } #endregion + #region 临时用电作业票 + var getElectricity = (from x in db.License_Electricity + where x.ProjectId == projectId && (x.ApplyUnitId == unitId || unitId == null) + && (states == null || x.States == states) + select new Model.LicenseDataItem + { + LicenseId = x.ElectricityId, + MenuId = Const.ProjectElectricityMenuId, + MenuName = "临时用电", + ProjectId = x.ProjectId, + LicenseCode = x.LicenseCode, + ApplyUnitId = x.ApplyUnitId, + ApplyUnitName = db.Base_Unit.First(u => u.UnitId == x.ApplyUnitId).UnitName, + ApplyManId = x.ApplyManId, + ApplyManName = db.Sys_User.First(u => u.UserId == x.ApplyManId).UserName, + ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate), + WorkPalce = x.WorkPalce, + WorkDepth = x.WorkDepth, + ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime), + ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime), + States = x.States, + + WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + Reason = x.Reason, + FireWatchManName = x.FireWatchManName, + WorkLeaderName=x.WorkLeaderName, + WorkLeaderTel=x.WorkLeaderTel, + }).ToList(); + if (getElectricity.Count() > 0) + { + getInfoList.AddRange(getElectricity); + } + #endregion + #region 作业票【定稿 】"待开工"="1";"作业中"="2";"已关闭"="3";"已取消"="-1" var getLicenseManager = (from x in db.License_LicenseManager where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null) @@ -1106,6 +1375,10 @@ namespace BLL CloseTime = Funs.GetNewDateTime(newItem.CloseTime), NextManId = newItem.NextManId, States = newItem.States, + + WorkAreaId=newItem.WorkAreaId, + Reason=newItem.Reason, + FireLevel=newItem.FireLevel }; if (newItem.States == Const.State_0) @@ -1156,6 +1429,10 @@ namespace BLL updateFireWork.WorkMeasures = newFireWork.WorkMeasures; updateFireWork.NextManId = newFireWork.NextManId; updateFireWork.States = newFireWork.States; + + updateFireWork.WorkAreaId = newItem.WorkAreaId; + updateFireWork.Reason = newItem.Reason; + updateFireWork.FireLevel = newItem.FireLevel; } updateFireWork.States = newFireWork.States; } @@ -1186,6 +1463,15 @@ namespace BLL CloseTime = Funs.GetNewDateTime(newItem.CloseTime), NextManId = newItem.NextManId, States = newItem.States, + + WorkAreaId=newItem.WorkAreaId, + WorkHeight=newItem.WorkHeight, + HeightLevel=newItem.HeightLevel, + FireWatchManName=newItem.FireWatchManName, + WorkLeaderName=newItem.WorkLeaderName, + WorkLeaderTel=newItem.WorkLeaderTel, + + }; if (newItem.States == Const.State_0) { @@ -1236,6 +1522,12 @@ namespace BLL updateHeightWork.EquipmentTools = newHeightWork.EquipmentTools; updateHeightWork.NextManId = newHeightWork.NextManId; updateHeightWork.States = newHeightWork.States; + updateHeightWork.WorkAreaId = newItem.WorkAreaId; + updateHeightWork.WorkHeight = newItem.WorkHeight; + updateHeightWork.HeightLevel = newItem.HeightLevel; + updateHeightWork.FireWatchManName = newItem.FireWatchManName; + updateHeightWork.WorkLeaderName = newItem.WorkLeaderName; + updateHeightWork.WorkLeaderTel = newItem.WorkLeaderTel; } updateHeightWork.States = newHeightWork.States; } @@ -1266,6 +1558,14 @@ namespace BLL CloseTime = Funs.GetNewDateTime(newItem.CloseTime), NextManId = newItem.NextManId, States = newItem.States, + + LimitedDescribe=newItem.LimitedDescribe, + IsBoolOther=newItem.IsBoolOther, + IsBoolHarmfulGas=newItem.IsBoolHarmfulGas, + TestResult=newItem.TestResult, + TestDate= Funs.GetNewDateTime(newItem.TestDate), + TestPerson=newItem.TestPerson, + VenStep=newItem.VenStep }; if (newItem.States == Const.State_0) { @@ -1315,6 +1615,14 @@ namespace BLL updateLimitedSpace.WorkMeasures = newLimitedSpace.WorkMeasures; updateLimitedSpace.NextManId = newLimitedSpace.NextManId; updateLimitedSpace.States = newLimitedSpace.States; + + updateLimitedSpace.LimitedDescribe = newItem.LimitedDescribe; + updateLimitedSpace.IsBoolOther = newItem.IsBoolOther; + updateLimitedSpace.IsBoolHarmfulGas = newItem.IsBoolHarmfulGas; + updateLimitedSpace.TestResult = newItem.TestResult; + updateLimitedSpace.TestDate = Funs.GetNewDateTime(newItem.TestDate); + updateLimitedSpace.TestPerson = newItem.TestPerson; + updateLimitedSpace.VenStep = newItem.VenStep; } updateLimitedSpace.States = newLimitedSpace.States; } @@ -1348,6 +1656,8 @@ namespace BLL CloseTime = Funs.GetNewDateTime(newItem.CloseTime), NextManId = newItem.NextManId, States = newItem.States, + + WorkAreaId=newItem.WorkAreaId }; if (newItem.States == Const.State_0) { @@ -1400,6 +1710,7 @@ namespace BLL updateRadialWork.WatchManContact = newRadialWork.WatchManContact; updateRadialWork.NextManId = newRadialWork.NextManId; updateRadialWork.States = newRadialWork.States; + updateRadialWork.WorkAreaId = newItem.WorkAreaId; } updateRadialWork.States = newRadialWork.States; } @@ -1430,6 +1741,11 @@ namespace BLL CloseTime = Funs.GetNewDateTime(newItem.CloseTime), NextManId = newItem.NextManId, States = newItem.States, + + WorkAreaId=newItem.WorkAreaId, + Reason=newItem.Reason, + FireWatchManName=newItem.FireWatchManName, + }; if (newItem.States == Const.State_0) { @@ -1479,6 +1795,10 @@ namespace BLL updateOpenCircuit.SafeMeasures = newOpenCircuit.SafeMeasures; updateOpenCircuit.NextManId = newOpenCircuit.NextManId; updateOpenCircuit.States = newOpenCircuit.States; + + updateOpenCircuit.WorkAreaId = newItem.WorkAreaId; + updateOpenCircuit.Reason = newItem.Reason; + updateOpenCircuit.FireWatchManName = newItem.FireWatchManName; } updateOpenCircuit.States = newOpenCircuit.States; } @@ -1508,6 +1828,10 @@ namespace BLL CloseTime = Funs.GetNewDateTime(newItem.CloseTime), NextManId = newItem.NextManId, States = newItem.States, + + WorkAreaId=newItem.WorkAreaId, + Reason=newItem.Reason, + FireWatchManName=newItem.FireWatchManName }; if (newItem.States == Const.State_0) { @@ -1556,6 +1880,10 @@ namespace BLL updateBreakGround.WorkMeasures = newBreakGround.WorkMeasures; updateBreakGround.NextManId = newBreakGround.NextManId; updateBreakGround.States = newBreakGround.States; + + updateBreakGround.WorkAreaId = newItem.WorkAreaId; + updateBreakGround.Reason = newItem.Reason; + updateBreakGround.FireWatchManName = newItem.FireWatchManName; } updateBreakGround.States = newBreakGround.States; } @@ -1669,6 +1997,15 @@ namespace BLL CloseTime = Funs.GetNewDateTime(newItem.CloseTime), NextManId = newItem.NextManId, States = newItem.States, + + WorkAreaId=newItem.WorkAreaId, + LiftingHeight=newItem.LiftingHeight, + FireWatchManName=newItem.FireWatchManName, + WorkLeaderName=newItem.WorkLeaderName, + WorkLeaderTel=newItem.WorkLeaderTel, + QzgName=newItem.QzgName, + QzgPhone=newItem.QzgPhone, + }; if (newItem.States == Const.State_0) { @@ -1718,12 +2055,112 @@ namespace BLL updateLiftingWork.CraneCapacity = newLiftingWork.CraneCapacity; updateLiftingWork.NextManId = newLiftingWork.NextManId; updateLiftingWork.States = newLiftingWork.States; + + updateLiftingWork.WorkAreaId = newItem.WorkAreaId; + updateLiftingWork.LiftingHeight = newItem.LiftingHeight; + updateLiftingWork.FireWatchManName = newItem.FireWatchManName; + updateLiftingWork.WorkLeaderName = newItem.WorkLeaderName; + updateLiftingWork.WorkLeaderTel = newItem.WorkLeaderTel; + updateLiftingWork.QzgName = newItem.QzgName; + updateLiftingWork.QzgPhone = newItem.QzgPhone; } updateLiftingWork.States = newLiftingWork.States; } } #endregion + #region 临时用电作业票 + if (newItem.MenuId == Const.ProjectElectricityMenuId) + { + Model.License_Electricity newElectricity = new Model.License_Electricity + { + ElectricityId = strLicenseId, + ProjectId = projectId, + LicenseCode = newItem.LicenseCode, + ApplyUnitId = newItem.ApplyUnitId, + ApplyManId = newItem.ApplyManId, + ApplyDate = Funs.GetNewDateTime(newItem.ApplyDate), + WorkPalce = newItem.WorkPalce, + WorkDepth = newItem.WorkDepth, + ValidityStartTime = Funs.GetNewDateTime(newItem.ValidityStartTime), + ValidityEndTime = Funs.GetNewDateTime(newItem.ValidityEndTime), + WorkMeasures = newItem.WorkMeasures, + CancelManId = newItem.CancelManId, + CancelReasons = newItem.CancelReasons, + CancelTime = Funs.GetNewDateTime(newItem.CancelTime), + CloseManId = newItem.CloseManId, + CloseReasons = newItem.CloseReasons, + CloseTime = Funs.GetNewDateTime(newItem.CloseTime), + NextManId = newItem.NextManId, + States = newItem.States, + + WorkAreaId = newItem.WorkAreaId, + Reason = newItem.Reason, + FireWatchManName = newItem.FireWatchManName, + WorkLeaderName= newItem.WorkLeaderName, + WorkLeaderTel = newItem.WorkLeaderTel + }; + if (newItem.States == Const.State_0) + { + newElectricity.NextManId = newItem.ApplyManId; + } + ////保存 + var updateElectricity = db.License_Electricity.FirstOrDefault(x => x.ElectricityId == strLicenseId); + if (updateElectricity == null) + { + newElectricity.ApplyDate = DateTime.Now; + strLicenseId = newElectricity.ElectricityId = SQLHelper.GetNewID(); + newElectricity.OldLicenseId = newItem.OldLicenseId; + newItem.LicenseCode = newElectricity.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectElectricityMenuId, newElectricity.ProjectId, newElectricity.ApplyUnitId); + db.License_Electricity.InsertOnSubmit(newElectricity); + ////增加一条编码记录 + CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectElectricityMenuId, newElectricity.ProjectId, newElectricity.ApplyUnitId, newElectricity.ElectricityId, newElectricity.ApplyDate); + } + else + { + if (newItem.States == Const.State_3) + { + updateElectricity.CloseManId = newElectricity.CloseManId; + updateElectricity.CloseReasons = newElectricity.CloseReasons; + updateElectricity.CloseTime = DateTime.Now; + if (newElectricity.ValidityEndTime.HasValue && newElectricity.ValidityEndTime < DateTime.Now) + { + updateElectricity.CloseTime = newElectricity.ValidityEndTime; + } + } + else if (newItem.States == Const.State_R) + { + updateElectricity.CancelManId = newElectricity.CancelManId; + updateElectricity.CancelReasons = newElectricity.CancelReasons; + updateElectricity.CancelTime = DateTime.Now; + if (newElectricity.ValidityEndTime.HasValue && newElectricity.ValidityEndTime < DateTime.Now) + { + updateElectricity.CancelTime = newElectricity.ValidityEndTime; + } + } + else + { + updateElectricity.WorkPalce = newElectricity.WorkPalce; + updateElectricity.WorkDepth = newElectricity.WorkDepth; + updateElectricity.ValidityStartTime = newElectricity.ValidityStartTime; + updateElectricity.ValidityEndTime = newElectricity.ValidityEndTime; + updateElectricity.WorkMeasures = newElectricity.WorkMeasures; + updateElectricity.NextManId = newElectricity.NextManId; + updateElectricity.States = newElectricity.States; + + updateElectricity.WorkAreaId = newItem.WorkAreaId; + updateElectricity.Reason = newItem.Reason; + updateElectricity.FireWatchManName = newItem.FireWatchManName; + updateElectricity.WorkLeaderName = newItem.WorkLeaderName; + updateElectricity.WorkLeaderTel = newItem.WorkLeaderTel; + + + } + updateElectricity.States = newElectricity.States; + } + } + #endregion + #region 作业票【定稿】 if (newItem.MenuId == Const.ProjectLicenseManagerMenuId) { @@ -1880,23 +2317,26 @@ namespace BLL #region 新增下一步审核记录 if (newItem.IsAgree == true) { - var getCloseAllOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId && (!x.IsClosed.HasValue || x.IsClosed == false) && (!x.IsFlowEnd.HasValue || x.IsFlowEnd == false)); - if (getCloseAllOperate == null) - { - var getNextFlowOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId && x.IsFlowEnd == true); - ////判断审核步骤是否结束 - if (getNextFlowOperate != null) - { - /////最后一步是关闭所有 步骤 - getNextFlowOperate.IsClosed = true; + //修改只需要一个人审批直接通过 + + //var getCloseAllOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId && (!x.IsClosed.HasValue || x.IsClosed == false) && (!x.IsFlowEnd.HasValue || x.IsFlowEnd == false)); + //if (getCloseAllOperate == null) + //{ + //var getNextFlowOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId && x.IsFlowEnd == true); + var getNextFlowOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId); + // ////判断审核步骤是否结束 + // if (getNextFlowOperate != null) + // { + /////最后一步是关闭所有 步骤 + getNextFlowOperate.IsClosed = true; getNextFlowOperate.OperaterTime = DateTime.Now; getNextFlowOperate.IsAgree = true; getNextFlowOperate.OperaterId = newItem.OperaterId; getNextFlowOperate.Opinion = "审核完成！"; boolIsFlowEnd = true; db.SubmitChanges(); - } - } + // } + //} #region 动火作业票 if (strMenuId == Const.ProjectFireWorkMenuId) @@ -2163,6 +2603,39 @@ namespace BLL } #endregion + #region 临时用电作业票 + if (strMenuId == Const.ProjectElectricityMenuId) + { + var getElectricity = db.License_Electricity.FirstOrDefault(x => x.ElectricityId == updateFlowOperate.DataId); + if (getElectricity != null) + { + getElectricity.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) + { + if (boolIsFlowEnd == true) + { + getElectricity.NextManId = null; + getElectricity.States = Const.State_2; + if (getElectricity.ValidityStartTime.HasValue && getElectricity.ValidityStartTime < DateTime.Now) + { + int days = 7; + if (getElectricity.ValidityEndTime.HasValue) + { + days = Convert.ToInt32((getElectricity.ValidityEndTime - getElectricity.ValidityStartTime).Value.TotalDays); + } + getElectricity.ValidityStartTime = DateTime.Now; + getElectricity.ValidityEndTime = DateTime.Now.AddDays(days); + } + } + } + else + { + getElectricity.States = Const.State_0; + } + db.SubmitChanges(); + } + } + #endregion if (!boolIsFlowEnd && !string.IsNullOrEmpty(newItem.NextOperaterId)) { List getUserIds = Funs.GetStrListByStr(newItem.NextOperaterId, ','); @@ -2291,6 +2764,7 @@ namespace BLL var getAllFlows = from x in db.License_FlowOperate where x.DataId == licenseInfo.LicenseId && (!x.IsFlowEnd.HasValue || x.IsFlowEnd == false) select x; + if (licenseInfo == null || string.IsNullOrEmpty(licenseInfo.LicenseId) || getAllFlows.Count() == 0) { getFlowOperate = (from x in db.Sys_MenuFlowOperate @@ -2617,6 +3091,17 @@ namespace BLL } #endregion + #region 临时用电作业票 + else if (newItem.MenuId == Const.ProjectElectricityMenuId) + { + var updateElectricity = db.License_Electricity.FirstOrDefault(x => x.ElectricityId == strLicenseId); + if (updateElectricity == null) + { + updateElectricity.NextManId = null; + updateElectricity.States = Const.State_C; + } + } + #endregion db.SubmitChanges(); } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 91bcdee0..699a4762 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -291,6 +291,11 @@ namespace BLL /// public static string WorkPost_SafetyManager = "e426e560-9906-4aba-843e-2daef9ebeb05"; + /// + /// HSE副经理岗位Id + /// + public static string WorkPost_SafetyManagerFu = "46AA7960-1D35-4D5B-8C8F-AA4C874D63C8"; + /// /// 无损检测工岗位Id /// @@ -1946,6 +1951,10 @@ namespace BLL /// 吊装作业票 /// public const string ProjectLiftingWorkMenuId = "A1BE3AB6-9D4A-41E7-8870-E73423165451"; + /// + /// 临时用电作业票 + /// + public const string ProjectElectricityMenuId = "48F64E0F-38B2-4BDC-9B61-6200BD02CBF5"; #endregion #region HSSE检查管理 diff --git a/SGGL/BLL/HSSE/License/LicensePublicService.cs b/SGGL/BLL/HSSE/License/LicensePublicService.cs index cc73baf2..658271d8 100644 --- a/SGGL/BLL/HSSE/License/LicensePublicService.cs +++ b/SGGL/BLL/HSSE/License/LicensePublicService.cs @@ -76,6 +76,11 @@ namespace BLL CloseTime = fireWork.CloseTime, NextManId=fireWork.NextManId, States = fireWork.States, + + WorkAreaId=fireWork.WorkAreaId, + Reason=fireWork.Reason, + FireLevel=fireWork.FireLevel, + }; db.License_FireWork.InsertOnSubmit(newFireWork); db.SubmitChanges(); @@ -105,7 +110,11 @@ namespace BLL newFireWork.CloseReasons = fireWork.CloseReasons; newFireWork.CloseTime = fireWork.CloseTime; newFireWork.NextManId = fireWork.NextManId; - newFireWork.States = fireWork.States; + newFireWork.States = fireWork.States; + + newFireWork.WorkAreaId = fireWork.WorkAreaId; + newFireWork.Reason = fireWork.Reason; + newFireWork.FireLevel = fireWork.FireLevel; db.SubmitChanges(); } } @@ -172,6 +181,14 @@ namespace BLL CloseTime = heightWork.CloseTime, NextManId = heightWork.NextManId, States = heightWork.States, + + WorkAreaId=heightWork.WorkAreaId, + WorkHeight=heightWork.WorkHeight, + HeightLevel=heightWork.HeightLevel, + FireWatchManName=heightWork.FireWatchManName, + WorkLeaderName=heightWork.WorkLeaderName, + WorkLeaderTel= heightWork.WorkLeaderTel, + }; db.License_HeightWork.InsertOnSubmit(newHeightWork); db.SubmitChanges(); @@ -203,6 +220,13 @@ namespace BLL newHeightWork.CloseTime = heightWork.CloseTime; newHeightWork.NextManId = heightWork.NextManId; newHeightWork.States = heightWork.States; + + newHeightWork.WorkAreaId = heightWork.WorkAreaId; + newHeightWork.WorkHeight = heightWork.WorkHeight; + newHeightWork.HeightLevel = heightWork.HeightLevel; + newHeightWork.FireWatchManName = heightWork.FireWatchManName; + newHeightWork.WorkLeaderName = heightWork.WorkLeaderName; + newHeightWork.WorkLeaderTel = heightWork.WorkLeaderTel; db.SubmitChanges(); } } @@ -269,6 +293,16 @@ namespace BLL CloseTime = limitedSpace.CloseTime, NextManId = limitedSpace.NextManId, States = limitedSpace.States, + + WorkAreaId=limitedSpace.WorkAreaId, + LimitedDescribe=limitedSpace.LimitedDescribe, + IsBoolOther=limitedSpace.IsBoolOther, + IsBoolHarmfulGas=limitedSpace.IsBoolHarmfulGas, + TestResult=limitedSpace.TestResult, + TestDate=limitedSpace.TestDate, + TestPerson=limitedSpace.TestPerson, + VenStep=limitedSpace.VenStep, + }; db.License_LimitedSpace.InsertOnSubmit(newLimitedSpace); db.SubmitChanges(); @@ -299,6 +333,15 @@ namespace BLL newLimitedSpace.CloseTime = limitedSpace.CloseTime; newLimitedSpace.NextManId = limitedSpace.NextManId; newLimitedSpace.States = limitedSpace.States; + + newLimitedSpace.WorkAreaId = limitedSpace.WorkAreaId; + newLimitedSpace.LimitedDescribe = limitedSpace.LimitedDescribe; + newLimitedSpace.IsBoolOther = limitedSpace.IsBoolOther; + newLimitedSpace.IsBoolHarmfulGas = limitedSpace.IsBoolHarmfulGas; + newLimitedSpace.TestResult = limitedSpace.TestResult; + newLimitedSpace.TestDate = limitedSpace.TestDate; + newLimitedSpace.TestPerson = limitedSpace.TestPerson; + newLimitedSpace.VenStep = limitedSpace.VenStep; db.SubmitChanges(); } } @@ -368,6 +411,9 @@ namespace BLL CloseTime = radialWork.CloseTime, NextManId = radialWork.NextManId, States = radialWork.States, + + WorkAreaId=radialWork.WorkAreaId, + }; db.License_RadialWork.InsertOnSubmit(newRadialWork); db.SubmitChanges(); @@ -408,6 +454,8 @@ namespace BLL newRadialWork.CloseTime = radialWork.CloseTime; newRadialWork.NextManId = radialWork.NextManId; newRadialWork.States = radialWork.States; + + newRadialWork.WorkAreaId = radialWork.WorkAreaId; db.SubmitChanges(); } } @@ -476,6 +524,11 @@ namespace BLL CloseTime = openCircuit.CloseTime, NextManId = openCircuit.NextManId, States = openCircuit.States, + + WorkAreaId=openCircuit.WorkAreaId, + Reason=openCircuit.Reason, + FireWatchManName=openCircuit.FireWatchManName, + }; db.License_OpenCircuit.InsertOnSubmit(newOpenCircuit); db.SubmitChanges(); @@ -507,6 +560,10 @@ namespace BLL newOpenCircuit.CloseTime = openCircuit.CloseTime; newOpenCircuit.NextManId = openCircuit.NextManId; newOpenCircuit.States = openCircuit.States; + + newOpenCircuit.WorkAreaId = openCircuit.WorkAreaId; + newOpenCircuit.Reason = openCircuit.Reason; + newOpenCircuit.FireWatchManName = openCircuit.FireWatchManName; db.SubmitChanges(); } } @@ -572,6 +629,11 @@ namespace BLL CloseTime = breakGround.CloseTime, NextManId = breakGround.NextManId, States = breakGround.States, + + WorkAreaId=breakGround.WorkAreaId, + Reason=breakGround.Reason, + FireWatchManName=breakGround.FireWatchManName, + }; db.License_BreakGround.InsertOnSubmit(newBreakGround); db.SubmitChanges(); @@ -602,6 +664,10 @@ namespace BLL newBreakGround.CloseTime = breakGround.CloseTime; newBreakGround.NextManId = breakGround.NextManId; newBreakGround.States = breakGround.States; + + newBreakGround.WorkAreaId = breakGround.WorkAreaId; + newBreakGround.Reason = breakGround.Reason; + newBreakGround.FireWatchManName = breakGround.FireWatchManName; db.SubmitChanges(); } } @@ -771,6 +837,15 @@ namespace BLL CloseTime = liftingWork.CloseTime, NextManId = liftingWork.NextManId, States = liftingWork.States, + + WorkAreaId=liftingWork.WorkAreaId, + LiftingHeight=liftingWork.LiftingHeight, + FireWatchManName=liftingWork.FireWatchManName, + WorkLeaderName=liftingWork.WorkLeaderName, + WorkLeaderTel=liftingWork.WorkLeaderTel, + QzgName=liftingWork.QzgName, + QzgPhone=liftingWork.QzgPhone, + }; db.License_LiftingWork.InsertOnSubmit(newLiftingWork); db.SubmitChanges(); @@ -802,6 +877,14 @@ namespace BLL newLiftingWork.CloseTime = liftingWork.CloseTime; newLiftingWork.NextManId = liftingWork.NextManId; newLiftingWork.States = liftingWork.States; + + newLiftingWork.WorkAreaId = liftingWork.WorkAreaId; + newLiftingWork.LiftingHeight = liftingWork.LiftingHeight; + newLiftingWork.FireWatchManName = liftingWork.FireWatchManName; + newLiftingWork.WorkLeaderName = liftingWork.WorkLeaderName; + newLiftingWork.WorkLeaderTel = liftingWork.WorkLeaderTel; + newLiftingWork.QzgName = liftingWork.QzgName; + newLiftingWork.QzgPhone = liftingWork.QzgPhone; db.SubmitChanges(); } } @@ -828,6 +911,117 @@ namespace BLL } #endregion + #region 临时用电作业票 + /// + /// 根据主键获取临时用电作业票 + /// + /// + /// + public static Model.License_Electricity GetElectricityById(string ElectricityId) + { + return Funs.DB.License_Electricity.FirstOrDefault(e => e.ElectricityId == ElectricityId); + } + + /// + /// 添加临时用电作业票 + /// + /// + public static void AddElectricity(Model.License_Electricity Electricity) + { + Model.SGGLDB db = Funs.DB; + Model.License_Electricity newElectricity = new Model.License_Electricity + { + ElectricityId = Electricity.ElectricityId, + ProjectId = Electricity.ProjectId, + LicenseCode = Electricity.LicenseCode, + ApplyUnitId = Electricity.ApplyUnitId, + ApplyManId = Electricity.ApplyManId, + ApplyDate = Electricity.ApplyDate, + WorkPalce = Electricity.WorkPalce, + WorkDepth = Electricity.WorkDepth, + ValidityStartTime = Electricity.ValidityStartTime, + ValidityEndTime = Electricity.ValidityEndTime, + WorkMeasures = Electricity.WorkMeasures, + CancelManId = Electricity.CancelManId, + CancelReasons = Electricity.CancelReasons, + CancelTime = Electricity.CancelTime, + CloseManId = Electricity.CloseManId, + CloseReasons = Electricity.CloseReasons, + CloseTime = Electricity.CloseTime, + NextManId = Electricity.NextManId, + States = Electricity.States, + + WorkAreaId= Electricity.WorkAreaId, + Reason = Electricity.Reason, + FireWatchManName = Electricity.FireWatchManName, + WorkLeaderName = Electricity.WorkLeaderName, + WorkLeaderTel = Electricity.WorkLeaderTel, + + + }; + db.License_Electricity.InsertOnSubmit(newElectricity); + db.SubmitChanges(); + ////增加一条编码记录 + CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectElectricityMenuId, Electricity.ProjectId, Electricity.ApplyUnitId, Electricity.ElectricityId, Electricity.ApplyDate); + } + + /// + /// 修改临时用电作业票 + /// + /// + public static void UpdateElectricity(Model.License_Electricity Electricity) + { + Model.SGGLDB db = Funs.DB; + Model.License_Electricity newElectricity = db.License_Electricity.FirstOrDefault(e => e.ElectricityId == Electricity.ElectricityId); + if (newElectricity != null) + { + newElectricity.WorkPalce = Electricity.WorkPalce; + newElectricity.WorkDepth = Electricity.WorkDepth; + newElectricity.ValidityStartTime = Electricity.ValidityStartTime; + newElectricity.ValidityEndTime = Electricity.ValidityEndTime; + newElectricity.WorkMeasures = Electricity.WorkMeasures; + newElectricity.CancelManId = Electricity.CancelManId; + newElectricity.CancelReasons = Electricity.CancelReasons; + newElectricity.CancelTime = Electricity.CancelTime; + newElectricity.CloseManId = Electricity.CloseManId; + newElectricity.CloseReasons = Electricity.CloseReasons; + newElectricity.CloseTime = Electricity.CloseTime; + newElectricity.NextManId = Electricity.NextManId; + newElectricity.States = Electricity.States; + + newElectricity.WorkAreaId = Electricity.WorkAreaId; + newElectricity.Reason = Electricity.Reason; + newElectricity.FireWatchManName = Electricity.FireWatchManName; + newElectricity.WorkLeaderName = Electricity.WorkLeaderName; + newElectricity.WorkLeaderTel = Electricity.WorkLeaderTel; + db.SubmitChanges(); + } + } + + /// + /// 根据主键删除临时用电作业票 + /// + /// + public static void DeleteElectricityById(string ElectricityId) + { + Model.SGGLDB db = Funs.DB; + Model.License_Electricity Electricity = db.License_Electricity.FirstOrDefault(e => e.ElectricityId == ElectricityId); + if (Electricity != null) + { + ///删除编码表记录 + CodeRecordsService.DeleteCodeRecordsByDataId(ElectricityId); + ////删除附件 + CommonService.DeleteAttachFileById(ElectricityId); + ///删除-安全措施 + DeleteLicenseItemByDataId(ElectricityId); + ///删除作业票审核信息 + DeleteFlowOperateByDataId(ElectricityId); + db.License_Electricity.DeleteOnSubmit(Electricity); + db.SubmitChanges(); + } + } + #endregion + #endregion #region 作业票-安全措施 diff --git a/SGGL/BLL/HSSE/SitePerson/PersonService.cs b/SGGL/BLL/HSSE/SitePerson/PersonService.cs index 157e8e6e..0abd26a6 100644 --- a/SGGL/BLL/HSSE/SitePerson/PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/PersonService.cs @@ -397,7 +397,10 @@ namespace BLL /// HSE人员的数量 public static int GetHSEPersonCountByUnitId(string unitId, string projectId) { - var q = (from x in Funs.DB.SitePerson_Person where x.UnitId == unitId && x.ProjectId == projectId && (x.WorkPostId == BLL.Const.WorkPost_HSSEEngineer || x.WorkPostId == BLL.Const.WorkPost_SafetyManager) && x.IsUsed == true select x).ToList(); + var q = (from x in Funs.DB.SitePerson_Person + join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId + where x.UnitId == unitId && x.ProjectId == projectId && y.IsHsse==true && x.IsUsed == true select x).ToList(); + //var q = (from x in Funs.DB.SitePerson_Person where x.UnitId == unitId && x.ProjectId == projectId && (x.WorkPostId == BLL.Const.WorkPost_HSSEEngineer || x.WorkPostId == BLL.Const.WorkPost_SafetyManager) && x.IsUsed == true select x).ToList(); return q.Count(); } diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 4e4b636f..60ca25c6 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1062,6 +1062,8 @@ + + @@ -11599,6 +11601,20 @@ BreakGroundView.aspx + + Electricity.aspx + ASPXCodeBehind + + + Electricity.aspx + + + ElectricityView.aspx + ASPXCodeBehind + + + ElectricityView.aspx + EquipmentSafetyList.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx new file mode 100644 index 00000000..11b0ccba --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx @@ -0,0 +1,122 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Electricity.aspx.cs" Inherits="FineUIPro.Web.HSSE.License.Electricity" %> + + + + + + + 临时用电作业票 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs new file mode 100644 index 00000000..0d69be05 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs @@ -0,0 +1,1077 @@ +using Aspose.Words; +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.IO; +using System.Linq; +using System.Text; + +namespace FineUIPro.Web.HSSE.License +{ + public partial class Electricity : PageBase + { + #region 项目主键 + /// + /// 项目主键 + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + Funs.DropDownPageSize(this.ddlPageSize); + ////权限按钮方法 + this.GetButtonPower(); + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } + + UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); + if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId)) + { + this.drpUnit.SelectedValue = this.CurrUser.UnitId; + this.drpUnit.Enabled = false; + } + + this.drpStates.DataValueField = "Value"; + this.drpStates.DataTextField = "Text"; + this.drpStates.DataSource = LicensePublicService.drpStatesItem(); + this.drpStates.DataBind(); + this.drpStates.SelectedValue = Const._Null; + if (this.CurrUser != null && this.CurrUser.PageSize.HasValue) + { + Grid1.PageSize = this.CurrUser.PageSize.Value; + } + this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + // 绑定表格 + this.BindGrid(); + } + } + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = "SELECT license.ElectricityId,license.ProjectId,license.LicenseCode,license.ApplyUnitId,ApplyUnit.UnitName AS ApplyUnitName,license.ApplyManId,license.ApplyDate,license.WorkPalce,license.ValidityStartTime,license.ValidityEndTime,license.WorkMeasures,license.WorkDepth,license.States,license.WorkLeaderTel,license.WorkLeaderName" + + @" ,(CASE WHEN license.States=0 THEN '待提交' WHEN license.States=1 THEN '审核中' WHEN license.States=2 THEN '作业中' WHEN license.States=3 THEN '已关闭' WHEN license.States=-1 THEN '已取消' ELSE '未知' END) AS StatesName " + + @" FROM dbo.License_Electricity AS license " + + @" LEFT JOIN Base_Unit AS ApplyUnit ON license.ApplyUnitId =ApplyUnit.UnitId" + + @" WHERE license.ProjectId= '" + this.ProjectId + "'"; + List listStr = new List(); + + if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId)) + { + strSql += " AND license.ApplyUnitId = @UnitId"; ///状态为已完成 + listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId)); + } + if (this.drpUnit.SelectedValue != Const._Null) + { + strSql += " AND license.ApplyUnitId = @UnitId2"; + listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue)); + } + if (!string.IsNullOrEmpty(this.drpStates.SelectedValue) && this.drpStates.SelectedValue != Const._Null) + { + strSql += " AND license.States = @States"; + listStr.Add(new SqlParameter("@States", this.drpStates.SelectedValue)); + } + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + Grid1.RecordCount = tb.Rows.Count; + + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 分页下拉选择事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + BindGrid(); + } + + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 编辑 + /// + /// 双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 右键编辑事件 + /// + /// + /// + protected void btnMenuView_Click(object sender, EventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ElectricityView.aspx?ElectricityId={0}", id, "查看 - "))); + } + #endregion + + #region 删除 + /// + /// 右键删除事件 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + var Electricity = LicensePublicService.GetElectricityById(rowID); + if (Electricity != null) + { + LogService.AddSys_Log(this.CurrUser, Electricity.LicenseCode, Electricity.ElectricityId, Const.ProjectElectricityMenuId, Const.BtnDelete); + LicensePublicService.DeleteElectricityById(rowID); + } + } + + this.BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectElectricityMenuId); + if (buttonList.Count() > 0) + { + //if (buttonList.Contains(BLL.Const.BtnAdd)) + //{ + // this.btnNew.Hidden = false; + //} + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuView.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnMenuDelete.Hidden = false; + } + } + } + #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("动土作业票" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = Encoding.UTF8; + this.Grid1.PageSize = this.Grid1.RecordCount; + this.BindGrid(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + #endregion + + #region 打印 + protected void btnPrinter_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string Id = Grid1.SelectedRowID; + + string rootPath = Server.MapPath("~/"); + string initTemplatePath = string.Empty; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + string filePath = string.Empty; + initTemplatePath = "File\\Word\\HSSE\\动土作业票.doc"; + uploadfilepath = rootPath + initTemplatePath; + newUrl = uploadfilepath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".doc"); + filePath = initTemplatePath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".pdf"); + File.Copy(uploadfilepath, newUrl); + ///更新书签 + var getElectricity = LicensePublicService.GetElectricityById(Id); + Document doc = new Aspose.Words.Document(newUrl); + Bookmark bookmarkLicenseCode = doc.Range.Bookmarks["LicenseCode"];//编号 + if (bookmarkLicenseCode != null) + { + if (getElectricity != null) + { + bookmarkLicenseCode.Text = getElectricity.LicenseCode; + } + } + Bookmark bookmarkApplyManName = doc.Range.Bookmarks["ApplyManName"];//申请人 + if (bookmarkApplyManName != null) + { + if (getElectricity != null) + { + var getUser = UserService.GetUserByUserId(getElectricity.ApplyManId); + if (getUser != null) + { + bookmarkApplyManName.Text = getUser.UserName; + } + + + } + } + Bookmark bookmarkUnitName = doc.Range.Bookmarks["UnitName"];//申请单位 + if (bookmarkUnitName != null) + { + if (getElectricity != null) + { + if (!string.IsNullOrEmpty(getElectricity.ApplyUnitId)) + { + bookmarkUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(getElectricity.ApplyUnitId); + } + + } + } + Bookmark bookmarkWorkPalce = doc.Range.Bookmarks["WorkPalce"];//作业地点 + if (bookmarkWorkPalce != null) + { + if (getElectricity != null) + { + bookmarkWorkPalce.Text = getElectricity.WorkPalce; + + } + } + Bookmark bookmarkWorkDepth = doc.Range.Bookmarks["WorkDepth"];//开挖深度 + if (bookmarkWorkDepth != null) + { + if (getElectricity != null) + { + bookmarkWorkDepth.Text = getElectricity.WorkDepth; + + } + } + Bookmark bookmarkValidityDate = doc.Range.Bookmarks["ValidityDate"];//有效期限 + if (bookmarkValidityDate != null) + { + if (getElectricity != null) + { + if (getElectricity.ValidityStartTime.HasValue) + { + + bookmarkValidityDate.Text = getElectricity.ValidityStartTime.Value.Year + "年" + getElectricity.ValidityStartTime.Value.Month + "月" + getElectricity.ValidityStartTime.Value.Day + "日" + getElectricity.ValidityStartTime.Value.Hour + "时至"; + if (getElectricity.ValidityEndTime.HasValue) + { + bookmarkValidityDate.Text += getElectricity.ValidityEndTime.Value.Year + "年" + getElectricity.ValidityEndTime.Value.Month + "月" + getElectricity.ValidityEndTime.Value.Day + "日" + getElectricity.ValidityEndTime.Value.Hour + "时"; + } + } + } + } + Bookmark bookmarkWorkMeasures = doc.Range.Bookmarks["WorkMeasures"];//作业内容 + if (bookmarkWorkMeasures != null) + { + if (getElectricity != null) + { + bookmarkWorkMeasures.Text = getElectricity.WorkMeasures; + + } + } + + + + + var GetLicenseItemList = LicensePublicService.GetLicenseItemListByDataId(Id); + if (GetLicenseItemList.Count > 0) + { + var item1 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 1); + if (item1 != null) + { + if (item1.IsUsed == true) + { + Bookmark bookmarkUser1 = doc.Range.Bookmarks["User1"];//确认执行 + if (bookmarkUser1 != null) + { + bookmarkUser1.Text = "√"; + } + } + else + { + Bookmark bookmarkIsFit1 = doc.Range.Bookmarks["IsFit1"]; + if (bookmarkIsFit1 != null) + { + if (item1 != null) + { + bookmarkIsFit1.Text = "×"; + } + } + } + } + + + + var item2 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 2); + if (item2 != null) + { + if (item2.IsUsed == true) + { + Bookmark bookmarkUser2 = doc.Range.Bookmarks["User2"];//确认执行 + if (bookmarkUser2 != null) + { + bookmarkUser2.Text = "√"; + } + } + else + { + Bookmark bookmarkIsFit2 = doc.Range.Bookmarks["IsFit2"]; + if (bookmarkIsFit2 != null) + { + if (item2 != null) + { + bookmarkIsFit2.Text = "×"; + } + } + } + } + var item3 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 3); + if (item3 != null) + { + if (item3.IsUsed == true) + { + Bookmark bookmarkUser3 = doc.Range.Bookmarks["User3"];//确认执行 + if (bookmarkUser3 != null) + { + bookmarkUser3.Text = "√"; + } + } + else + { + Bookmark bookmarkIsFit3 = doc.Range.Bookmarks["IsFit3"]; + if (bookmarkIsFit3 != null) + { + if (item3 != null) + { + bookmarkIsFit3.Text = "×"; + } + } + } + } + + var item4 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 4); + if (item4 != null) + { + if (item4.IsUsed == true) + { + Bookmark bookmarkUser4 = doc.Range.Bookmarks["User4"];//确认执行 + if (bookmarkUser4 != null) + { + bookmarkUser4.Text = "√"; + } + } + else + { + Bookmark bookmarkIsFit4 = doc.Range.Bookmarks["IsFit4"]; + if (bookmarkIsFit4 != null) + { + if (item4 != null) + { + bookmarkIsFit4.Text = "×"; + } + } + } + } + var item5 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 5); + if (item5 != null) + { + if (item5.IsUsed == true) + { + Bookmark bookmarkUser5 = doc.Range.Bookmarks["User5"];//确认执行 + if (bookmarkUser5 != null) + { + bookmarkUser5.Text = "√"; + } + } + else + { + Bookmark bookmarkIsFit5 = doc.Range.Bookmarks["IsFit5"]; + if (bookmarkIsFit5 != null) + { + if (item5 != null) + { + bookmarkIsFit5.Text = "×"; + } + } + } + } + + var item6 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 6); + if (item6 != null) + { + if (item6.IsUsed == true) + { + Bookmark bookmarkUser6 = doc.Range.Bookmarks["User6"];//确认执行 + if (bookmarkUser6 != null) + { + bookmarkUser6.Text = "√"; + } + } + else + { + Bookmark bookmarkIsFit6 = doc.Range.Bookmarks["IsFit6"]; + if (bookmarkIsFit6 != null) + { + if (item6 != null) + { + bookmarkIsFit6.Text = "×"; + } + } + } + } + var item7 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 7); + if (item7 != null) + { + if (item7.IsUsed == true) + { + Bookmark bookmarkUser7 = doc.Range.Bookmarks["User7"];//确认执行 + if (bookmarkUser7 != null) + { + bookmarkUser7.Text = "√"; + } + } + else + { + Bookmark bookmarkIsFit7 = doc.Range.Bookmarks["IsFit7"]; + if (bookmarkIsFit7 != null) + { + if (item7 != null) + { + bookmarkIsFit7.Text = "×"; + } + } + } + } + + var item8 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 8); + if (item8 != null) + { + if (item8.IsUsed == true) + { + Bookmark bookmarkUser8 = doc.Range.Bookmarks["User8"];//确认执行 + if (bookmarkUser8 != null) + { + bookmarkUser8.Text = "√"; + } + } + else + { + Bookmark bookmarkIsFit8 = doc.Range.Bookmarks["IsFit8"]; + if (bookmarkIsFit8 != null) + { + if (item8 != null) + { + bookmarkIsFit8.Text = "×"; + } + } + } + } + + var item9 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 9); + if (item9 != null) + { + if (item9.IsUsed == true) + { + Bookmark bookmarkUser9 = doc.Range.Bookmarks["User9"];//确认执行 + if (bookmarkUser9 != null) + { + bookmarkUser9.Text = "√"; + } + } + else + { + Bookmark bookmarkIsFit9 = doc.Range.Bookmarks["IsFit9"]; + if (bookmarkIsFit9 != null) + { + if (item9 != null) + { + bookmarkIsFit9.Text = "×"; + } + } + } + } + + var item10 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 10); + if (item10 != null) + { + if (item10.IsUsed == true) + { + Bookmark bookmarkUser10 = doc.Range.Bookmarks["User10"];//确认执行 + if (bookmarkUser10 != null) + { + bookmarkUser10.Text = "√"; + } + } + else + { + Bookmark bookmarkIsFit10 = doc.Range.Bookmarks["IsFit10"]; + if (bookmarkIsFit10 != null) + { + if (item10 != null) + { + bookmarkIsFit10.Text = "×"; + } + } + } + } + var item11 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 11); + if (item11 != null) + { + if (item11.IsUsed == true) + { + Bookmark bookmarkUser11 = doc.Range.Bookmarks["User11"];//确认执行 + if (bookmarkUser11 != null) + { + bookmarkUser11.Text = "√"; + } + } + else + { + Bookmark bookmarkIsFit11 = doc.Range.Bookmarks["IsFit11"]; + if (bookmarkIsFit11 != null) + { + if (item11 != null) + { + bookmarkIsFit11.Text = "×"; + } + } + } + } + + var item12 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 12); + if (item12 != null) + { + if (item12.IsUsed == true) + { + Bookmark bookmarkUser12 = doc.Range.Bookmarks["User12"];//确认执行 + if (bookmarkUser12 != null) + { + bookmarkUser12.Text = "√"; + } + } + else + { + Bookmark bookmarkIsFit12 = doc.Range.Bookmarks["IsFit12"]; + if (bookmarkIsFit12 != null) + { + if (item12 != null) + { + bookmarkIsFit12.Text = "×"; + } + } + } + } + + + } + //审核记录 + var getFlows = LicensePublicService.GetFlowOperateListByDataId(Id); + if (getFlows.Count() > 0) + { + var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1); + if (getF1 != null) + { + var getUser = UserService.GetUserByUserId(getF1.OperaterId); + Bookmark bookmarkOpinion1 = doc.Range.Bookmarks["Opinion1"]; + if (bookmarkOpinion1 != null) + { + + + if (getUser != null) + { + if (getF1.IsAgree == true) + { + bookmarkOpinion1.Text = getF1.Opinion; + } + else + { + bookmarkOpinion1.Text = "不同意: " + getF1.Opinion; + } + } + + + } + Bookmark bookmarkOperaterMan1 = doc.Range.Bookmarks["OperaterMan1"]; + if (bookmarkOperaterMan1 != null) + { + if (getF1.OperaterTime.HasValue) + { + if (getUser != null) + { + DocumentBuilder builders = new DocumentBuilder(doc); + if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl)) + { + var file = rootPath + getUser.SignatureUrl; + builders.MoveToBookmark("OperaterMan1"); + builders.InsertImage(file, 80, 20); + } + else + { + bookmarkOperaterMan1.Text = getUser.UserName; + } + } + } + } + Bookmark bookmarkOperaterTime1 = doc.Range.Bookmarks["OperaterTime1"]; + if (bookmarkOperaterTime1 != null) + { + if (getF1.OperaterTime.HasValue) + { + bookmarkOperaterTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); + } + } + } + var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + if (getF2 != null) + { + var getUser = UserService.GetUserByUserId(getF2.OperaterId); + Bookmark bookmarkOpinion2 = doc.Range.Bookmarks["Opinion2"]; + if (bookmarkOpinion2 != null) + { + + + if (getUser != null) + { + if (getF2.IsAgree == true) + { + bookmarkOpinion2.Text = getF2.Opinion; + } + else + { + bookmarkOpinion2.Text = "不同意: " + getF2.Opinion; + } + } + + + } + Bookmark bookmarkOperaterMan2 = doc.Range.Bookmarks["OperaterMan2"]; + if (bookmarkOperaterMan2 != null) + { + if (getF2.OperaterTime.HasValue) + { + if (getUser != null) + { + DocumentBuilder builders = new DocumentBuilder(doc); + if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl)) + { + var file = rootPath + getUser.SignatureUrl; + builders.MoveToBookmark("OperaterMan2"); + builders.InsertImage(file, 80, 20); + } + else + { + bookmarkOperaterMan2.Text = getUser.UserName; + } + } + } + } + Bookmark bookmarkOperaterTime2 = doc.Range.Bookmarks["OperaterTime2"]; + if (bookmarkOperaterTime2 != null) + { + if (getF2.OperaterTime.HasValue) + { + bookmarkOperaterTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + } + } + } + var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + if (getF3 != null) + { + var getUser = UserService.GetUserByUserId(getF3.OperaterId); + Bookmark bookmarkOpinion3 = doc.Range.Bookmarks["Opinion3"]; + if (bookmarkOpinion3 != null) + { + + + if (getUser != null) + { + if (getF3.IsAgree == true) + { + bookmarkOpinion3.Text = getF3.Opinion; + } + else + { + bookmarkOpinion3.Text = "不同意: " + getF3.Opinion; + } + } + + + } + Bookmark bookmarkOperaterMan3 = doc.Range.Bookmarks["OperaterMan3"]; + if (bookmarkOperaterMan3 != null) + { + if (getF3.OperaterTime.HasValue) + { + if (getUser != null) + { + DocumentBuilder builders = new DocumentBuilder(doc); + if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl)) + { + var file = rootPath + getUser.SignatureUrl; + builders.MoveToBookmark("OperaterMan3"); + builders.InsertImage(file, 80, 20); + } + else + { + bookmarkOperaterMan3.Text = getUser.UserName; + } + } + } + } + Bookmark bookmarkOperaterTime3 = doc.Range.Bookmarks["OperaterTime3"]; + if (bookmarkOperaterTime3 != null) + { + if (getF3.OperaterTime.HasValue) + { + bookmarkOperaterTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + } + } + } + var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + if (getF4 != null) + { + var getUser = UserService.GetUserByUserId(getF4.OperaterId); + Bookmark bookmarkOpinion4 = doc.Range.Bookmarks["Opinion4"]; + if (bookmarkOpinion4 != null) + { + + + if (getUser != null) + { + if (getF4.IsAgree == true) + { + bookmarkOpinion4.Text = getF4.Opinion; + } + else + { + bookmarkOpinion4.Text = "不同意: " + getF4.Opinion; + } + } + + + } + Bookmark bookmarkOperaterMan4 = doc.Range.Bookmarks["OperaterMan4"]; + if (bookmarkOperaterMan4 != null) + { + if (getF4.OperaterTime.HasValue) + { + if (getUser != null) + { + DocumentBuilder builders = new DocumentBuilder(doc); + if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl)) + { + var file = rootPath + getUser.SignatureUrl; + builders.MoveToBookmark("OperaterMan4"); + builders.InsertImage(file, 80, 20); + } + else + { + bookmarkOperaterMan4.Text = getUser.UserName; + } + } + } + } + Bookmark bookmarkOperaterTime4 = doc.Range.Bookmarks["OperaterTime4"]; + if (bookmarkOperaterTime4 != null) + { + if (getF4.OperaterTime.HasValue) + { + bookmarkOperaterTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + } + } + } + var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); + if (getF5 != null) + { + var getUser = UserService.GetUserByUserId(getF5.OperaterId); + Bookmark bookmarkOpinion5 = doc.Range.Bookmarks["Opinion5"]; + if (bookmarkOpinion5 != null) + { + + + if (getUser != null) + { + if (getF5.IsAgree == true) + { + bookmarkOpinion5.Text = getF5.Opinion; + } + else + { + bookmarkOpinion5.Text = "不同意: " + getF5.Opinion; + } + } + + + } + Bookmark bookmarkOperaterMan5 = doc.Range.Bookmarks["OperaterMan5"]; + if (bookmarkOperaterMan5 != null) + { + if (getF5.OperaterTime.HasValue) + { + if (getUser != null) + { + DocumentBuilder builders = new DocumentBuilder(doc); + if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl)) + { + var file = rootPath + getUser.SignatureUrl; + builders.MoveToBookmark("OperaterMan5"); + builders.InsertImage(file, 80, 20); + } + else + { + bookmarkOperaterMan5.Text = getUser.UserName; + } + } + } + } + Bookmark bookmarkOperaterTime5 = doc.Range.Bookmarks["OperaterTime5"]; + if (bookmarkOperaterTime5 != null) + { + if (getF5.OperaterTime.HasValue) + { + bookmarkOperaterTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); + } + } + } + var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); + if (getF6 != null) + { + var getUser = UserService.GetUserByUserId(getF6.OperaterId); + Bookmark bookmarkOpinion6 = doc.Range.Bookmarks["Opinion6"]; + if (bookmarkOpinion6 != null) + { + + + if (getUser != null) + { + if (getF6.IsAgree == true) + { + bookmarkOpinion6.Text = getF6.Opinion; + } + else + { + bookmarkOpinion6.Text = "不同意: " + getF6.Opinion; + } + } + + + } + Bookmark bookmarkOperaterMan6 = doc.Range.Bookmarks["OperaterMan6"]; + if (bookmarkOperaterMan6 != null) + { + if (getF6.OperaterTime.HasValue) + { + if (getUser != null) + { + DocumentBuilder builders = new DocumentBuilder(doc); + if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl)) + { + var file = rootPath + getUser.SignatureUrl; + builders.MoveToBookmark("OperaterMan6"); + builders.InsertImage(file, 80, 20); + } + else + { + bookmarkOperaterMan6.Text = getUser.UserName; + } + } + } + } + Bookmark bookmarkOperaterTime6 = doc.Range.Bookmarks["OperaterTime6"]; + if (bookmarkOperaterTime6 != null) + { + if (getF6.OperaterTime.HasValue) + { + bookmarkOperaterTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); + } + } + } + } + + Bookmark bookmarkCance = doc.Range.Bookmarks["Cancel"];//取消 + if (bookmarkCance != null) + { + if (getElectricity != null) + { + if (!string.IsNullOrEmpty(getElectricity.CancelManId)) + { + var getUser = UserService.GetUserByUserId(getElectricity.CancelManId); + if (getUser != null) + { + if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl)) + { + var file = rootPath + getUser.SignatureUrl; + DocumentBuilder builders = new DocumentBuilder(doc); + builders.MoveToBookmark("Cancel"); + builders.InsertImage(file, 80, 20); + builders.Write("取消原因：" + getElectricity.CancelReasons + " 取消时间：" + string.Format("{0:yyyy-MM-dd HH:mm}", getElectricity.CancelTime)); + } + else + { + bookmarkCance.Text = getUser.UserName + " 取消原因：" + getElectricity.CancelReasons + " 取消时间：" + string.Format("{0:yyyy-MM-dd HH:mm}", getElectricity.CancelTime); + } + } + } + } + } + + Bookmark bookmarkClose = doc.Range.Bookmarks["Close"];//关闭 + if (bookmarkClose != null) + { + if (getElectricity != null) + { + if (!string.IsNullOrEmpty(getElectricity.CloseManId)) + { + var getUser = UserService.GetUserByUserId(getElectricity.CloseManId); + if (getUser != null) + { + if (!string.IsNullOrEmpty(getElectricity.CloseReasons)) + { + bookmarkClose.Text = getElectricity.CloseReasons + " 关闭时间：" + + string.Format("{0:yyyy-MM-dd HH:mm}", getElectricity.CloseTime) + "。"; + } + else if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl)) + { + var file = rootPath + getUser.SignatureUrl; + DocumentBuilder builders = new DocumentBuilder(doc); + builders.MoveToBookmark("Close"); + builders.InsertImage(file, 80, 20); + builders.Write("关闭时间：" + string.Format("{0:yyyy-MM-dd HH:mm}", getElectricity.CloseTime)); + } + else + { + bookmarkClose.Text = getUser.UserName + " 关闭时间：" + string.Format("{0:yyyy-MM-dd HH:mm}", getElectricity.CloseTime); + } + } + } + } + } + + doc.Save(newUrl); + //生成PDF文件 + string pdfUrl = newUrl.Replace(".doc", ".pdf"); + Document doc1 = new Aspose.Words.Document(newUrl); + //验证参数 + if (doc1 == null) { throw new Exception("Word文件无效"); } + doc1.Save(pdfUrl, Aspose.Words.SaveFormat.Pdf);//还可以改成其它格式 + string fileName = Path.GetFileName(filePath); + FileInfo info = new FileInfo(pdfUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(pdfUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + File.Delete(pdfUrl); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.designer.cs new file mode 100644 index 00000000..eb4c8753 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.designer.cs @@ -0,0 +1,179 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.License +{ + + + public partial class Electricity + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// drpUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnit; + + /// + /// drpStates 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList drpStates; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// lblNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNumber; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuView 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuView; + + /// + /// btnPrinter 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnPrinter; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx new file mode 100644 index 00000000..26a48405 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx @@ -0,0 +1,259 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ElectricityView.aspx.cs" Inherits="FineUIPro.Web.HSSE.License.ElectricityView" %> + + + + + + + 临时用电作业票 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.cs new file mode 100644 index 00000000..557d14e9 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.cs @@ -0,0 +1,242 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; + +namespace FineUIPro.Web.HSSE.License +{ + public partial class ElectricityView : PageBase + { + #region 定义项 + /// + /// 主键 + /// + private string ElectricityId + { + get + { + return (string)ViewState["ElectricityId"]; + } + set + { + ViewState["ElectricityId"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_CWCEC) + this.Title; + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.ElectricityId = Request.Params["ElectricityId"]; + if (!string.IsNullOrEmpty(this.ElectricityId)) + { + var getElectricity = LicensePublicService.GetElectricityById(this.ElectricityId); + if (getElectricity != null) + { + this.lbLicenseCode.Text = getElectricity.LicenseCode; + this.txtApplyUnit.Text = UnitService.GetUnitNameByUnitId(getElectricity.ApplyUnitId); + this.txtApplyManName.Text = UserService.GetUserNameByUserId(getElectricity.ApplyManId); + this.txtWorkPalce.Text = getElectricity.WorkPalce; + this.txtReason.Text = getElectricity.Reason; + if (getElectricity.ValidityStartTime.HasValue) + { + this.txtWorkDate.Text = getElectricity.ValidityStartTime.Value.ToString("f") + " 至 "; + if (getElectricity.ValidityEndTime.HasValue) + { + this.txtWorkDate.Text += getElectricity.ValidityEndTime.Value.ToString("f"); + } + } + this.txtWorkMeasures.Text = getElectricity.WorkMeasures; + if (!string.IsNullOrEmpty(getElectricity.CancelManId)) + { + this.txtCance.Text = UserService.GetUserNameByUserId(getElectricity.CancelManId) + "；取消时间：" + + string.Format("{0:yyyy-MM-dd HH:mm}", getElectricity.CancelTime) + "；原因：" + getElectricity.CancelReasons + "。"; + } + if (!string.IsNullOrEmpty(getElectricity.CloseManId)) + { + if (!string.IsNullOrEmpty(getElectricity.CloseReasons)) + { + this.txtClose.Text = getElectricity.CloseReasons + " 关闭时间：" + + string.Format("{0:yyyy-MM-dd HH:mm}", getElectricity.CloseTime) + "。"; + } + else + { + this.txtClose.Text = UserService.GetUserNameByUserId(getElectricity.CloseManId) + "；关闭时间：" + + string.Format("{0:yyyy-MM-dd HH:mm}", getElectricity.CloseTime) + "。"; + } + } + } + } + // 绑定表格 + this.BindGrid(); + this.SetFlow(); + } + } + #endregion + + #region 获取审核记录信息 + /// + /// + /// + private void SetFlow() + { + var getFlows = LicensePublicService.GetFlowOperateListByDataId(this.ElectricityId); + if (getFlows.Count() > 0) + { + var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1); + if (getF1 != null) + { + this.txtForm1.Title = getF1.AuditFlowName + "："; + if (getF1.OperaterTime.HasValue) + { + if (getF1.IsAgree == true) + { + this.txtOpinion1.Text = "同意。"; + } + else + { + this.txtOpinion1.Text = getF1.Opinion; + } + this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId); + this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); + } + } + var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + if (getF2 != null) + { + this.txtForm2.Title = getF2.AuditFlowName + "："; + if (getF2.OperaterTime.HasValue) + { + if (getF2.IsAgree == true) + { + this.txtOpinion2.Text = "同意。"; + } + else + { + this.txtOpinion2.Text = getF2.Opinion; + } + this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); + this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + } + } + var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + if (getF3 != null) + { + this.txtForm3.Title = getF3.AuditFlowName + "："; + if (getF3.OperaterTime.HasValue) + { + if (getF3.IsAgree == true) + { + this.txtOpinion3.Text = "同意。"; + } + else + { + this.txtOpinion3.Text = getF3.Opinion; + } + this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); + this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + } + } + var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + if (getF4 != null) + { + this.txtForm4.Title = getF4.AuditFlowName + "："; + if (getF4.OperaterTime.HasValue) + { + if (getF4.IsAgree == true) + { + this.txtOpinion4.Text = "同意。"; + } + else + { + this.txtOpinion4.Text = getF4.Opinion; + } + this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); + this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + } + } + var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); + if (getF5 != null) + { + this.txtForm5.Title = getF5.AuditFlowName + "："; + if (getF5.OperaterTime.HasValue) + { + if (getF5.IsAgree == true) + { + this.txtOpinion5.Text = "同意。"; + } + else + { + this.txtOpinion5.Text = getF5.Opinion; + } + this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); + this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); + } + } + var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); + if (getF6 != null) + { + this.txtForm6.Title = getF6.AuditFlowName + "："; + if (getF6.OperaterTime.HasValue) + { + if (getF6.IsAgree == true) + { + this.txtOpinion6.Text = "同意。"; + } + else + { + this.txtOpinion6.Text = getF6.Opinion; + } + this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); + this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); + } + } + } + } + #endregion + + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '适用' ELSE '不适用' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + + @" FROM License_LicenseItem AS L " + + @" LEFT JOIN Sys_User AS U ON L.ConfirmManId =U.UserId" + + @" WHERE L.DataId ='" + this.ElectricityId + "'"; + List listStr = new List(); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + #region 附件查看 + /// + /// 附件查看 + /// + /// + /// + protected void btnAttachUrl_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(this.ElectricityId)) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&menuId={1}&type=-1", this.ElectricityId, Const.ProjectElectricityMenuId))); + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.designer.cs new file mode 100644 index 00000000..586573d5 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.designer.cs @@ -0,0 +1,467 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.License +{ + + + public partial class ElectricityView + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// lbLicenseCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbLicenseCode; + + /// + /// lbImageUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbImageUrl; + + /// + /// txtApplyUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtApplyUnit; + + /// + /// txtApplyManName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtApplyManName; + + /// + /// txtWorkPalce 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkPalce; + + /// + /// txtReason 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtReason; + + /// + /// txtWorkDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkDate; + + /// + /// txtWorkMeasures 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkMeasures; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// txtForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm1; + + /// + /// txtOpinion1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion1; + + /// + /// Label6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label6; + + /// + /// txtName1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName1; + + /// + /// txtTime1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime1; + + /// + /// txtForm2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm2; + + /// + /// txtOpinion2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion2; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// txtName2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName2; + + /// + /// txtTime2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime2; + + /// + /// txtForm3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm3; + + /// + /// txtOpinion3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion3; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label2; + + /// + /// txtName3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName3; + + /// + /// txtTime3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime3; + + /// + /// txtForm4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm4; + + /// + /// txtOpinion4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion4; + + /// + /// Label5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label5; + + /// + /// txtName4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName4; + + /// + /// txtTime4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime4; + + /// + /// txtForm5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm5; + + /// + /// txtOpinion5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion5; + + /// + /// Label9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label9; + + /// + /// txtName5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName5; + + /// + /// txtTime5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime5; + + /// + /// txtForm6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm6; + + /// + /// txtOpinion6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion6; + + /// + /// Label12 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label12; + + /// + /// txtName6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName6; + + /// + /// txtTime6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime6; + + /// + /// txtCance 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCance; + + /// + /// txtClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtClose; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// lbTemp 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbTemp; + + /// + /// btnAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx b/SGGL/FineUIPro.Web/common/mainProject2.aspx index 9043f130..66316df1 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx @@ -1,1297 +1,1012 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="mainProject2.aspx.cs" Inherits="FineUIPro.Web.common.mainProject2" %> +using BLL; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.IO; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; - - - - - 项目级首页（新） - - - - - - - - -
- -
-
-
-
-
安全统计
-
-
-
-

0000000000

-
累计安全人工时 -
-
-
-

0000000000

-
本月安全人工时 -
-
-
-

0

-
安全培训累计人员 -
-
-
-
-
-
安全管理人员
-
0
-
-
-
未遂事件
-
0
-
-
-
-
整改数据
-
-
-
0 -
-
总数
-
-
-
0 -
-
已完成
-
-
-
0 -
-
未完成
-
-
-
0% -
-
完成率
-
-
-
-
-
-
-
风险预警
-
-
-
-
-
-
资质预警
-
<%=getEarlyWarningCounts() %>
-
-
-
机械预警
-
<%=GetJxyjNum() %>
-
-
-
-
危大工程
-
-
-
<%=GetCompletedNum() %>
-
审批完成
-
-
-
<%=GetTrainPersonNum() %>
-
培训人次数
-
-
-
<%=GetConstructionNum() %>
-
施工个数
-
-
-
<%=GetFinishedNum() %>
-
完工个数
-
-
-
-
-
超危大工程
-
-
-
<%=GetSuperCompletedNum() %>
-
审批完成
-
-
-
<%=GetSuperTrainPersonNum() %>
-
培训人次数
-
-
-
<%=GetSuperConstructionNum() %>
-
施工个数
-
-
-
<%=GetSuperFinishedNum() %>
-
完工个数
-
-
-
-
-
-
-
-
作业许可
-
-
-
-
动火
-
<%=getWrokCount0() %>
-
-
-
高处
-
<%=getWrokCount1() %>
-
-
-
吊装
-
<%=getWrokCount2() %>
-
-
-
其他
-
<%=getWrokCount3() %>
-
-
-
- <%=getLicenseManager() %> - <%--
003-十一化建-合成氨区域-非高风险-T0001设备吊装
--%> - -
-
+ #endregion -
-
-
-
-
工程概括
-
-
-
工程名称：<%=spanProjectName %>
-
建设单位： <%=spanOwnUnit %>
-
施工单位： <%=spanSGUnit %>
-
监理单位：<%=spanJLUnit %>
-
工程概况：
-
-
-
-
-
-
-
-
-
- -
- - -
-
-
-
-
-
-
合同工期
-
0天
-
-
-
合同到期时间
-
-
-
-
合同剩余
-
0天
-
-
-
- -
-
-
赢得值曲线 - <%--
关键事项准点率90%
--%> -
-
- <%--
- -
--%> - -
-
-
质量概况
-
-
-
-
质量培训累计人员
-
0
-
-
-
施工方案审批量
-
0
-
-
-
-
-
-
-
-
-
-
-
-
-
工作台面
-
-
-
-
关键事项
-
0
-
-
-
待办事项
-
0
-
-
-
个人流程
-
0
-
-
-
已办任务
-
0
-
-
- - -
- -
-
- -
-
-
人员信息
-
-
-
-
当前现场人数
-
0
-
-
-
作业人员总数
-
0
-
-
-
管理人员总数
-
0
-
-
- -
- <%--
- -
--%> -
- -
-
-
- 材料到货 -
管道材料 - 设备材料
-
-
-
-
-
-
-

材料类别

-
-
-

设计量

-
-
-

采购量

-

采购量百分比

-
-
-

到货量

-

已到货百分比

-
-
-

领料量

-

已领料百分比

-
-
-
-
- <%=gdclHtml %> -
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - +} \ No newline at end of file diff --git a/SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs b/SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs index 707b91df..b5539e84 100644 --- a/SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs +++ b/SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs @@ -201,7 +201,7 @@ namespace Model /// /// 整改期限 /// - public DateTime? Rectification_Date { get; set; } + public string Rectification_Date { get; set; } } } diff --git a/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs b/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs index 7b395285..f6253ecf 100644 --- a/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs +++ b/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs @@ -277,7 +277,7 @@ namespace Model set; } /// - /// 作业负责人名字（射线、夜间） + /// 作业负责人名字（射线、夜间、高处） /// public string WorkLeaderName { @@ -285,7 +285,7 @@ namespace Model set; } /// - /// 作业负责人电话（射线、夜间） + /// 作业负责人电话（射线、夜间、高处） /// public string WorkLeaderTel { @@ -389,5 +389,114 @@ namespace Model get; set; } + + //新增 + public string WorkAreaName + { + get; + set; + } + /// + /// 区域 + /// + public string WorkAreaId + { + get; + set; + } + + /// + /// 原因 + /// + public string Reason + { + get; + set; + } + + /// + /// 动火作业级别 + /// + public string FireLevel + { + get; + set; + } + + /// + /// 空间内介质描述 + /// + public string LimitedDescribe + { + get; + set; + } + + /// + /// 是否存在其它介质 + /// + public bool? IsBoolOther + { + get; + set; + } + + /// + /// 作业是否耗氧或产生其它有毒有害气体 + /// + public bool? IsBoolHarmfulGas + { + get; + set; + } + + /// + /// 氧含量测试结果 + /// + public string TestResult + { + get; + set; + } + + /// + /// 测试时间 + /// + public string TestDate { get; set; } + + /// + /// 测试人 + /// + public string TestPerson { get; set; } + + /// + /// 通风措施 + /// + public string VenStep { get; set; } + + /// + /// 作业点高度 + /// + public string WorkHeight { get; set; } + + /// + /// 高处作业级别 + /// + public string HeightLevel { get; set; } + + /// + /// 吊装高度 + /// + public string LiftingHeight { get; set; } + + /// + /// 起重工姓名 + /// + public string QzgName { get; set; } + + /// + /// 起重工电话 + /// + public string QzgPhone { get; set; } } } From a15d27e4ebd412984e6766663765a075a0af3d09 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 8 Sep 2023 17:13:21 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/Model/Model.cs | 1738 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1738 insertions(+) diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 8b23f937..dd087494 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1271,6 +1271,9 @@ namespace Model partial void InsertLicense_BreakGround(License_BreakGround instance); partial void UpdateLicense_BreakGround(License_BreakGround instance); partial void DeleteLicense_BreakGround(License_BreakGround instance); + partial void InsertLicense_Electricity(License_Electricity instance); + partial void UpdateLicense_Electricity(License_Electricity instance); + partial void DeleteLicense_Electricity(License_Electricity instance); partial void InsertLicense_EquipmentSafetyList(License_EquipmentSafetyList instance); partial void UpdateLicense_EquipmentSafetyList(License_EquipmentSafetyList instance); partial void DeleteLicense_EquipmentSafetyList(License_EquipmentSafetyList instance); @@ -5739,6 +5742,14 @@ namespace Model } } + public System.Data.Linq.Table License_Electricity + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table License_EquipmentSafetyList { get @@ -25269,6 +25280,8 @@ namespace Model private EntitySet _License_BreakGround; + private EntitySet _License_Electricity; + private EntitySet _License_EquipmentSafetyList; private EntitySet _License_FireWork; @@ -25757,6 +25770,7 @@ namespace Model this._JDGL_UndergroundPipeCompletion = new EntitySet(new Action(this.attach_JDGL_UndergroundPipeCompletion), new Action(this.detach_JDGL_UndergroundPipeCompletion)); this._Law_LawRegulationIdentify = new EntitySet(new Action(this.attach_Law_LawRegulationIdentify), new Action(this.detach_Law_LawRegulationIdentify)); this._License_BreakGround = new EntitySet(new Action(this.attach_License_BreakGround), new Action(this.detach_License_BreakGround)); + this._License_Electricity = new EntitySet(new Action(this.attach_License_Electricity), new Action(this.detach_License_Electricity)); this._License_EquipmentSafetyList = new EntitySet(new Action(this.attach_License_EquipmentSafetyList), new Action(this.detach_License_EquipmentSafetyList)); this._License_FireWork = new EntitySet(new Action(this.attach_License_FireWork), new Action(this.detach_License_FireWork)); this._License_HeightWork = new EntitySet(new Action(this.attach_License_HeightWork), new Action(this.detach_License_HeightWork)); @@ -28834,6 +28848,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_Electricity_Base_Project", Storage="_License_Electricity", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet License_Electricity + { + get + { + return this._License_Electricity; + } + set + { + this._License_Electricity.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_EquipmentSafetyList_Base_Project", Storage="_License_EquipmentSafetyList", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet License_EquipmentSafetyList { @@ -32406,6 +32433,18 @@ namespace Model entity.Base_Project = null; } + private void attach_License_Electricity(License_Electricity entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_License_Electricity(License_Electricity entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_License_EquipmentSafetyList(License_EquipmentSafetyList entity) { this.SendPropertyChanging(); @@ -37403,6 +37442,8 @@ namespace Model private EntitySet _License_BreakGround; + private EntitySet _License_Electricity; + private EntitySet _License_EquipmentSafetyList; private EntitySet _License_FireWork; @@ -37701,6 +37742,7 @@ namespace Model this._JDGL_SteelStructureCompletion = new EntitySet(new Action(this.attach_JDGL_SteelStructureCompletion), new Action(this.detach_JDGL_SteelStructureCompletion)); this._JDGL_UndergroundPipeCompletion = new EntitySet(new Action(this.attach_JDGL_UndergroundPipeCompletion), new Action(this.detach_JDGL_UndergroundPipeCompletion)); this._License_BreakGround = new EntitySet(new Action(this.attach_License_BreakGround), new Action(this.detach_License_BreakGround)); + this._License_Electricity = new EntitySet(new Action(this.attach_License_Electricity), new Action(this.detach_License_Electricity)); this._License_EquipmentSafetyList = new EntitySet(new Action(this.attach_License_EquipmentSafetyList), new Action(this.detach_License_EquipmentSafetyList)); this._License_FireWork = new EntitySet(new Action(this.attach_License_FireWork), new Action(this.detach_License_FireWork)); this._License_HeightWork = new EntitySet(new Action(this.attach_License_HeightWork), new Action(this.detach_License_HeightWork)); @@ -39699,6 +39741,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_Electricity_Base_Unit", Storage="_License_Electricity", ThisKey="UnitId", OtherKey="ApplyUnitId", DeleteRule="NO ACTION")] + public EntitySet License_Electricity + { + get + { + return this._License_Electricity; + } + set + { + this._License_Electricity.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_EquipmentSafetyList_Base_Unit", Storage="_License_EquipmentSafetyList", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")] public EntitySet License_EquipmentSafetyList { @@ -41884,6 +41939,18 @@ namespace Model entity.Base_Unit = null; } + private void attach_License_Electricity(License_Electricity entity) + { + this.SendPropertyChanging(); + entity.Base_Unit = this; + } + + private void detach_License_Electricity(License_Electricity entity) + { + this.SendPropertyChanging(); + entity.Base_Unit = null; + } + private void attach_License_EquipmentSafetyList(License_EquipmentSafetyList entity) { this.SendPropertyChanging(); @@ -206204,6 +206271,12 @@ namespace Model private string _OldLicenseId; + private string _WorkAreaId; + + private string _Reason; + + private string _FireWatchManName; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -206258,6 +206331,12 @@ namespace Model partial void OnNextManIdChanged(); partial void OnOldLicenseIdChanging(string value); partial void OnOldLicenseIdChanged(); + partial void OnWorkAreaIdChanging(string value); + partial void OnWorkAreaIdChanged(); + partial void OnReasonChanging(string value); + partial void OnReasonChanged(); + partial void OnFireWatchManNameChanging(string value); + partial void OnFireWatchManNameChanged(); #endregion public License_BreakGround() @@ -206690,6 +206769,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(500)")] + public string WorkAreaId + { + get + { + return this._WorkAreaId; + } + set + { + if ((this._WorkAreaId != value)) + { + this.OnWorkAreaIdChanging(value); + this.SendPropertyChanging(); + this._WorkAreaId = value; + this.SendPropertyChanged("WorkAreaId"); + this.OnWorkAreaIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Reason", DbType="NVarChar(500)")] + public string Reason + { + get + { + return this._Reason; + } + set + { + if ((this._Reason != value)) + { + this.OnReasonChanging(value); + this.SendPropertyChanging(); + this._Reason = value; + this.SendPropertyChanged("Reason"); + this.OnReasonChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FireWatchManName", DbType="NVarChar(500)")] + public string FireWatchManName + { + get + { + return this._FireWatchManName; + } + set + { + if ((this._FireWatchManName != value)) + { + this.OnFireWatchManNameChanging(value); + this.SendPropertyChanging(); + this._FireWatchManName = value; + this.SendPropertyChanged("FireWatchManName"); + this.OnFireWatchManNameChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_BreakGround_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -206881,6 +207020,849 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.License_Electricity")] + public partial class License_Electricity : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ElectricityId; + + private string _ProjectId; + + private string _LicenseCode; + + private string _ApplyUnitId; + + private string _ApplyManId; + + private System.Nullable _ApplyDate; + + private string _WorkPalce; + + private string _WorkDepth; + + private System.Nullable _ValidityStartTime; + + private System.Nullable _ValidityEndTime; + + private string _WorkMeasures; + + private string _CancelManId; + + private string _CancelReasons; + + private System.Nullable _CancelTime; + + private string _CloseManId; + + private string _CloseReasons; + + private System.Nullable _CloseTime; + + private string _States; + + private string _NextManId; + + private string _OldLicenseId; + + private string _WorkAreaId; + + private string _Reason; + + private string _FireWatchManName; + + private string _WorkLeaderName; + + private string _WorkLeaderTel; + + private EntityRef _Base_Project; + + private EntityRef _Base_Unit; + + private EntityRef _Sys_User; + + private EntityRef _CancelMan; + + private EntityRef _CloseMan; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnElectricityIdChanging(string value); + partial void OnElectricityIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnLicenseCodeChanging(string value); + partial void OnLicenseCodeChanged(); + partial void OnApplyUnitIdChanging(string value); + partial void OnApplyUnitIdChanged(); + partial void OnApplyManIdChanging(string value); + partial void OnApplyManIdChanged(); + partial void OnApplyDateChanging(System.Nullable value); + partial void OnApplyDateChanged(); + partial void OnWorkPalceChanging(string value); + partial void OnWorkPalceChanged(); + partial void OnWorkDepthChanging(string value); + partial void OnWorkDepthChanged(); + partial void OnValidityStartTimeChanging(System.Nullable value); + partial void OnValidityStartTimeChanged(); + partial void OnValidityEndTimeChanging(System.Nullable value); + partial void OnValidityEndTimeChanged(); + partial void OnWorkMeasuresChanging(string value); + partial void OnWorkMeasuresChanged(); + partial void OnCancelManIdChanging(string value); + partial void OnCancelManIdChanged(); + partial void OnCancelReasonsChanging(string value); + partial void OnCancelReasonsChanged(); + partial void OnCancelTimeChanging(System.Nullable value); + partial void OnCancelTimeChanged(); + partial void OnCloseManIdChanging(string value); + partial void OnCloseManIdChanged(); + partial void OnCloseReasonsChanging(string value); + partial void OnCloseReasonsChanged(); + partial void OnCloseTimeChanging(System.Nullable value); + partial void OnCloseTimeChanged(); + partial void OnStatesChanging(string value); + partial void OnStatesChanged(); + partial void OnNextManIdChanging(string value); + partial void OnNextManIdChanged(); + partial void OnOldLicenseIdChanging(string value); + partial void OnOldLicenseIdChanged(); + partial void OnWorkAreaIdChanging(string value); + partial void OnWorkAreaIdChanged(); + partial void OnReasonChanging(string value); + partial void OnReasonChanged(); + partial void OnFireWatchManNameChanging(string value); + partial void OnFireWatchManNameChanged(); + partial void OnWorkLeaderNameChanging(string value); + partial void OnWorkLeaderNameChanged(); + partial void OnWorkLeaderTelChanging(string value); + partial void OnWorkLeaderTelChanged(); + #endregion + + public License_Electricity() + { + this._Base_Project = default(EntityRef); + this._Base_Unit = default(EntityRef); + this._Sys_User = default(EntityRef); + this._CancelMan = default(EntityRef); + this._CloseMan = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ElectricityId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ElectricityId + { + get + { + return this._ElectricityId; + } + set + { + if ((this._ElectricityId != value)) + { + this.OnElectricityIdChanging(value); + this.SendPropertyChanging(); + this._ElectricityId = value; + this.SendPropertyChanged("ElectricityId"); + this.OnElectricityIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LicenseCode", DbType="NVarChar(50)")] + public string LicenseCode + { + get + { + return this._LicenseCode; + } + set + { + if ((this._LicenseCode != value)) + { + this.OnLicenseCodeChanging(value); + this.SendPropertyChanging(); + this._LicenseCode = value; + this.SendPropertyChanged("LicenseCode"); + this.OnLicenseCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApplyUnitId", DbType="NVarChar(50)")] + public string ApplyUnitId + { + get + { + return this._ApplyUnitId; + } + set + { + if ((this._ApplyUnitId != value)) + { + if (this._Base_Unit.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnApplyUnitIdChanging(value); + this.SendPropertyChanging(); + this._ApplyUnitId = value; + this.SendPropertyChanged("ApplyUnitId"); + this.OnApplyUnitIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApplyManId", DbType="NVarChar(50)")] + public string ApplyManId + { + get + { + return this._ApplyManId; + } + set + { + if ((this._ApplyManId != value)) + { + if (this._Sys_User.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnApplyManIdChanging(value); + this.SendPropertyChanging(); + this._ApplyManId = value; + this.SendPropertyChanged("ApplyManId"); + this.OnApplyManIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApplyDate", DbType="DateTime")] + public System.Nullable ApplyDate + { + get + { + return this._ApplyDate; + } + set + { + if ((this._ApplyDate != value)) + { + this.OnApplyDateChanging(value); + this.SendPropertyChanging(); + this._ApplyDate = value; + this.SendPropertyChanged("ApplyDate"); + this.OnApplyDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPalce", DbType="NVarChar(300)")] + public string WorkPalce + { + get + { + return this._WorkPalce; + } + set + { + if ((this._WorkPalce != value)) + { + this.OnWorkPalceChanging(value); + this.SendPropertyChanging(); + this._WorkPalce = value; + this.SendPropertyChanged("WorkPalce"); + this.OnWorkPalceChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkDepth", DbType="NVarChar(50)")] + public string WorkDepth + { + get + { + return this._WorkDepth; + } + set + { + if ((this._WorkDepth != value)) + { + this.OnWorkDepthChanging(value); + this.SendPropertyChanging(); + this._WorkDepth = value; + this.SendPropertyChanged("WorkDepth"); + this.OnWorkDepthChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ValidityStartTime", DbType="DateTime")] + public System.Nullable ValidityStartTime + { + get + { + return this._ValidityStartTime; + } + set + { + if ((this._ValidityStartTime != value)) + { + this.OnValidityStartTimeChanging(value); + this.SendPropertyChanging(); + this._ValidityStartTime = value; + this.SendPropertyChanged("ValidityStartTime"); + this.OnValidityStartTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ValidityEndTime", DbType="DateTime")] + public System.Nullable ValidityEndTime + { + get + { + return this._ValidityEndTime; + } + set + { + if ((this._ValidityEndTime != value)) + { + this.OnValidityEndTimeChanging(value); + this.SendPropertyChanging(); + this._ValidityEndTime = value; + this.SendPropertyChanged("ValidityEndTime"); + this.OnValidityEndTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkMeasures", DbType="NVarChar(500)")] + public string WorkMeasures + { + get + { + return this._WorkMeasures; + } + set + { + if ((this._WorkMeasures != value)) + { + this.OnWorkMeasuresChanging(value); + this.SendPropertyChanging(); + this._WorkMeasures = value; + this.SendPropertyChanged("WorkMeasures"); + this.OnWorkMeasuresChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CancelManId", DbType="NVarChar(50)")] + public string CancelManId + { + get + { + return this._CancelManId; + } + set + { + if ((this._CancelManId != value)) + { + if (this._CancelMan.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnCancelManIdChanging(value); + this.SendPropertyChanging(); + this._CancelManId = value; + this.SendPropertyChanged("CancelManId"); + this.OnCancelManIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CancelReasons", DbType="NVarChar(200)")] + public string CancelReasons + { + get + { + return this._CancelReasons; + } + set + { + if ((this._CancelReasons != value)) + { + this.OnCancelReasonsChanging(value); + this.SendPropertyChanging(); + this._CancelReasons = value; + this.SendPropertyChanged("CancelReasons"); + this.OnCancelReasonsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CancelTime", DbType="DateTime")] + public System.Nullable CancelTime + { + get + { + return this._CancelTime; + } + set + { + if ((this._CancelTime != value)) + { + this.OnCancelTimeChanging(value); + this.SendPropertyChanging(); + this._CancelTime = value; + this.SendPropertyChanged("CancelTime"); + this.OnCancelTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CloseManId", DbType="NVarChar(50)")] + public string CloseManId + { + get + { + return this._CloseManId; + } + set + { + if ((this._CloseManId != value)) + { + if (this._CloseMan.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnCloseManIdChanging(value); + this.SendPropertyChanging(); + this._CloseManId = value; + this.SendPropertyChanged("CloseManId"); + this.OnCloseManIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CloseReasons", DbType="NVarChar(200)")] + public string CloseReasons + { + get + { + return this._CloseReasons; + } + set + { + if ((this._CloseReasons != value)) + { + this.OnCloseReasonsChanging(value); + this.SendPropertyChanging(); + this._CloseReasons = value; + this.SendPropertyChanged("CloseReasons"); + this.OnCloseReasonsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CloseTime", DbType="DateTime")] + public System.Nullable CloseTime + { + get + { + return this._CloseTime; + } + set + { + if ((this._CloseTime != value)) + { + this.OnCloseTimeChanging(value); + this.SendPropertyChanging(); + this._CloseTime = value; + this.SendPropertyChanged("CloseTime"); + this.OnCloseTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="VarChar(2)")] + public string States + { + get + { + return this._States; + } + set + { + if ((this._States != value)) + { + this.OnStatesChanging(value); + this.SendPropertyChanging(); + this._States = value; + this.SendPropertyChanged("States"); + this.OnStatesChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextManId", DbType="NVarChar(500)")] + public string NextManId + { + get + { + return this._NextManId; + } + set + { + if ((this._NextManId != value)) + { + this.OnNextManIdChanging(value); + this.SendPropertyChanging(); + this._NextManId = value; + this.SendPropertyChanged("NextManId"); + this.OnNextManIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OldLicenseId", DbType="NVarChar(50)")] + public string OldLicenseId + { + get + { + return this._OldLicenseId; + } + set + { + if ((this._OldLicenseId != value)) + { + this.OnOldLicenseIdChanging(value); + this.SendPropertyChanging(); + this._OldLicenseId = value; + this.SendPropertyChanged("OldLicenseId"); + this.OnOldLicenseIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(500)")] + public string WorkAreaId + { + get + { + return this._WorkAreaId; + } + set + { + if ((this._WorkAreaId != value)) + { + this.OnWorkAreaIdChanging(value); + this.SendPropertyChanging(); + this._WorkAreaId = value; + this.SendPropertyChanged("WorkAreaId"); + this.OnWorkAreaIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Reason", DbType="NVarChar(500)")] + public string Reason + { + get + { + return this._Reason; + } + set + { + if ((this._Reason != value)) + { + this.OnReasonChanging(value); + this.SendPropertyChanging(); + this._Reason = value; + this.SendPropertyChanged("Reason"); + this.OnReasonChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FireWatchManName", DbType="NVarChar(500)")] + public string FireWatchManName + { + get + { + return this._FireWatchManName; + } + set + { + if ((this._FireWatchManName != value)) + { + this.OnFireWatchManNameChanging(value); + this.SendPropertyChanging(); + this._FireWatchManName = value; + this.SendPropertyChanged("FireWatchManName"); + this.OnFireWatchManNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLeaderName", DbType="NVarChar(200)")] + public string WorkLeaderName + { + get + { + return this._WorkLeaderName; + } + set + { + if ((this._WorkLeaderName != value)) + { + this.OnWorkLeaderNameChanging(value); + this.SendPropertyChanging(); + this._WorkLeaderName = value; + this.SendPropertyChanged("WorkLeaderName"); + this.OnWorkLeaderNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLeaderTel", DbType="NVarChar(200)")] + public string WorkLeaderTel + { + get + { + return this._WorkLeaderTel; + } + set + { + if ((this._WorkLeaderTel != value)) + { + this.OnWorkLeaderTelChanging(value); + this.SendPropertyChanging(); + this._WorkLeaderTel = value; + this.SendPropertyChanged("WorkLeaderTel"); + this.OnWorkLeaderTelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_Electricity_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.License_Electricity.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.License_Electricity.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_Electricity_Base_Unit", Storage="_Base_Unit", ThisKey="ApplyUnitId", OtherKey="UnitId", IsForeignKey=true)] + public Base_Unit Base_Unit + { + get + { + return this._Base_Unit.Entity; + } + set + { + Base_Unit previousValue = this._Base_Unit.Entity; + if (((previousValue != value) + || (this._Base_Unit.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Unit.Entity = null; + previousValue.License_Electricity.Remove(this); + } + this._Base_Unit.Entity = value; + if ((value != null)) + { + value.License_Electricity.Add(this); + this._ApplyUnitId = value.UnitId; + } + else + { + this._ApplyUnitId = default(string); + } + this.SendPropertyChanged("Base_Unit"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_Electricity_Sys_User", Storage="_Sys_User", ThisKey="ApplyManId", OtherKey="UserId", IsForeignKey=true)] + public Sys_User Sys_User + { + get + { + return this._Sys_User.Entity; + } + set + { + Sys_User previousValue = this._Sys_User.Entity; + if (((previousValue != value) + || (this._Sys_User.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Sys_User.Entity = null; + previousValue.License_Electricity.Remove(this); + } + this._Sys_User.Entity = value; + if ((value != null)) + { + value.License_Electricity.Add(this); + this._ApplyManId = value.UserId; + } + else + { + this._ApplyManId = default(string); + } + this.SendPropertyChanged("Sys_User"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_Electricity_Sys_User2", Storage="_CancelMan", ThisKey="CancelManId", OtherKey="UserId", IsForeignKey=true)] + public Sys_User CancelMan + { + get + { + return this._CancelMan.Entity; + } + set + { + Sys_User previousValue = this._CancelMan.Entity; + if (((previousValue != value) + || (this._CancelMan.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._CancelMan.Entity = null; + previousValue.License_Electricity_Sys_User2.Remove(this); + } + this._CancelMan.Entity = value; + if ((value != null)) + { + value.License_Electricity_Sys_User2.Add(this); + this._CancelManId = value.UserId; + } + else + { + this._CancelManId = default(string); + } + this.SendPropertyChanged("CancelMan"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_Electricity_Sys_User3", Storage="_CloseMan", ThisKey="CloseManId", OtherKey="UserId", IsForeignKey=true)] + public Sys_User CloseMan + { + get + { + return this._CloseMan.Entity; + } + set + { + Sys_User previousValue = this._CloseMan.Entity; + if (((previousValue != value) + || (this._CloseMan.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._CloseMan.Entity = null; + previousValue.License_Electricity_Sys_User3.Remove(this); + } + this._CloseMan.Entity = value; + if ((value != null)) + { + value.License_Electricity_Sys_User3.Add(this); + this._CloseManId = value.UserId; + } + else + { + this._CloseManId = default(string); + } + this.SendPropertyChanged("CloseMan"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.License_EquipmentSafetyList")] public partial class License_EquipmentSafetyList : INotifyPropertyChanging, INotifyPropertyChanged { @@ -207395,6 +208377,12 @@ namespace Model private string _OldLicenseId; + private string _WorkAreaId; + + private string _Reason; + + private string _FireLevel; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -207453,6 +208441,12 @@ namespace Model partial void OnFireWatchManNameChanged(); partial void OnOldLicenseIdChanging(string value); partial void OnOldLicenseIdChanged(); + partial void OnWorkAreaIdChanging(string value); + partial void OnWorkAreaIdChanged(); + partial void OnReasonChanging(string value); + partial void OnReasonChanged(); + partial void OnFireLevelChanging(string value); + partial void OnFireLevelChanged(); #endregion public License_FireWork() @@ -207910,6 +208904,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(500)")] + public string WorkAreaId + { + get + { + return this._WorkAreaId; + } + set + { + if ((this._WorkAreaId != value)) + { + this.OnWorkAreaIdChanging(value); + this.SendPropertyChanging(); + this._WorkAreaId = value; + this.SendPropertyChanged("WorkAreaId"); + this.OnWorkAreaIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Reason", DbType="NVarChar(500)")] + public string Reason + { + get + { + return this._Reason; + } + set + { + if ((this._Reason != value)) + { + this.OnReasonChanging(value); + this.SendPropertyChanging(); + this._Reason = value; + this.SendPropertyChanged("Reason"); + this.OnReasonChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FireLevel", DbType="NVarChar(20)")] + public string FireLevel + { + get + { + return this._FireLevel; + } + set + { + if ((this._FireLevel != value)) + { + this.OnFireLevelChanging(value); + this.SendPropertyChanging(); + this._FireLevel = value; + this.SendPropertyChanged("FireLevel"); + this.OnFireLevelChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_FireWork_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -208914,6 +209968,18 @@ namespace Model private string _OldLicenseId; + private string _WorkAreaId; + + private string _WorkHeight; + + private string _HeightLevel; + + private string _FireWatchManName; + + private string _WorkLeaderName; + + private string _WorkLeaderTel; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -208970,6 +210036,18 @@ namespace Model partial void OnNextManIdChanged(); partial void OnOldLicenseIdChanging(string value); partial void OnOldLicenseIdChanged(); + partial void OnWorkAreaIdChanging(string value); + partial void OnWorkAreaIdChanged(); + partial void OnWorkHeightChanging(string value); + partial void OnWorkHeightChanged(); + partial void OnHeightLevelChanging(string value); + partial void OnHeightLevelChanged(); + partial void OnFireWatchManNameChanging(string value); + partial void OnFireWatchManNameChanged(); + partial void OnWorkLeaderNameChanging(string value); + partial void OnWorkLeaderNameChanged(); + partial void OnWorkLeaderTelChanging(string value); + partial void OnWorkLeaderTelChanged(); #endregion public License_HeightWork() @@ -209422,6 +210500,126 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(500)")] + public string WorkAreaId + { + get + { + return this._WorkAreaId; + } + set + { + if ((this._WorkAreaId != value)) + { + this.OnWorkAreaIdChanging(value); + this.SendPropertyChanging(); + this._WorkAreaId = value; + this.SendPropertyChanged("WorkAreaId"); + this.OnWorkAreaIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkHeight", DbType="NVarChar(20)")] + public string WorkHeight + { + get + { + return this._WorkHeight; + } + set + { + if ((this._WorkHeight != value)) + { + this.OnWorkHeightChanging(value); + this.SendPropertyChanging(); + this._WorkHeight = value; + this.SendPropertyChanged("WorkHeight"); + this.OnWorkHeightChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HeightLevel", DbType="NVarChar(20)")] + public string HeightLevel + { + get + { + return this._HeightLevel; + } + set + { + if ((this._HeightLevel != value)) + { + this.OnHeightLevelChanging(value); + this.SendPropertyChanging(); + this._HeightLevel = value; + this.SendPropertyChanged("HeightLevel"); + this.OnHeightLevelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FireWatchManName", DbType="NVarChar(500)")] + public string FireWatchManName + { + get + { + return this._FireWatchManName; + } + set + { + if ((this._FireWatchManName != value)) + { + this.OnFireWatchManNameChanging(value); + this.SendPropertyChanging(); + this._FireWatchManName = value; + this.SendPropertyChanged("FireWatchManName"); + this.OnFireWatchManNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLeaderName", DbType="NVarChar(200)")] + public string WorkLeaderName + { + get + { + return this._WorkLeaderName; + } + set + { + if ((this._WorkLeaderName != value)) + { + this.OnWorkLeaderNameChanging(value); + this.SendPropertyChanging(); + this._WorkLeaderName = value; + this.SendPropertyChanged("WorkLeaderName"); + this.OnWorkLeaderNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLeaderTel", DbType="NVarChar(200)")] + public string WorkLeaderTel + { + get + { + return this._WorkLeaderTel; + } + set + { + if ((this._WorkLeaderTel != value)) + { + this.OnWorkLeaderTelChanging(value); + this.SendPropertyChanging(); + this._WorkLeaderTel = value; + this.SendPropertyChanged("WorkLeaderTel"); + this.OnWorkLeaderTelChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_HeightWork_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -211032,6 +212230,20 @@ namespace Model private string _OldLicenseId; + private string _WorkAreaId; + + private string _LiftingHeight; + + private string _FireWatchManName; + + private string _WorkLeaderName; + + private string _WorkLeaderTel; + + private string _QzgName; + + private string _QzgPhone; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -211088,6 +212300,20 @@ namespace Model partial void OnNextManIdChanged(); partial void OnOldLicenseIdChanging(string value); partial void OnOldLicenseIdChanged(); + partial void OnWorkAreaIdChanging(string value); + partial void OnWorkAreaIdChanged(); + partial void OnLiftingHeightChanging(string value); + partial void OnLiftingHeightChanged(); + partial void OnFireWatchManNameChanging(string value); + partial void OnFireWatchManNameChanged(); + partial void OnWorkLeaderNameChanging(string value); + partial void OnWorkLeaderNameChanged(); + partial void OnWorkLeaderTelChanging(string value); + partial void OnWorkLeaderTelChanged(); + partial void OnQzgNameChanging(string value); + partial void OnQzgNameChanged(); + partial void OnQzgPhoneChanging(string value); + partial void OnQzgPhoneChanged(); #endregion public License_LiftingWork() @@ -211540,6 +212766,146 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(500)")] + public string WorkAreaId + { + get + { + return this._WorkAreaId; + } + set + { + if ((this._WorkAreaId != value)) + { + this.OnWorkAreaIdChanging(value); + this.SendPropertyChanging(); + this._WorkAreaId = value; + this.SendPropertyChanged("WorkAreaId"); + this.OnWorkAreaIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LiftingHeight", DbType="NVarChar(20)")] + public string LiftingHeight + { + get + { + return this._LiftingHeight; + } + set + { + if ((this._LiftingHeight != value)) + { + this.OnLiftingHeightChanging(value); + this.SendPropertyChanging(); + this._LiftingHeight = value; + this.SendPropertyChanged("LiftingHeight"); + this.OnLiftingHeightChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FireWatchManName", DbType="NVarChar(500)")] + public string FireWatchManName + { + get + { + return this._FireWatchManName; + } + set + { + if ((this._FireWatchManName != value)) + { + this.OnFireWatchManNameChanging(value); + this.SendPropertyChanging(); + this._FireWatchManName = value; + this.SendPropertyChanged("FireWatchManName"); + this.OnFireWatchManNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLeaderName", DbType="NVarChar(200)")] + public string WorkLeaderName + { + get + { + return this._WorkLeaderName; + } + set + { + if ((this._WorkLeaderName != value)) + { + this.OnWorkLeaderNameChanging(value); + this.SendPropertyChanging(); + this._WorkLeaderName = value; + this.SendPropertyChanged("WorkLeaderName"); + this.OnWorkLeaderNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLeaderTel", DbType="NVarChar(200)")] + public string WorkLeaderTel + { + get + { + return this._WorkLeaderTel; + } + set + { + if ((this._WorkLeaderTel != value)) + { + this.OnWorkLeaderTelChanging(value); + this.SendPropertyChanging(); + this._WorkLeaderTel = value; + this.SendPropertyChanged("WorkLeaderTel"); + this.OnWorkLeaderTelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QzgName", DbType="NVarChar(200)")] + public string QzgName + { + get + { + return this._QzgName; + } + set + { + if ((this._QzgName != value)) + { + this.OnQzgNameChanging(value); + this.SendPropertyChanging(); + this._QzgName = value; + this.SendPropertyChanged("QzgName"); + this.OnQzgNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QzgPhone", DbType="NVarChar(200)")] + public string QzgPhone + { + get + { + return this._QzgPhone; + } + set + { + if ((this._QzgPhone != value)) + { + this.OnQzgPhoneChanging(value); + this.SendPropertyChanging(); + this._QzgPhone = value; + this.SendPropertyChanged("QzgPhone"); + this.OnQzgPhoneChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_LiftingWork_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -211779,6 +213145,22 @@ namespace Model private string _OldLicenseId; + private string _WorkAreaId; + + private string _LimitedDescribe; + + private System.Nullable _IsBoolOther; + + private System.Nullable _IsBoolHarmfulGas; + + private string _TestResult; + + private System.Nullable _TestDate; + + private string _TestPerson; + + private string _VenStep; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -211837,6 +213219,22 @@ namespace Model partial void OnFireWatchManNameChanged(); partial void OnOldLicenseIdChanging(string value); partial void OnOldLicenseIdChanged(); + partial void OnWorkAreaIdChanging(string value); + partial void OnWorkAreaIdChanged(); + partial void OnLimitedDescribeChanging(string value); + partial void OnLimitedDescribeChanged(); + partial void OnIsBoolOtherChanging(System.Nullable value); + partial void OnIsBoolOtherChanged(); + partial void OnIsBoolHarmfulGasChanging(System.Nullable value); + partial void OnIsBoolHarmfulGasChanged(); + partial void OnTestResultChanging(string value); + partial void OnTestResultChanged(); + partial void OnTestDateChanging(System.Nullable value); + partial void OnTestDateChanged(); + partial void OnTestPersonChanging(string value); + partial void OnTestPersonChanged(); + partial void OnVenStepChanging(string value); + partial void OnVenStepChanged(); #endregion public License_LimitedSpace() @@ -212294,6 +213692,166 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(500)")] + public string WorkAreaId + { + get + { + return this._WorkAreaId; + } + set + { + if ((this._WorkAreaId != value)) + { + this.OnWorkAreaIdChanging(value); + this.SendPropertyChanging(); + this._WorkAreaId = value; + this.SendPropertyChanged("WorkAreaId"); + this.OnWorkAreaIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LimitedDescribe", DbType="NVarChar(500)")] + public string LimitedDescribe + { + get + { + return this._LimitedDescribe; + } + set + { + if ((this._LimitedDescribe != value)) + { + this.OnLimitedDescribeChanging(value); + this.SendPropertyChanging(); + this._LimitedDescribe = value; + this.SendPropertyChanged("LimitedDescribe"); + this.OnLimitedDescribeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsBoolOther", DbType="Bit")] + public System.Nullable IsBoolOther + { + get + { + return this._IsBoolOther; + } + set + { + if ((this._IsBoolOther != value)) + { + this.OnIsBoolOtherChanging(value); + this.SendPropertyChanging(); + this._IsBoolOther = value; + this.SendPropertyChanged("IsBoolOther"); + this.OnIsBoolOtherChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsBoolHarmfulGas", DbType="Bit")] + public System.Nullable IsBoolHarmfulGas + { + get + { + return this._IsBoolHarmfulGas; + } + set + { + if ((this._IsBoolHarmfulGas != value)) + { + this.OnIsBoolHarmfulGasChanging(value); + this.SendPropertyChanging(); + this._IsBoolHarmfulGas = value; + this.SendPropertyChanged("IsBoolHarmfulGas"); + this.OnIsBoolHarmfulGasChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestResult", DbType="NVarChar(500)")] + public string TestResult + { + get + { + return this._TestResult; + } + set + { + if ((this._TestResult != value)) + { + this.OnTestResultChanging(value); + this.SendPropertyChanging(); + this._TestResult = value; + this.SendPropertyChanged("TestResult"); + this.OnTestResultChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestDate", DbType="DateTime")] + public System.Nullable TestDate + { + get + { + return this._TestDate; + } + set + { + if ((this._TestDate != value)) + { + this.OnTestDateChanging(value); + this.SendPropertyChanging(); + this._TestDate = value; + this.SendPropertyChanged("TestDate"); + this.OnTestDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPerson", DbType="NVarChar(100)")] + public string TestPerson + { + get + { + return this._TestPerson; + } + set + { + if ((this._TestPerson != value)) + { + this.OnTestPersonChanging(value); + this.SendPropertyChanging(); + this._TestPerson = value; + this.SendPropertyChanged("TestPerson"); + this.OnTestPersonChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_VenStep", DbType="NVarChar(20)")] + public string VenStep + { + get + { + return this._VenStep; + } + set + { + if ((this._VenStep != value)) + { + this.OnVenStepChanging(value); + this.SendPropertyChanging(); + this._VenStep = value; + this.SendPropertyChanged("VenStep"); + this.OnVenStepChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_LimitedSpace_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -213444,6 +215002,12 @@ namespace Model private string _OldLicenseId; + private string _WorkAreaId; + + private string _Reason; + + private string _FireWatchManName; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -213500,6 +215064,12 @@ namespace Model partial void OnNextManIdChanged(); partial void OnOldLicenseIdChanging(string value); partial void OnOldLicenseIdChanged(); + partial void OnWorkAreaIdChanging(string value); + partial void OnWorkAreaIdChanged(); + partial void OnReasonChanging(string value); + partial void OnReasonChanged(); + partial void OnFireWatchManNameChanging(string value); + partial void OnFireWatchManNameChanged(); #endregion public License_OpenCircuit() @@ -213952,6 +215522,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(500)")] + public string WorkAreaId + { + get + { + return this._WorkAreaId; + } + set + { + if ((this._WorkAreaId != value)) + { + this.OnWorkAreaIdChanging(value); + this.SendPropertyChanging(); + this._WorkAreaId = value; + this.SendPropertyChanged("WorkAreaId"); + this.OnWorkAreaIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Reason", DbType="NVarChar(500)")] + public string Reason + { + get + { + return this._Reason; + } + set + { + if ((this._Reason != value)) + { + this.OnReasonChanging(value); + this.SendPropertyChanging(); + this._Reason = value; + this.SendPropertyChanged("Reason"); + this.OnReasonChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FireWatchManName", DbType="NVarChar(500)")] + public string FireWatchManName + { + get + { + return this._FireWatchManName; + } + set + { + if ((this._FireWatchManName != value)) + { + this.OnFireWatchManNameChanging(value); + this.SendPropertyChanging(); + this._FireWatchManName = value; + this.SendPropertyChanged("FireWatchManName"); + this.OnFireWatchManNameChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_OpenCircuit_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -214197,6 +215827,8 @@ namespace Model private string _OldLicenseId; + private string _WorkAreaId; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -214263,6 +215895,8 @@ namespace Model partial void OnNextManIdChanged(); partial void OnOldLicenseIdChanging(string value); partial void OnOldLicenseIdChanged(); + partial void OnWorkAreaIdChanging(string value); + partial void OnWorkAreaIdChanged(); #endregion public License_RadialWork() @@ -214785,6 +216419,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(500)")] + public string WorkAreaId + { + get + { + return this._WorkAreaId; + } + set + { + if ((this._WorkAreaId != value)) + { + this.OnWorkAreaIdChanging(value); + this.SendPropertyChanging(); + this._WorkAreaId = value; + this.SendPropertyChanged("WorkAreaId"); + this.OnWorkAreaIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_RadialWork_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -324144,6 +325798,12 @@ namespace Model private EntitySet _License_BreakGround_Sys_User3; + private EntitySet _License_Electricity; + + private EntitySet _License_Electricity_Sys_User2; + + private EntitySet _License_Electricity_Sys_User3; + private EntitySet _License_EquipmentSafetyList; private EntitySet _License_FireWork; @@ -324768,6 +326428,9 @@ namespace Model this._License_BreakGround = new EntitySet(new Action(this.attach_License_BreakGround), new Action(this.detach_License_BreakGround)); this._License_BreakGround_Sys_User2 = new EntitySet(new Action(this.attach_License_BreakGround_Sys_User2), new Action(this.detach_License_BreakGround_Sys_User2)); this._License_BreakGround_Sys_User3 = new EntitySet(new Action(this.attach_License_BreakGround_Sys_User3), new Action(this.detach_License_BreakGround_Sys_User3)); + this._License_Electricity = new EntitySet(new Action(this.attach_License_Electricity), new Action(this.detach_License_Electricity)); + this._License_Electricity_Sys_User2 = new EntitySet(new Action(this.attach_License_Electricity_Sys_User2), new Action(this.detach_License_Electricity_Sys_User2)); + this._License_Electricity_Sys_User3 = new EntitySet(new Action(this.attach_License_Electricity_Sys_User3), new Action(this.detach_License_Electricity_Sys_User3)); this._License_EquipmentSafetyList = new EntitySet(new Action(this.attach_License_EquipmentSafetyList), new Action(this.detach_License_EquipmentSafetyList)); this._License_FireWork = new EntitySet(new Action(this.attach_License_FireWork), new Action(this.detach_License_FireWork)); this._License_FireWork_Sys_User1 = new EntitySet(new Action(this.attach_License_FireWork_Sys_User1), new Action(this.detach_License_FireWork_Sys_User1)); @@ -328014,6 +329677,45 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_Electricity_Sys_User", Storage="_License_Electricity", ThisKey="UserId", OtherKey="ApplyManId", DeleteRule="NO ACTION")] + public EntitySet License_Electricity + { + get + { + return this._License_Electricity; + } + set + { + this._License_Electricity.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_Electricity_Sys_User2", Storage="_License_Electricity_Sys_User2", ThisKey="UserId", OtherKey="CancelManId", DeleteRule="NO ACTION")] + public EntitySet License_Electricity_Sys_User2 + { + get + { + return this._License_Electricity_Sys_User2; + } + set + { + this._License_Electricity_Sys_User2.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_Electricity_Sys_User3", Storage="_License_Electricity_Sys_User3", ThisKey="UserId", OtherKey="CloseManId", DeleteRule="NO ACTION")] + public EntitySet License_Electricity_Sys_User3 + { + get + { + return this._License_Electricity_Sys_User3; + } + set + { + this._License_Electricity_Sys_User3.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_EquipmentSafetyList_Sys_User", Storage="_License_EquipmentSafetyList", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet License_EquipmentSafetyList { @@ -332317,6 +334019,42 @@ namespace Model entity.CloseMan = null; } + private void attach_License_Electricity(License_Electricity entity) + { + this.SendPropertyChanging(); + entity.Sys_User = this; + } + + private void detach_License_Electricity(License_Electricity entity) + { + this.SendPropertyChanging(); + entity.Sys_User = null; + } + + private void attach_License_Electricity_Sys_User2(License_Electricity entity) + { + this.SendPropertyChanging(); + entity.CancelMan = this; + } + + private void detach_License_Electricity_Sys_User2(License_Electricity entity) + { + this.SendPropertyChanging(); + entity.CancelMan = null; + } + + private void attach_License_Electricity_Sys_User3(License_Electricity entity) + { + this.SendPropertyChanging(); + entity.CloseMan = this; + } + + private void detach_License_Electricity_Sys_User3(License_Electricity entity) + { + this.SendPropertyChanging(); + entity.CloseMan = null; + } + private void attach_License_EquipmentSafetyList(License_EquipmentSafetyList entity) { this.SendPropertyChanging(); From bd9118210169ce7bc65a886add24e1c1db0233e5 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Tue, 12 Sep 2023 14:39:54 +0800 Subject: [PATCH 03/11] 2023-09-12 --- .vs/SGGL_CWCEC/v17/.wsuo | Bin 22016 -> 27648 bytes .../CQMS/Solution/ConstructSolution.aspx.cs | 35 ++++- .../DocManage/DocManageEdit.aspx | 111 +++++++++------ .../DocManage/DocManageEdit.aspx.cs | 23 ++- .../DocManage/DocManageEdit.aspx.designer.cs | 132 +++++++++++------- .../DocManage/DocManageView.aspx | 5 +- .../DocManage/DocManageView.aspx.cs | 2 +- .../DocManage/DocManageView.aspx.designer.cs | 2 +- 8 files changed, 213 insertions(+), 97 deletions(-) diff --git a/.vs/SGGL_CWCEC/v17/.wsuo b/.vs/SGGL_CWCEC/v17/.wsuo index 7a9829f76ea2c33a0ce19b96587be1b2ade4f313..f82841d400b95cb2597b72fed8143576c23e55c2 100644 GIT binary patch literal 27648 zcmeHPU2G#)6`pKqX=$O9mO@K^Tz4sj?xg;UV~4hE;v~BZ$!>O?%`Vg>9nXxj-q;>@ zX1v+#QdA+RkWht$KvYybfan7V(N^jUEo`9@5`AhB;sKsOqNshUctA*?cKN>48eT`10bkXo)qrWeV)2y>v=QcfxdKz#vEQ_5*C zA>j39W!D=0LGeF^x**<@_ZUg<4JCYL=|0BqIZ@prU z*}E+03zTQ}(RF|i0GMH zZa}mtjp>mM;uy~mMp_II2P6O=0eC5cYmgqekn;ch*9P(r_EdI~{7W8@^MI7qYwB`D z`Tr1r@-OpJ{;vmcE|B?U8tIiF6W$kBj6?gd4l8rF#vgnWpBm(69DoJ=l?qZcLG8Hjz8yciG%lh>hD~m$Qz#l z+y~eLPyxe$`vF`RIQO%Roc~Ago&<~nQh+pI4DeaN1Aqqs4*@<0*b5j3OaL-~Nx&3f z8n6$rAK-77|M^fo?XWM;Jf4pN768Wp#{pjid>?f63@VgBew8S376jujwL<#O3!q9);hb)r$JLmRN=WwHpGAw|~ zd7*=s&=L#Ue^&IvDM+4Pg$4m&EwDg59zLg3yNYqI&;B2J>dU5kh8xSn(*Ko4HZ)S&Kl$k=zj3!~1DghV8&u1kIosm4m5Q-C|51eRCTkJb6zg5=Ml2iObVOgxPC)I@Jv;6yn`kw2=4 zm4WnAp9%qj(!UFNCH_N#=Srd#l)NQygtS0RBGyLUPJ#0e?EPV!W zp*ek{_Z%YS{C6B=taapn_gIfqM4#K>rZRN&fFd|AH6`SMX?ljYC<&Ks!zd-UR-kaGmy` z^b>bO|00(UFGzSwu@!p8Kg5v)I^3n#t(2Rc;*vn!CSY0t24uiW?c-iaVIaoku= z)&Z-|-XP^<9)J6%z*W zBkwWDc6GYsF;uq|I5m>VZnFRFcahV>*V{#zIg2>&h2zzv+*EfB9EN&Fz?ZkhtS|fODs} zckHccWpl-{myZ=IhP4tNbM2bBCw#;#Tc^xPvuaihv!WMGCp=crN)D2yEn7Fe^tHGH z6}?n5%sJb%&624(=2}V?@49Om)5Q{$jPO|aK*e#jQpq&Jd%|n=uTGdJv{OZk8D^{% z({YiCB4!3mT`KDCxb7CM3R356t6X)DI;d+;_)wLx&eZ9uhGrVF@mb4uk*{jn?&?9U zjK;9oNwh<}?Flo(WYI>1SLwK;gU(`QDg5}Juw#{KUi?{PtO;VPmQ!>sdlfZRYD=a& zY}re|pFLr%faX(0b7g(^F#*H@gGSnIG-CVucp(41@%`mes(Jr&3HpC|wOCd6r;LKc#1) zg8hpZ%W^UhKk>>S<2&7HFO&LbF#A9ERkN^sYOqSIw*&zH5YIXAd;{Ci39n2euSox2 zC;Q)=uzys{ppZ0pL`wWxlSz5ZeW2CLc-<~<7an~rVLhCVm*#6{irB_Z~ z6LtDoUr_wCRg(u8#z7bTUaO*~9oU0(^g8KP(Y6faFOJ_h&bg#<9mTFa1@;}4QNAPo2Gyh*0`Co7U z*@*uezL(Y+0P-jJuN(QN{gpneeg(<wMV>{=d#G?3_wI=!)Q`>MnKv-^A?nJkRb8<6KQI{zLX1VG8v$ zbxokx_(FD0l+R@6OxJ}O6~^MT;i_kH9fNOTeC_~a+E`QHdHI#IVb6Y=?WO$Avc`s6 zEZ*a#(stOo>*n~a8N1~mP0Y-67@g|95iHL@W}C(-j8~LTd;bx7G3+;mL__!5nyH z=o#R*K`x#RaeglZPe23^Qk3{wuL3;ACmCFIY+89-70?XjQg_iuJBAT+i~V1 zw1d8l(nafqQy2?+m~6D6i0|9j3r}8zUSK4{o&CsOgYM~iz*$i>=4DG8G4KsJRX4%lysxKL+sTJ)Ahx zbIO0d^}EG$-_9xDJ@}lH!#uSQzZrbRmw~s99@WemeP?R4g*~i1g6n$X=54Lw6fCm}~o8@Yb@9aPEGJdAfr~Gz;bGN9+ zZ;av}2{3ZMfjKjdQOTn}3+PW3^DVzuq=z_x*cjqfc!!gCOW}#%aiowxjb99LBgm(&4{?1kyF4S;m-X8_L+9;^N#a8EsoyWC&(D5m_?GYeS9|T(h*H`gvfEkf|3>RK z+rLr#Msdu`(Chl$?W));=Y#dTTRmp5ep8zptlzCV#Lis5JKN7Mj1Js9>*(Mg?hO>> ztAK9zEL)xP%FzC)>)4_N7h(_4Our+}dy)QL_H5nK-@Fs^k9oIsHB;iRYy0++%~%Kg z!}Egu;GeCI8CZBrA-Mi=T4=bW`9er+v&`^6Qp%#opFj(?d&X+U&K*1VXP!kxQNGf* zHpu-OD(or9{aa6kQHc6~@B26J9EG=k>#YT1-_=`DQR>3(-&z}*Rd!$d?)ZIA{dWHg zfBD(#H$Hpp`WfYom;QPDo8ezh{e0|C`qTeDP4^x`R!J3ZdiA|m@0j_?4~<`Z|BiRk z?Q(kggI)RE|17KqC1J<$&c~5U`A;44)ExhH?+S6^nE%4JKJ3D#h~Gf(P8MQXK}#BH zG?_@Ki9||MQ<@f0N3~=!l1?Y$1w#|;BL41{l@#|X$~DS_nw=ku;CI#>i6ryssIKbC zNK#EClbV{2XlXSXiyKiRYDQ!E_~R4zBYQM13PhtxBNj`?R5LzmsEMdL*Mb zqsvWN?m^R~L9V!z7#Tk87~xP~DxRviz_s=vsfS@Pxfoqc^byMu?Tlq-YL07_J&Hu# zEe6v*v(|LccHGcWHG6m_l-2EGwVkE5R{?9sU;z!p{YEQ{?xAUX$lOt!MuIRjr-NQR zd43JNWkT#SVypX)!TuqL@3sB@;ZoNh`5mFqAI;Ic5sk)@s*yC}P*h^Ns+rK}lChMY z9yMe6h!$_vAFm$hk2^qr+=4nN^`|bUowe*z|67ab@}Xb)UzcdtvJdpXjh)j2{jZ@| Q4)i~WOTQJd%S8YCA4EdpuK)l5 delta 2026 zcmcJQO>7%Q6o6;^*RA6?PP|F&;Mz@aN$l9k#&(=_+NzFXq+lntOHq|XO>IY6Q)r4q zu+@eZ*$8nWm+V7ANacb!B8u2sFPJumibE*~LE(OOOL8a@YrUPB z_ukCB`QDp#`93XwNxxpwn4@=B?|ppxH)rbbUeQCp&8u&Eu0SW*2HpH^%S zpl~RMP#h>s--GQF*1^ZPt*Z~edkLSR^B#Xy}!s4m#gD*86H4atZ6b~wy-H!9v8Q=ovX#IC6Z9AbDuY=BL69>_k z%@ej;)@KsJ@d!#7W%L;vv%^DUh<^nQag+qg)V32;TB7TjHTnNu-&~+RD4I)jNZG_U z^+3_`frcka&0?UkZ<1sDG0>;5ZgA^^IEcckF99*F02POhTA=DnnA%a#Qmi^c!C%&k zsL(>ydX-K?kuOm{Y~nit#m4A-?gsUNO%r?`$?gXAQ>5mGOM~ z)hlA50HR92hgM8;b_{& zQ9^Mo{IblZMU$@HB_u}12>cZH@c|(aI5&~M#C&`xs)0+bOOUOEDm89RKM=mX7m zTTZ;y!QXmv%Q^MMXNzBb;(QdDBKK}WW%jJMK#F9Uq{s@%lQ(g(6GV$YLfGY_TTu}5 zMwAdeLXARnE|6?iN70F$-W?g0auI1H>(2!vqCX^s!+ueaf_^EykPC%|1G%h-ywJOO zK7l{y{^Cuz0^627>aOr!R+Q)a;X>R7(fJ{`5pO@JK|A~AF2dWHBt)`(u$)vrVM*|Zg5d?fD2b9^7!63nQce_u!}w3IH!Is-tQPZ^&%oMP zh@1I={Z(PQ!@F=!F#CIT*y$pBer%lq&Lpt#f Dl*OF= diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs index d6f9ae17..34c56e87 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs @@ -304,11 +304,36 @@ namespace FineUIPro.Web.CQMS.Solution if (CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.UserId, Const.CQMSConstructSolutionMenuId, Const.BtnDelete)) { var constructSolution = CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(id); - CQMSConstructSolutionApproveService.DeleteConstructSolutionApprovesByConstructSolutionId(id); - CQMSConstructSolutionService.DeleteConstructSolution(id); - LogService.AddSys_Log(CurrUser, constructSolution.Code, id, Const.CQMSConstructSolutionMenuId, "删除方案审查"); - BindGrid(); - Alert.ShowInTop("删除成功！", MessageBoxIcon.Success); + if (constructSolution.State== Const.CQMSConstructSolution_ReCompile|| constructSolution.State == Const.CQMSConstructSolution_Compile) + { + if (constructSolution.CompileMan==this.CurrUser.UserId|| this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.sysglyId) + { + CQMSConstructSolutionApproveService.DeleteConstructSolutionApprovesByConstructSolutionId(id); + CQMSConstructSolutionService.DeleteConstructSolution(id); + LogService.AddSys_Log(CurrUser, constructSolution.Code, id, Const.CQMSConstructSolutionMenuId, "删除方案审查"); + BindGrid(); + Alert.ShowInTop("删除成功！", MessageBoxIcon.Success); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Success); + } + } + else + { + if (this.CurrUser.UserId==Const.hfnbdId|| this.CurrUser.UserId==Const.sysglyId) + { + + CQMSConstructSolutionApproveService.DeleteConstructSolutionApprovesByConstructSolutionId(id); + CQMSConstructSolutionService.DeleteConstructSolution(id); + LogService.AddSys_Log(CurrUser, constructSolution.Code, id, Const.CQMSConstructSolutionMenuId, "删除方案审查"); + BindGrid(); + Alert.ShowInTop("删除成功！", MessageBoxIcon.Success); + return; + } + Alert.ShowInTop("删除失败，方案正在审批中！", MessageBoxIcon.Success); + } + } else diff --git a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx index cc5e25b4..d6ea4cd2 100644 --- a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx +++ b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx @@ -21,7 +21,7 @@ background-color: #FF7575; background-image: none; } - + .fontred { color: #FF7575; background-image: none; @@ -42,7 +42,7 @@ - + - - - - - - - - - - - - - - - - - - - - - - @@ -99,6 +72,15 @@ + + + + + + + + <%-- @@ -118,7 +100,7 @@ - + - - + + + + + + + + + + + + + + + @@ -153,6 +145,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + protected global::FineUIPro.DropDownList drpSendUnit; - /// - /// txtReceivUnit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList txtReceivUnit; - - /// - /// drpHandleMan 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpHandleMan; - - /// - /// trCopyMan 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Tree trCopyMan; - /// /// txtDocName 控件。 /// @@ -113,15 +86,6 @@ namespace FineUIPro.Web.DocManage /// protected global::FineUIPro.TextBox txtDocName; - /// - /// txtDocCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtDocCode; - /// /// drpDocType 控件。 /// @@ -140,6 +104,15 @@ namespace FineUIPro.Web.DocManage /// protected global::FineUIPro.DropDownList drpProSubject; + /// + /// txtDocCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtDocCode; + /// /// txtCompileMan 控件。 /// @@ -177,22 +150,13 @@ namespace FineUIPro.Web.DocManage protected global::FineUIPro.Button imgfile; /// - /// drpHandleType 控件。 + /// TabStrip1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.RadioButtonList drpHandleType; - - /// - /// txtFinishTime 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtFinishTime; + protected global::FineUIPro.TabStrip TabStrip1; /// /// txtDocContent 控件。 @@ -201,7 +165,7 @@ namespace FineUIPro.Web.DocManage /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextArea txtDocContent; + protected global::FineUIPro.HtmlEditor txtDocContent; /// /// Options 控件。 @@ -221,6 +185,78 @@ namespace FineUIPro.Web.DocManage /// protected global::FineUIPro.TextArea txtOpinions; + /// + /// next22 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow next22; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form3; + + /// + /// drpHandleType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList drpHandleType; + + /// + /// txtFinishTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtFinishTime; + + /// + /// txtReceivUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList txtReceivUnit; + + /// + /// drpHandleMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpHandleMan; + + /// + /// trCopyMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree trCopyMan; + /// /// next 控件。 /// diff --git a/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx b/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx index a561b1d7..370cf330 100644 --- a/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx +++ b/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx @@ -96,8 +96,9 @@ - - + + diff --git a/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.cs b/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.cs index 89934393..c82a8565 100644 --- a/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.cs +++ b/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.cs @@ -73,7 +73,7 @@ namespace FineUIPro.Web.DocManage { this.txtFinishTime.Text = string.Format("{0:yyyy-MM-dd}", doc.FinishTime); } - txtDocContent.Text = doc.DocContent; + txtDocContent.Text = HttpUtility.HtmlDecode(doc.DocContent); if (!string.IsNullOrEmpty(doc.State)) { State = doc.State; diff --git a/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.designer.cs b/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.designer.cs index a423bafd..5a1cc6a6 100644 --- a/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.designer.cs @@ -147,7 +147,7 @@ namespace FineUIPro.Web.DocManage /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextArea txtDocContent; + protected global::FineUIPro.HtmlEditor txtDocContent; /// /// plApprove2 控件。 From dc3ef91a437b35ed9d496e9a3a7dc84f2cf9c942 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 12 Sep 2023 15:20:29 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BA=A7=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/common/mainProject2.aspx | 2307 +++++++++-------- .../FineUIPro.Web/common/mainProject2.aspx.cs | 2 +- 2 files changed, 1297 insertions(+), 1012 deletions(-) diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx b/SGGL/FineUIPro.Web/common/mainProject2.aspx index 66316df1..9043f130 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx @@ -1,1012 +1,1297 @@ -using BLL; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Data; -using System.Data.SqlClient; -using System.IO; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - - -namespace FineUIPro.Web.common -{ - public partial class mainProject2 : PageBase - { - /// - /// 项目id - /// - public string ProjectId - { - get - { - return (string)ViewState["ProjectId"]; - } - set - { - ViewState["ProjectId"] = value; - } - - } - /// - /// 页面加载 - /// - /// - /// - protected void Page_Load(object sender, EventArgs e) - { - if (!IsPostBack) - { - ProjectId = CurrUser.LoginProjectId; - Model.SGGLDB db = Funs.DB; - //安全人工时 - int wHours = db.SitePerson_PersonInOutNumber.Where(x => x.ProjectId == ProjectId).Max(x => x.WorkHours) ?? 0; - this.divSafeWorkTime.InnerHtml = wHours.ToString(); - - //本月安全人工时 - int wHoursMonth = 0; - DateTime? sDate = Funs.GetNewDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString()); - var dayReports = BLL.SitePerson_MonthReportService.getMonthReports(this.ProjectId, sDate); - if (dayReports.Count > 0) - { - wHoursMonth = Convert.ToInt32(dayReports[0].DayWorkTime); - } - this.divSafeWorkTimeMonth.InnerHtml = wHoursMonth.ToString(); - - //安全培训累计人员 - var getTrainRecord = db.EduTrain_TrainRecord.Where(x => x.ProjectId == ProjectId).Max(x => x.TrainPersonNum) ?? 0; - this.divSafePersonNum.InnerHtml = getTrainRecord.ToString(); - - //安全管理人员 - var allSum = from x in Funs.DB.SitePerson_Person - where x.IsUsed == true && x.ProjectId == ProjectId - select x; - var glAllPerson = from x in allSum - join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId - where (y.PostType == "1" || y.PostType == "4") && x.ProjectId == ProjectId //一般管理岗位和特种管理人员 - select x; - this.divSafeManagePersonNum.InnerHtml = glAllPerson.Count().ToString(); - - //未遂事故 - var wsAccidentList1 = from x in db.Accident_AccidentPersonRecord - join y in db.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId - where y.AccidentTypeName.Contains("未遂") && x.ProjectId == ProjectId - select x; - var wsAccidentList2 = from x in db.Accident_AccidentReportOther - join y in db.Sys_Const on x.AccidentTypeId equals y.ConstValue - where y.ConstText.Contains("未遂") && x.ProjectId == ProjectId - select x; - this.divWS.InnerHtml = (wsAccidentList1.Count() + wsAccidentList2.Count()).ToString(); - - //整改数据 - getZgsj(); - - //风险预警 - getHazard(); - - //工程概况 - getProjectInfo(); - - //质量培训人员 - DateTime date = DateTime.Now.AddDays(-1); - int CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson - where x.IsTrain == true && x.CompileDate.Value.Year == date.Year && x.CompileDate.Value.Month == date.Month && x.CompileDate.Value.Day == date.Day - select x).Count(); - divCqmsPxNum.InnerHtml = CqmsPxNum.ToString(); - - //施工审批量 - int sgspl = Funs.DB.Solution_CQMSConstructSolution.Where(x => x.ProjectId == ProjectId && x.State == "1").Count(); - div_sgfaSpl.InnerHtml = sgspl.ToString(); - - //质量共检 - getZlgj(); - - //焊接 - getHj(); - - //加载质量问题 - getZlwt(); - - //人员信息 - getSitePerson(); - - //项目人员图表 - getProjectSitePerson(); - - //工作台面 - getGjsx(); - getGztm(); - - //材料到货 - getCldh(); - } - } - - #region 人员信息 - private void getSitePerson() - { - int AllCount = 0; - int MCount = 0; - var getallin = APIPageDataService.getPersonNum(ProjectId, DateTime.Now); - AllCount = getallin.Count(); - if (AllCount > 0) - { - MCount = getallin.Where(x => x.PostType == Const.PostType_1).Count(); - } - - if (AllCount > 0) - { - ////当前现场总人数 - div_xcrs.InnerHtml = AllCount.ToString(); - //作业人数 - div_zyxcrs.InnerHtml = (AllCount - MCount).ToString(); - //管理人数 - div_glxcrs.InnerHtml = MCount.ToString(); - } - } - #endregion - - #region 项目人员图表 - protected string ProjectPersonCount; - protected string ProjectPersonMc; - private void getProjectSitePerson() - { - var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null - && x.ProjectId == ProjectId).ToList(); - foreach (var item in list) - { - ProjectPersonMc += "'" + item.ShortName + "',"; - ProjectPersonCount += "'" + APIPageDataService.getPersonNum(item.ProjectId, DateTime.Now).Count() + "',"; - } - if (!string.IsNullOrEmpty(ProjectPersonMc) && !string.IsNullOrEmpty(ProjectPersonCount)) - { - ProjectPersonMc = ProjectPersonMc.TrimEnd(','); - ProjectPersonCount = ProjectPersonCount.TrimEnd(','); - } - } - #endregion - - #region 整改数据 - protected void getZgsj() - { - div_zgsj.InnerHtml = (GetGeneralClosedNum() + GetGeneralNotClosedNum()).ToString(); - div_zgywc.InnerHtml = GetGeneralClosedNum().ToString(); - div_zgwwc.InnerHtml = GetGeneralNotClosedNum().ToString(); - div_zgwcl.InnerHtml = String.Format("{0:N2}", 100.0 * GetGeneralClosedNum() / (GetGeneralNotClosedNum() + GetGeneralClosedNum())) + "%"; - } - - /// - /// 获取隐患整改闭环项 - /// - /// - public int GetGeneralClosedNum() - { - int result = (from x in Funs.DB.HSSE_Hazard_HazardRegister - where x.States == "3" && x.ProjectId == ProjectId - select x).Count(); - return result; - } - /// - /// 获取隐患未整改完成项 - /// - /// - public int GetGeneralNotClosedNum() - { - int result = (from x in Funs.DB.HSSE_Hazard_HazardRegister - where x.States != "3" && x.ProjectId == ProjectId - select x).Count(); - return result; - } - #endregion - - #region 工程概括 - protected string divProjectNameTitle; - protected string divProjectAddressTitle; - protected string divProjectMoneyTitle; - protected string divOwnUnitTitle; - protected string divSGUnitTitle; - protected string divJLUnitTitle; - protected string divProjectImg; - - protected string spanProjectName; - protected string spanProjectAddress; - protected string spanOwnUnit; - protected string spanSGUnit; - protected string spanJLUnit; - protected string spanRemark; - /// - /// - /// - private void getProjectInfo() - { - divProjectNameTitle = ""; - divProjectAddressTitle = ""; - divProjectMoneyTitle = ""; - divOwnUnitTitle = ""; - divSGUnitTitle = ""; - divJLUnitTitle = ""; - divProjectImg = "../res/indexv2/assets/image/index6/center-bg.jpeg"; - var project = ProjectService.GetProjectByProjectId(this.ProjectId); - if (project != null) - { - spanProjectName = "" + project.ShortName + ""; - spanRemark = "" + project.Remark + ""; - divProjectNameTitle = project.ProjectName; - if (!string.IsNullOrEmpty(project.ProjectAddress)) - { - //this.divProjectAddress.InnerHtml = project.ProjectAddress.Length > 8 ? project.ProjectAddress.Substring(0, 8) + "..." : project.ProjectAddress; - spanProjectAddress = spanProjectName = "" + - (project.ProjectAddress.Length > 8 ? project.ProjectAddress.Substring(0, 8) + "..." : project.ProjectAddress) + ""; - divProjectAddressTitle = project.ProjectAddress; - } - string unit_yz = ProjectService.getProjectUnitNameByUnitType(project.ProjectId, Const.ProjectUnitType_4); - if (!string.IsNullOrEmpty(unit_yz)) - { - //this.divOwnUnit.InnerHtml = unit_yz.Length > 8 ? unit_yz.Substring(0, 8) + "..." : unit_yz; - spanOwnUnit = "" + - (unit_yz.Length > 8 ? unit_yz.Substring(0, 8) + "..." : unit_yz) + ""; - divOwnUnitTitle = unit_yz; - } - string unit_JL = ProjectService.getProjectUnitNameByUnitType(project.ProjectId, Const.ProjectUnitType_3); - if (!string.IsNullOrEmpty(unit_JL)) - { - //this.divJLUnit.InnerHtml = unit_JL.Length > 8 ? unit_JL.Substring(0, 8) + "..." : unit_JL; - spanJLUnit = "" + - (unit_JL.Length > 8 ? unit_JL.Substring(0, 8) + "..." : unit_JL) + ""; - divJLUnitTitle = unit_JL; - } - - string unit_FB = ProjectService.getProjectUnitNameByUnitType(project.ProjectId, Const.ProjectUnitType_2); - if (!string.IsNullOrEmpty(unit_FB)) - { - //this.divSGUnit.InnerHtml = unit_FB.Length > 8 ? unit_FB.Substring(0, 8) + "..." : unit_FB + "..."; - spanSGUnit = "" + - (unit_FB.Length > 8 ? unit_FB.Substring(0, 8) + "..." : unit_FB + "...") + ""; - } - - var getSGName = from x in Funs.DB.Project_ProjectUnit - join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId - where x.ProjectId == project.ProjectId && x.UnitType == Const.ProjectUnitType_2 - select y.UnitName; - foreach (var item in getSGName) - { - divSGUnitTitle += item + "，"; - } - //this.divProjectMoney.InnerHtml = divProjectMoneyTitle = project.ProjectMoney.ToString() + "万元"; - if (project.EndDate.HasValue) - { - this.divEndDate.InnerHtml = string.Format("{0:yyyy-MM-dd}", project.EndDate); - int endDays = (project.EndDate.Value - DateTime.Now).Days; - if (endDays >= 0) - { - this.divRemainingDays.InnerHtml = endDays.ToString() + "天"; - } - if (project.StartDate.HasValue) - { - int pdays = (project.EndDate.Value - project.StartDate.Value).Days; - if (pdays >= 0) - { - this.divProjectDays.InnerHtml = pdays.ToString() + "天"; - } - } - } - - var getImag = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == project.ProjectId); - if (getImag != null && !string.IsNullOrEmpty(getImag.AttachUrl)) - { - string url = getImag.AttachUrl.Replace('\\', '/'); - string firtstUrl = Funs.GetStrListByStr(url, ',').FirstOrDefault(); - if (!string.IsNullOrEmpty(firtstUrl)) - { - string atturl = Funs.RootPath + firtstUrl.Replace(';', ' ').Trim(); - if (File.Exists(atturl)) - { - divProjectImg = "../" + firtstUrl.Replace(';', ' ').Trim(); - //this.divProjectImgs.Src = divProjectImg; - } - } - } - } - } - - #endregion - - #region 风险预警 - protected string riskData1; - protected string riskData2; - protected string riskData3; - protected string riskData4; - /// - /// 获取风险管控 - /// - private void getHazard() - { - var getHazards = from x in Funs.DB.Hazard_HazardSelectedItem - join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId - where x.ProjectId == ProjectId - select new { x.HazardSelectedItemId, y.RiskLevel }; - var riskLevels = from x in Funs.DB.Base_RiskLevel select x; - - List RiskLevelNum = new List(); - List series = new List(); - - riskData1 = getHazards.Count(x => x.RiskLevel == 1).ToString(); - riskData2 = getHazards.Count(x => x.RiskLevel == 2).ToString(); - riskData3 = getHazards.Count(x => x.RiskLevel == 3).ToString(); - riskData4 = getHazards.Count(x => x.RiskLevel == 4).ToString(); - - } - - /// - /// 资质预警 - /// - protected string getEarlyWarningCounts() - { - int allCount = 0; - var getPersonQualitys = from x in Funs.DB.QualityAudit_PersonQuality - join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId - where x.LimitDate.HasValue && x.LimitDate < DateTime.Now && y.ProjectId == ProjectId - select x; - //// 预警人数 - allCount = getPersonQualitys.Count(); - return allCount.ToString(); - } - - /// - /// 机械预警 - /// - /// - protected int GetJxyjNum() - { - int result = 0; - //机具报验的到期提醒和过期提醒记录数加一起 - //机具报验的到期提醒数 - var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate && x.ProjectId == ProjectId - && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count(); - //过期提醒记录数 - var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now && x.ProjectId == ProjectId).Count(); - result = num1 + num2; - return result; - } - - /// - /// 获取危大工程审批完成数 - /// - /// - protected int GetCompletedNum() - { - var result = Project_HSSEData_HSSEService.GetCompletedNum(ProjectId); - return result; - } - - /// - /// 获取危大工程培训人次数 - /// - /// - protected int GetTrainPersonNum() - { - var result = Project_HSSEData_HSSEService.GetTrainPersonNum(ProjectId); - return result; - } - - /// - /// 获取危大工程施工个数 - /// - /// - protected int GetConstructionNum() - { - var result = Project_HSSEData_HSSEService.GetConstructionNum(ProjectId); - return result; - } - - /// - /// 获取危大工程完工个数 - /// - /// - protected int GetFinishedNum() - { - var result = Project_HSSEData_HSSEService.GetFinishedNum(ProjectId); - return result; - } - - /// - /// 获取超危大工程审批完成数 - /// - /// - protected int GetSuperCompletedNum() - { - var result = Project_HSSEData_HSSEService.GetSuperCompletedNum(ProjectId); - return result; - } - - /// - /// 获取超危大工程培训人次数 - /// - /// - protected int GetSuperTrainPersonNum() - { - var result = Project_HSSEData_HSSEService.GetSuperTrainPersonNum(ProjectId); - return result; - } - - /// - /// 获取超危大工程施工个数 - /// - /// - protected int GetSuperConstructionNum() - { - var result = Project_HSSEData_HSSEService.GetSuperConstructionNum(ProjectId); - return result; - } - - /// - /// 获取超危大工程完工个数 - /// - /// - protected int GetSuperFinishedNum() - { - var result = Project_HSSEData_HSSEService.GetSuperFinishedNum(ProjectId); - return result; - } - #endregion - - #region 作业许可 - /// - /// 动火作业许可证 - /// - /// - protected int getWrokCount0() - { - var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "动火作业许可证").ToList().Count; - return result; - } - - protected int getWrokCount1() - { - var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "高处作业许可证").ToList().Count; - return result; - } - - protected int getWrokCount2() - { - var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "吊装作业许可证").ToList().Count; - return result; - } - - protected int getWrokCount3() - { - var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId - && x.LicenseTypeName != "动火作业许可证" && x.LicenseTypeName != "高处作业许可证" && x.LicenseTypeName != "吊装作业许可证").ToList().Count; - return result; - } - #endregion - - #region 质量问题 - //质量问题总计 - protected string zlallNumber; - //质量问题合格数量 - protected string zlfinishNumber; - //质量问题整改率 - protected string zlzgl; - - protected string zgzglDataValue; - protected void getZlwt() - { - zlallNumber = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now && x.ProjectId == ProjectId - select x).Count().ToString(); - var num2 = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now && x.State == "7" && x.ProjectId == ProjectId - select x).Count(); - zlfinishNumber = num2.ToString(); - var num3 = (from x in Funs.DB.Check_CheckControl - where x.CheckDate <= DateTime.Now && x.State != "7" && x.ProjectId == ProjectId - select x).Count(); - - var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3)); - zlzgl = zgl.ToString(); - zgzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString(); - } - #endregion - - #region 质量共检 - protected string zlgjallNumber; - protected string zlgjfinishNumber; - protected string zlgjzgl; - - protected string zggjzglDataValue; - protected void getZlgj() - { - //Check_JointCheck - zlgjallNumber = (from x in Funs.DB.Check_JointCheck - where x.CheckDate <= DateTime.Now && x.ProjectId == ProjectId - select x).Count().ToString(); - - var num2 = (from x in Funs.DB.Check_JointCheck - where x.CheckDate <= DateTime.Now && x.State == BLL.Const.JointCheck_Complete && x.ProjectId == ProjectId - select x).Count(); - zlgjfinishNumber = num2.ToString(); - - var num3 = (from x in Funs.DB.Check_JointCheck - where x.CheckDate <= DateTime.Now && x.State != BLL.Const.JointCheck_Complete && x.ProjectId == ProjectId - select x).Count(); - var zgl = "0"; - if (num2 != 0) - { - zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3)); - zlgjzgl = zgl.ToString(); - zggjzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString(); - } - else - { - zlgjzgl = zgl.ToString(); - zggjzglDataValue = "0"; - } - - - } - - #endregion - - #region 焊接 - protected string hjallNumber = "0"; - protected string hjfinishNumber = "0"; - protected string hjzgl = "0"; - - protected string hjDataValue = "0"; - protected void getHj() - { - Model.SingleSerie series = new Model.SingleSerie(); - Model.BusinessColumn businessColumn = new Model.BusinessColumn(); - List listdata = new List(); - double result = 0; - Model.SGGLDB db = Funs.DB; - //一次检测合格焊口数 - int oneCheckJotNum = (from x in db.HJGL_Batch_NDEItem - join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId - join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId - join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID - where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null - && a.ProjectId == ProjectId - select x.NDEItemID).Count(); - //一次检测返修焊口数 - int oneCheckRepairJotNum = (from x in db.HJGL_Batch_NDEItem - join y in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId - join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId - join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID - where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null && x.CheckResult == "2" - && a.ProjectId == ProjectId - select x.NDEItemID).Count(); - if (oneCheckJotNum > 0) - { - var a = Convert.ToDouble(oneCheckJotNum - oneCheckRepairJotNum); - var b = Convert.ToDouble(oneCheckJotNum); - result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 0)); - - hjallNumber = b.ToString(); - hjfinishNumber = a.ToString(); - hjzgl = result.ToString(); - hjDataValue = (100 - result).ToString(); - } - - - } - - #endregion - - #region 赢得值曲线 - protected string Two - { - get - { - List series = new List(); - Model.BusinessColumn businessColumn = new Model.BusinessColumn(); - List listCategories = new List(); - businessColumn.title = "赢得值曲线"; - Model.Project_Installation installation = BLL.Project_InstallationService.GetProjectInstallationByProjectId(this.CurrUser.LoginProjectId); - if (installation != null) - { - Model.SingleSerie s = new Model.SingleSerie(); - Model.SingleSerie s2 = new Model.SingleSerie(); - Model.SingleSerie s3 = new Model.SingleSerie(); - Model.SingleSerie s4 = new Model.SingleSerie(); - Model.SingleSerie s5 = new Model.SingleSerie(); - Model.SingleSerie s6 = new Model.SingleSerie(); - List listdata = new List(); - List listdata2 = new List(); - List listdata3 = new List(); - List listdata4 = new List(); - List listdata5 = new List(); - List listdata6 = new List(); - string strSql = "select distinct (cast(YEAR(Months) as varchar(4))+'.'+cast(MONTH(Months) as varchar(2))) as 月份,t.Months," + - "ThisRealCost as '本月已完工作实际费用-ACWP',ThisPlanCost as '本月已完工作预算费用-BCWP',ThisPlanValue as '本月计划工作预算费用-BCWS',TotalPlanValue as '累计计划工作预算费用-BCWS',TotalRealCost as '累计已完工作实际费用-ACWP',TotalPlanCost as '累计已完工作预算费用-BCWP' " + - "from dbo.View_WBS_CostControlParentDetail as t where ParentId=@Id order by t.Months"; - //string date = DateTime.Now.Year + "-" + DateTime.Now.Month + "-01"; - SqlParameter[] parameter = new SqlParameter[] - { - new SqlParameter("@Id",installation.InstallationId), - //new SqlParameter("@Months",date), - }; - DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter); - decimal lastbcws = 0, bcws = 0, lastacwp = 0, acwp = 0, lastbcwp = 0, bcwp = 0; - for (int i = 0; i < dt.Rows.Count; i++) - { - dt.Rows[i]["本月已完工作实际费用-ACWP"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月已完工作实际费用-ACWP"].ToString()) / 10000; - dt.Rows[i]["本月已完工作预算费用-BCWP"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月已完工作预算费用-BCWP"].ToString()) / 10000; - dt.Rows[i]["本月计划工作预算费用-BCWS"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月计划工作预算费用-BCWS"].ToString()) / 10000; - bcws = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计计划工作预算费用-BCWS"].ToString()); - acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计已完工作实际费用-ACWP"].ToString()); - bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计已完工作预算费用-BCWP"].ToString()); - if (bcws == lastbcws) - { - if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now) - { - dt.Rows[i]["累计计划工作预算费用-BCWS"] = 0; - } - else - { - dt.Rows[i]["累计计划工作预算费用-BCWS"] = bcws / 10000; - } - } - else - { - dt.Rows[i]["累计计划工作预算费用-BCWS"] = bcws / 10000; - } - if (acwp == lastacwp) - { - if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now) - { - dt.Rows[i]["累计已完工作实际费用-ACWP"] = 0; - } - else - { - dt.Rows[i]["累计已完工作实际费用-ACWP"] = acwp / 10000; - } - } - else - { - dt.Rows[i]["累计已完工作实际费用-ACWP"] = acwp / 10000; - } - if (bcwp == lastbcwp) - { - if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now) - { - dt.Rows[i]["累计已完工作预算费用-BCWP"] = 0; - } - else - { - dt.Rows[i]["累计已完工作预算费用-BCWP"] = bcwp / 10000; - } - } - else - { - dt.Rows[i]["累计已完工作预算费用-BCWP"] = bcwp / 10000; - } - lastbcws = bcws; - lastacwp = acwp; - lastbcwp = bcwp; - - listCategories.Add(dt.Rows[i]["月份"].ToString()); - if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) <= DateTime.Now) - { - listdata.Add(Convert.ToDouble(dt.Rows[i]["本月计划工作预算费用-BCWS"])); - listdata2.Add(Convert.ToDouble(dt.Rows[i]["累计计划工作预算费用-BCWS"])); - listdata3.Add(Convert.ToDouble(dt.Rows[i]["本月已完工作预算费用-BCWP"])); - listdata4.Add(Convert.ToDouble(dt.Rows[i]["累计已完工作预算费用-BCWP"])); - listdata5.Add(Convert.ToDouble(dt.Rows[i]["本月已完工作实际费用-ACWP"])); - listdata6.Add(Convert.ToDouble(dt.Rows[i]["累计已完工作实际费用-ACWP"])); - } - } - s.data = listdata; - s2.data = listdata2; - s3.data = listdata3; - s4.data = listdata4; - s5.data = listdata5; - s6.data = listdata6; - series.Add(s); - series.Add(s2); - series.Add(s3); - series.Add(s4); - series.Add(s5); - series.Add(s6); - businessColumn.categories = listCategories; - businessColumn.series = series; - } - return JsonConvert.SerializeObject(businessColumn); - } - } - #endregion - - #region 人力情况 - protected string Person - { - get - { - Model.SGGLDB db = Funs.DB; - List series = new List(); - Model.BusinessColumn businessColumn = new Model.BusinessColumn(); - List listCategories = new List(); - var persons = from x in db.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime > DateTime.Now) select x; - var posts = (from x in persons - join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId - select y).Distinct(); - Model.SingleSerie s = new Model.SingleSerie(); - List listdata = new List(); - //木工 - listCategories.Add("木工"); - int workPostCount1 = persons.Count(x => x.WorkPostId == Const.WorkPost_Carpentry); - listdata.Add(workPostCount1); - //钢筋工 - listCategories.Add("钢筋工"); - int workPostCount2 = persons.Count(x => x.WorkPostId == Const.WorkPost_SteelWorker); - listdata.Add(workPostCount2); - //瓦工 - listCategories.Add("瓦工"); - int workPostCount3 = persons.Count(x => x.WorkPostId == Const.WorkPost_Bricklayer); - listdata.Add(workPostCount3); - //混凝土工 - listCategories.Add("混凝土工"); - int workPostCount4 = persons.Count(x => x.WorkPostId == Const.WorkPost_ConcreteWorker); - listdata.Add(workPostCount4); - //钳工 - listCategories.Add("钳工"); - int workPostCount5 = persons.Count(x => x.WorkPostId == Const.WorkPost_Fitter1 || x.WorkPostId == Const.WorkPost_Fitter2); - listdata.Add(workPostCount5); - //焊工 - listCategories.Add("焊工"); - int workPostCount6 = persons.Count(x => x.WorkPostId == Const.WorkPost_Welder1 || x.WorkPostId == Const.WorkPost_Welder2 || - x.WorkPostId == Const.WorkPost_Welder3 || x.WorkPostId == Const.WorkPost_Welder4 || x.WorkPostId == Const.WorkPost_Welder5); - listdata.Add(workPostCount6); - //铆工 - listCategories.Add("铆工"); - int workPostCount7 = persons.Count(x => x.WorkPostId == Const.WorkPost_Riveter); - listdata.Add(workPostCount7); - //管工 - listCategories.Add("管工"); - int workPostCount8 = persons.Count(x => x.WorkPostId == Const.WorkPost_Foreman); - listdata.Add(workPostCount8); - //电工 - listCategories.Add("电工"); - int workPostCount9 = persons.Count(x => x.WorkPostId == Const.WorkPost_Electrician1 || x.WorkPostId == Const.WorkPost_Electrician2 - || x.WorkPostId == Const.WorkPost_Electrician3); - listdata.Add(workPostCount9); - //仪表工 - listCategories.Add("仪表工"); - int workPostCount10 = persons.Count(x => x.WorkPostId == Const.WorkPost_Instrumentalist); - listdata.Add(workPostCount10); - //防腐保温工 - listCategories.Add("防腐保温工"); - int workPostCount11 = persons.Count(x => x.WorkPostId == Const.WorkPost_AnticorrosionWorker); - listdata.Add(workPostCount11); - //防腐保温工 - listCategories.Add("管理人员"); - int workPostCount12 = (from x in persons - join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId - where y.PostType == Const.PostType_1 - select x).Count(); - listdata.Add(workPostCount12); - //其他 - listCategories.Add("其他"); - int workPostCount13 = persons.Count() - workPostCount1 - workPostCount2 - workPostCount3 - workPostCount4 - workPostCount5 - workPostCount6 - workPostCount7 - - workPostCount8 - workPostCount9 - workPostCount10 - workPostCount11 - workPostCount12; - listdata.Add(workPostCount13); - s.data = listdata; - series.Add(s); - businessColumn.categories = listCategories; - businessColumn.title = persons.Count().ToString(); - businessColumn.series = series; - return JsonConvert.SerializeObject(businessColumn); - } - } - #endregion - - #region 作业许可列表 - protected string getLicenseManager() - { - string returnHtml = ""; - var list = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId).ToList(); - foreach (var item in list) - { - var gfx = "风险作业"; - if (item.IsHighRisk != true) - { - gfx = "非高风险"; - } - var shortUnitname = Funs.DB.Base_Unit.Where(x => x.UnitId == item.UnitId).FirstOrDefault().ShortUnitName; - returnHtml += "
" + item.LicenseManagerCode + "-" + shortUnitname + "-" + item.WorkAreaName + "-" + gfx + "-" + item.LicenseTypeName - + "
"; - } - return returnHtml; - } - #endregion - - #region 工作台面 - - protected void getGztm() - { - //div_dbsxlist.InnerHtml = ""; - string returnDbHtml = "
"; - if (!string.IsNullOrEmpty(ProjectId)) - { - //关键事项 - string strSql = @"SELECT GJSXID AS DataId - ,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId - ,'关键事项待处理' AS MenuName - ,GJSX.Detail AS Content - ,users.UserId - ,users.UserName - ,GJSX.CreateDate AS DataTime - ,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr - ,'../PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID AS PCUrl - FROM GJSX - LEFT JOIN Sys_User AS users ON users.UserId =@userId - WHERE GJSX.ProjectId=@projectId AND - GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0 - and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0) - or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID)) - )"; - List listStr = new List(); - - listStr.Add(new SqlParameter("@userId", CurrUser.UserId)); - listStr.Add(new SqlParameter("@projectId", ProjectId)); - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - var Gjsxcount = tb.Rows.Count; - div_gjsx.InnerHtml = Gjsxcount.ToString(); - - var getDataList = Funs.DB.Sp_Project_GetToDoItems(this.CurrUser.LoginProjectId, this.CurrUser.UserId).ToList(); - //待办事项、个人流程 - div_dbsx.InnerHtml = getDataList.Count().ToString(); - div_grlc.InnerHtml = getDataList.Count().ToString(); - foreach (var item in getDataList) - { - returnDbHtml += "
" + item.MenuName + "" + item.Content + "" + - item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "
"; - } - } - else { - returnDbHtml = "
"; - } - this.div_dbsxlist.InnerHtml = returnDbHtml; - - - } - - /// - /// 加载关键事项 - /// - protected void getGjsx() - { - string returnDbHtml = "
"; - ////关键事项 - if (!string.IsNullOrEmpty(ProjectId)) - { - string strSql = @"SELECT GJSXID AS DataId - ,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId - ,'关键事项待处理' AS MenuName - ,GJSX.Detail AS Content - ,users.UserId - ,users.UserName - ,GJSX.CreateDate AS DataTime - ,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr - ,'../PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID AS PCUrl - FROM GJSX - LEFT JOIN Sys_User AS users ON users.UserId =@userId - WHERE GJSX.ProjectId=@projectId AND - GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0 - and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0) - or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID)) - )"; - List listStr = new List(); - - listStr.Add(new SqlParameter("@userId", CurrUser.UserId)); - listStr.Add(new SqlParameter("@projectId", ProjectId)); - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - - for (int i = 0; i < tb.Rows.Count; i++) - { - returnDbHtml += "
" + tb.Rows[i]["MenuName"] + "" + tb.Rows[i]["Content"] + "" + - tb.Rows[i]["DataTime"].ToString().Replace('/', '-').Split(' ')[0] + "
"; - } - } - else - { - returnDbHtml = "
"; - } - this.div_gjsxlist.InnerHtml = returnDbHtml; - - - - } - #endregion - - /// - /// 关闭弹出窗 - /// - /// - /// - protected void Window1_Close(object sender, WindowCloseEventArgs e) - { - getGztm(); - getGjsx(); - } - - - /// - /// 打开待办 - /// - /// - /// - protected void btnshowWindows(object sender, EventArgs e) - { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("{0}", hiddenUrl.Value, "办理 - "))); - } - - #region 材料到货 - protected string gdclHtml; - protected string sbclHtml; - - protected string gdclHead = "

材料类别

设计量

采购量

采购量百分比

到货量

已到货百分比

领料量

已领料百分比

"; - protected string sbclHead = "

合同号

" + - "

采购总量

" + - "

发货总量

" + - "

到货总量

" + - "

到货百分比

"; - private void getCldh() - { - //管道材料 - var pid = BLL.ProjectService.GetCLProjectCodeByProjectId(ProjectId).ToString(); - var list = Funs.DB.CLGL_PipelineMaterialSumList.Where(x => x.Type == "M" && x.ProjectId == pid); - foreach (var item in list) - { - gdclHtml += "
"; - gdclHtml += "" + item.C1 + ""; - gdclHtml += "" + (string.IsNullOrEmpty(item.C2) ? "0" : item.C2) + ""; - gdclHtml += "" + (string.IsNullOrEmpty(item.C4) ? "0" : item.C4) + ""; - gdclHtml += "" + (string.IsNullOrEmpty(item.C5) ? "0%" : item.C5) + ""; - gdclHtml += "" + (string.IsNullOrEmpty(item.C6) ? "0" : item.C6) + ""; - gdclHtml += "" + (string.IsNullOrEmpty(item.C7) ? "0%" : item.C7) + ""; - gdclHtml += "" + (string.IsNullOrEmpty(item.C8) ? "0" : item.C8) + ""; - gdclHtml += "" + (string.IsNullOrEmpty(item.C9) ? "0%" : item.C9) + ""; - gdclHtml += "
"; - } - - //设备材料 - var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "设备" && x.ProjectId == pid); - foreach (var item in SbclList) - { - sbclHtml += "
"; - double SbcllCgl = 0.0; - double Sbdhs = 0.0; - if (string.IsNullOrEmpty(item.C7)) - { - SbcllCgl += 0; - Sbdhs += 0; - } - else - { - SbcllCgl += Convert.ToDouble(item.C7); - Sbdhs += Convert.ToDouble(item.C9); - } - sbclHtml += "" + item.C2 + ""; - sbclHtml += "" + SbcllCgl + ""; - sbclHtml += "" + item.C7 + ""; - sbclHtml += "" + Sbdhs + ""; - //百分比 - var dhbfb = "0%"; - if (SbcllCgl + Sbdhs != 0) - { - dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / (Sbdhs + SbcllCgl), 2) + "%"; - - } - sbclHtml += "" + dhbfb + ""; - sbclHtml += "
"; - } - } - #endregion +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="mainProject2.aspx.cs" Inherits="FineUIPro.Web.common.mainProject2" %> + + + + + + + 项目级首页（新） + + + + + + + + +
+ +
+
+
+
+
安全统计
+
+
+
+

0000000000

+
累计安全人工时 +
+
+
+

0000000000

+
本月安全人工时 +
+
+
+

0

+
安全培训累计人员 +
+
+
+
+
+
安全管理人员
+
0
+
+
+
未遂事件
+
0
+
+
+
+
整改数据
+
+
+
0 +
+
总数
+
+
+
0 +
+
已完成
+
+
+
0 +
+
未完成
+
+
+
0% +
+
完成率
+
+
+
+
+
+
+
风险预警
+
+
+
+
+
+
资质预警
+
<%=getEarlyWarningCounts() %>
+
+
+
机械预警
+
<%=GetJxyjNum() %>
+
+
+
+
危大工程
+
+
+
<%=GetCompletedNum() %>
+
审批完成
+
+
+
<%=GetTrainPersonNum() %>
+
培训人次数
+
+
+
<%=GetConstructionNum() %>
+
施工个数
+
+
+
<%=GetFinishedNum() %>
+
完工个数
+
+
+
+
+
超危大工程
+
+
+
<%=GetSuperCompletedNum() %>
+
审批完成
+
+
+
<%=GetSuperTrainPersonNum() %>
+
培训人次数
+
+
+
<%=GetSuperConstructionNum() %>
+
施工个数
+
+
+
<%=GetSuperFinishedNum() %>
+
完工个数
+
+
+
+
+
+
+
+
作业许可
+
+
+
+
动火
+
<%=getWrokCount0() %>
+
+
+
高处
+
<%=getWrokCount1() %>
+
+
+
吊装
+
<%=getWrokCount2() %>
+
+
+
其他
+
<%=getWrokCount3() %>
+
+
+
+ <%=getLicenseManager() %> + <%--
003-十一化建-合成氨区域-非高风险-T0001设备吊装
--%> + +
+
+ +
+
+
+
+
工程概括
+
+
+
工程名称：<%=spanProjectName %>
+
建设单位： <%=spanOwnUnit %>
+
施工单位： <%=spanSGUnit %>
+
监理单位：<%=spanJLUnit %>
+
工程概况：
+
+
+
+
+
+
+
+
+
+ +
+ + +
+
+
+
+
+
+
合同工期
+
0天
+
+
+
合同到期时间
+
+
+
+
合同剩余
+
0天
+
+
+
+ +
+
+
赢得值曲线 + <%--
关键事项准点率90%
--%> +
+
+ <%--
+ +
--%> + +
+
+
质量概况
+
+
+
+
质量培训累计人员
+
0
+
+
+
施工方案审批量
+
0
+
+
+
+
+
+
+
+
+
+
+
+
+
工作台面
+
+
+
+
关键事项
+
0
+
+
+
待办事项
+
0
+
+
+
个人流程
+
0
+
+
+
已办任务
+
0
+
+
+ + +
+ +
+
+ +
+
+
人员信息
+
+
+
+
当前现场人数
+
0
+
+
+
作业人员总数
+
0
+
+
+
管理人员总数
+
0
+
+
+ +
+ <%--
+ +
--%> +
+ +
+
+
+ 材料到货 +
管道材料 + 设备材料
+
+
+
+
+
+
+

材料类别

+
+
+

设计量

+
+
+

采购量

+

采购量百分比

+
+
+

到货量

+

已到货百分比

+
+
+

领料量

+

已领料百分比

+
+
+
+
+ <%=gdclHtml %> +
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs index b9172d49..66316df1 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs @@ -862,7 +862,7 @@ namespace FineUIPro.Web.common div_grlc.InnerHtml = getDataList.Count().ToString(); foreach (var item in getDataList) { - returnDbHtml += "
" + item.MenuName + "" + item.Content + "" + + returnDbHtml += "
" + item.MenuName + "" + item.Content + "" + item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "
"; } } From 2a4772c9218c6c516b3716ab9e1b9e62cc907e5e Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 13 Sep 2023 08:31:05 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AE=B8=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2023-09-12.sql | 34 ++ SGGL/BLL/API/HSSE/APILicenseDataService.cs | 142 ++++--- .../HSSE/License/BreakGroundView.aspx | 134 +------ .../HSSE/License/BreakGroundView.aspx.cs | 189 ++++----- .../License/BreakGroundView.aspx.designer.cs | 302 +++------------ .../HSSE/License/ElectricityView.aspx | 160 ++------ .../HSSE/License/ElectricityView.aspx.cs | 188 ++++----- .../License/ElectricityView.aspx.designer.cs | 256 +------------ .../HSSE/License/FireWorkView.aspx | 138 +------ .../HSSE/License/FireWorkView.aspx.cs | 189 ++++----- .../License/FireWorkView.aspx.designer.cs | 306 +++------------ .../HSSE/License/HeightWorkView.aspx | 147 ++----- .../HSSE/License/HeightWorkView.aspx.cs | 188 ++++----- .../License/HeightWorkView.aspx.designer.cs | 342 ++++------------- .../HSSE/License/LiftingWorkView.aspx | 162 ++------ .../HSSE/License/LiftingWorkView.aspx.cs | 192 +++++----- .../License/LiftingWorkView.aspx.designer.cs | 358 ++++-------------- .../HSSE/License/LimitedSpaceView.aspx | 162 +++----- .../HSSE/License/LimitedSpaceView.aspx.cs | 210 +++++----- .../License/LimitedSpaceView.aspx.designer.cs | 350 +++++------------ .../HSSE/License/OpenCircuitView.aspx | 146 +------ .../HSSE/License/OpenCircuitView.aspx.cs | 195 +++++----- .../License/OpenCircuitView.aspx.designer.cs | 310 ++------------- .../HSSE/License/RadialWorkView.aspx | 165 ++------ .../HSSE/License/RadialWorkView.aspx.cs | 185 ++++----- .../License/RadialWorkView.aspx.designer.cs | 357 ++++------------- SGGL/Model/APIItem/HSSE/LicenseDataItem.cs | 19 + SGGL/Model/Model.cs | 264 +++++++++++++ 28 files changed, 1874 insertions(+), 3916 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-09-12.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-12.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-12.sql new file mode 100644 index 00000000..ae05b46e --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-12.sql @@ -0,0 +1,34 @@ +--ǩ +ALTER TABLE License_FireWork +ADD SignatureUrl nvarchar(500) null; + +ALTER TABLE License_LimitedSpace +ADD SignatureUrl nvarchar(500) null; + +ALTER TABLE License_BreakGround +ADD SignatureUrl nvarchar(500) null; + +ALTER TABLE License_HeightWork +ADD SignatureUrl nvarchar(500) null; + +ALTER TABLE License_LiftingWork +ADD SjName nvarchar(50) null; + +ALTER TABLE License_LiftingWork +ADD SjPhone nvarchar(100) null; + +ALTER TABLE License_LiftingWork +ADD SignatureUrl nvarchar(500) null; + +ALTER TABLE License_OpenCircuit +ADD SignatureUrl nvarchar(500) null; + +ALTER TABLE License_RadialWork +ADD SignatureUrl nvarchar(500) null; + +ALTER TABLE License_Electricity +ADD SignatureUrl nvarchar(500) null; + +ALTER TABLE License_NightWork +ADD SignatureUrl nvarchar(500) null; + diff --git a/SGGL/BLL/API/HSSE/APILicenseDataService.cs b/SGGL/BLL/API/HSSE/APILicenseDataService.cs index 7294d538..791344d5 100644 --- a/SGGL/BLL/API/HSSE/APILicenseDataService.cs +++ b/SGGL/BLL/API/HSSE/APILicenseDataService.cs @@ -62,7 +62,8 @@ namespace BLL WorkAreaId = x.WorkAreaId, WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), Reason = x.Reason, - FireLevel = x.FireLevel + FireLevel = x.FireLevel, + SignatureUrl=x.SignatureUrl }).FirstOrDefault(); } #endregion @@ -109,6 +110,7 @@ namespace BLL FireWatchManName = x.FireWatchManName, WorkLeaderName = x.WorkLeaderName, WorkLeaderTel = x.WorkLeaderTel, + SignatureUrl = x.SignatureUrl }).FirstOrDefault(); } #endregion @@ -157,6 +159,7 @@ namespace BLL TestDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestDate), TestPerson = x.TestPerson, VenStep = x.VenStep, + SignatureUrl = x.SignatureUrl }).FirstOrDefault(); } #endregion @@ -203,6 +206,7 @@ namespace BLL WorkAreaId = x.WorkAreaId, WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + SignatureUrl = x.SignatureUrl }).FirstOrDefault(); } #endregion @@ -246,6 +250,7 @@ namespace BLL WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), Reason = x.Reason, FireWatchManName = x.FireWatchManName, + SignatureUrl = x.SignatureUrl }).FirstOrDefault(); } #endregion @@ -288,6 +293,7 @@ namespace BLL WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), Reason = x.Reason, FireWatchManName = x.FireWatchManName, + SignatureUrl = x.SignatureUrl }).FirstOrDefault(); } #endregion @@ -330,6 +336,7 @@ namespace BLL AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.NightWorkId).AttachUrl.Replace('\\', '/'), States = x.States, OldLicenseId = x.OldLicenseId, + SignatureUrl = x.SignatureUrl }).FirstOrDefault(); } #endregion @@ -377,6 +384,9 @@ namespace BLL WorkLeaderTel = x.WorkLeaderTel, QzgName = x.QzgName, QzgPhone = x.QzgPhone, + SignatureUrl = x.SignatureUrl, + SjPhone=x.SjPhone, + SjName=x.SjName }).FirstOrDefault(); } #endregion @@ -421,7 +431,8 @@ namespace BLL Reason = x.Reason, FireWatchManName = x.FireWatchManName, WorkLeaderName=x.WorkLeaderName, - WorkLeaderTel=x.WorkLeaderTel + WorkLeaderTel=x.WorkLeaderTel, + SignatureUrl = x.SignatureUrl }).FirstOrDefault(); } #endregion @@ -513,7 +524,8 @@ namespace BLL WorkAreaId = x.WorkAreaId, WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), Reason=x.Reason, - FireLevel=x.FireLevel + FireLevel=x.FireLevel, + SignatureUrl = x.SignatureUrl }).ToList(); } #endregion @@ -558,6 +570,7 @@ namespace BLL FireWatchManName=x.FireWatchManName, WorkLeaderName=x.WorkLeaderName, WorkLeaderTel=x.WorkLeaderTel, + SignatureUrl = x.SignatureUrl }).ToList(); } @@ -605,7 +618,7 @@ namespace BLL TestDate= string.Format("{0:yyyy-MM-dd HH:mm}", x.TestDate), TestPerson=x.TestPerson, VenStep=x.VenStep, - + SignatureUrl = x.SignatureUrl @@ -655,7 +668,7 @@ namespace BLL WorkAreaId = x.WorkAreaId, WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), - + SignatureUrl = x.SignatureUrl }).ToList(); } #endregion @@ -697,7 +710,7 @@ namespace BLL WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), Reason=x.Reason, FireWatchManName=x.FireWatchManName, - + SignatureUrl = x.SignatureUrl }).ToList(); } #endregion @@ -738,7 +751,7 @@ namespace BLL WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), Reason=x.Reason, FireWatchManName=x.FireWatchManName, - + SignatureUrl = x.SignatureUrl }).ToList(); } #endregion @@ -781,6 +794,7 @@ namespace BLL NextManId = x.NextManId, NextManName = db.Sys_User.First(u => u.UserId == x.NextManId).UserName, States = x.States, + SignatureUrl = x.SignatureUrl }).ToList(); } #endregion @@ -828,7 +842,7 @@ namespace BLL WorkLeaderTel=x.WorkLeaderTel, QzgName=x.QzgName, QzgPhone=x.QzgPhone, - + SignatureUrl = x.SignatureUrl }).ToList(); } #endregion @@ -872,7 +886,7 @@ namespace BLL FireWatchManName = x.FireWatchManName, WorkLeaderName=x.WorkLeaderName, WorkLeaderTel=x.WorkLeaderTel, - + SignatureUrl = x.SignatureUrl }).ToList(); } #endregion @@ -952,7 +966,7 @@ namespace BLL WorkAreaId = x.WorkAreaId, WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), Reason = x.Reason, - FireLevel = x.FireLevel + FireLevel = x.FireLevel, }).ToList(); if (getFireWork.Count() > 0) { @@ -1378,7 +1392,8 @@ namespace BLL WorkAreaId=newItem.WorkAreaId, Reason=newItem.Reason, - FireLevel=newItem.FireLevel + FireLevel=newItem.FireLevel, + SignatureUrl = newItem.SignatureUrl }; if (newItem.States == Const.State_0) @@ -1433,6 +1448,7 @@ namespace BLL updateFireWork.WorkAreaId = newItem.WorkAreaId; updateFireWork.Reason = newItem.Reason; updateFireWork.FireLevel = newItem.FireLevel; + updateFireWork.SignatureUrl = newItem.SignatureUrl; } updateFireWork.States = newFireWork.States; } @@ -1470,7 +1486,7 @@ namespace BLL FireWatchManName=newItem.FireWatchManName, WorkLeaderName=newItem.WorkLeaderName, WorkLeaderTel=newItem.WorkLeaderTel, - + SignatureUrl = newItem.SignatureUrl }; if (newItem.States == Const.State_0) @@ -1528,6 +1544,7 @@ namespace BLL updateHeightWork.FireWatchManName = newItem.FireWatchManName; updateHeightWork.WorkLeaderName = newItem.WorkLeaderName; updateHeightWork.WorkLeaderTel = newItem.WorkLeaderTel; + updateHeightWork.SignatureUrl = newItem.SignatureUrl; } updateHeightWork.States = newHeightWork.States; } @@ -1565,7 +1582,8 @@ namespace BLL TestResult=newItem.TestResult, TestDate= Funs.GetNewDateTime(newItem.TestDate), TestPerson=newItem.TestPerson, - VenStep=newItem.VenStep + VenStep=newItem.VenStep, + SignatureUrl=newItem.SignatureUrl }; if (newItem.States == Const.State_0) { @@ -1616,13 +1634,14 @@ namespace BLL updateLimitedSpace.NextManId = newLimitedSpace.NextManId; updateLimitedSpace.States = newLimitedSpace.States; - updateLimitedSpace.LimitedDescribe = newItem.LimitedDescribe; - updateLimitedSpace.IsBoolOther = newItem.IsBoolOther; - updateLimitedSpace.IsBoolHarmfulGas = newItem.IsBoolHarmfulGas; - updateLimitedSpace.TestResult = newItem.TestResult; + updateLimitedSpace.LimitedDescribe = newLimitedSpace.LimitedDescribe; + updateLimitedSpace.IsBoolOther = newLimitedSpace.IsBoolOther; + updateLimitedSpace.IsBoolHarmfulGas = newLimitedSpace.IsBoolHarmfulGas; + updateLimitedSpace.TestResult = newLimitedSpace.TestResult; updateLimitedSpace.TestDate = Funs.GetNewDateTime(newItem.TestDate); - updateLimitedSpace.TestPerson = newItem.TestPerson; - updateLimitedSpace.VenStep = newItem.VenStep; + updateLimitedSpace.TestPerson = newLimitedSpace.TestPerson; + updateLimitedSpace.VenStep = newLimitedSpace.VenStep; + updateLimitedSpace.SignatureUrl = newLimitedSpace.SignatureUrl; } updateLimitedSpace.States = newLimitedSpace.States; } @@ -1657,7 +1676,8 @@ namespace BLL NextManId = newItem.NextManId, States = newItem.States, - WorkAreaId=newItem.WorkAreaId + WorkAreaId = newItem.WorkAreaId, + SignatureUrl = newItem.SignatureUrl }; if (newItem.States == Const.State_0) { @@ -1710,7 +1730,8 @@ namespace BLL updateRadialWork.WatchManContact = newRadialWork.WatchManContact; updateRadialWork.NextManId = newRadialWork.NextManId; updateRadialWork.States = newRadialWork.States; - updateRadialWork.WorkAreaId = newItem.WorkAreaId; + updateRadialWork.WorkAreaId = newRadialWork.WorkAreaId; + updateRadialWork.SignatureUrl = newRadialWork.SignatureUrl; } updateRadialWork.States = newRadialWork.States; } @@ -1742,9 +1763,10 @@ namespace BLL NextManId = newItem.NextManId, States = newItem.States, - WorkAreaId=newItem.WorkAreaId, - Reason=newItem.Reason, - FireWatchManName=newItem.FireWatchManName, + WorkAreaId = newItem.WorkAreaId, + Reason = newItem.Reason, + FireWatchManName = newItem.FireWatchManName, + SignatureUrl = newItem.SignatureUrl }; if (newItem.States == Const.State_0) @@ -1796,9 +1818,10 @@ namespace BLL updateOpenCircuit.NextManId = newOpenCircuit.NextManId; updateOpenCircuit.States = newOpenCircuit.States; - updateOpenCircuit.WorkAreaId = newItem.WorkAreaId; - updateOpenCircuit.Reason = newItem.Reason; - updateOpenCircuit.FireWatchManName = newItem.FireWatchManName; + updateOpenCircuit.WorkAreaId = newOpenCircuit.WorkAreaId; + updateOpenCircuit.Reason = newOpenCircuit.Reason; + updateOpenCircuit.FireWatchManName = newOpenCircuit.FireWatchManName; + updateOpenCircuit.SignatureUrl = newOpenCircuit.SignatureUrl; } updateOpenCircuit.States = newOpenCircuit.States; } @@ -1829,9 +1852,10 @@ namespace BLL NextManId = newItem.NextManId, States = newItem.States, - WorkAreaId=newItem.WorkAreaId, - Reason=newItem.Reason, - FireWatchManName=newItem.FireWatchManName + WorkAreaId = newItem.WorkAreaId, + Reason = newItem.Reason, + FireWatchManName = newItem.FireWatchManName, + SignatureUrl = newItem.SignatureUrl }; if (newItem.States == Const.State_0) { @@ -1881,9 +1905,10 @@ namespace BLL updateBreakGround.NextManId = newBreakGround.NextManId; updateBreakGround.States = newBreakGround.States; - updateBreakGround.WorkAreaId = newItem.WorkAreaId; - updateBreakGround.Reason = newItem.Reason; - updateBreakGround.FireWatchManName = newItem.FireWatchManName; + updateBreakGround.WorkAreaId = newBreakGround.WorkAreaId; + updateBreakGround.Reason = newBreakGround.Reason; + updateBreakGround.FireWatchManName = newBreakGround.FireWatchManName; + updateBreakGround.SignatureUrl = newBreakGround.SignatureUrl; } updateBreakGround.States = newBreakGround.States; } @@ -1916,6 +1941,7 @@ namespace BLL CloseTime = Funs.GetNewDateTime(newItem.CloseTime), NextManId = newItem.NextManId, States = newItem.States, + SignatureUrl = newItem.SignatureUrl }; if (newItem.States == Const.State_0) { @@ -1967,6 +1993,7 @@ namespace BLL updateNightWork.SafeLeaderTel = newItem.SafeLeaderTel; updateNightWork.NextManId = newNightWork.NextManId; updateNightWork.States = newNightWork.States; + updateNightWork.SignatureUrl = newItem.SignatureUrl; } updateNightWork.States = newNightWork.States; } @@ -1998,13 +2025,16 @@ namespace BLL NextManId = newItem.NextManId, States = newItem.States, - WorkAreaId=newItem.WorkAreaId, - LiftingHeight=newItem.LiftingHeight, - FireWatchManName=newItem.FireWatchManName, - WorkLeaderName=newItem.WorkLeaderName, - WorkLeaderTel=newItem.WorkLeaderTel, - QzgName=newItem.QzgName, - QzgPhone=newItem.QzgPhone, + WorkAreaId = newItem.WorkAreaId, + LiftingHeight = newItem.LiftingHeight, + FireWatchManName = newItem.FireWatchManName, + WorkLeaderName = newItem.WorkLeaderName, + WorkLeaderTel = newItem.WorkLeaderTel, + QzgName = newItem.QzgName, + QzgPhone = newItem.QzgPhone, + SignatureUrl = newItem.SignatureUrl, + SjName=newItem.SjName, + SjPhone=newItem.SjPhone }; if (newItem.States == Const.State_0) @@ -2056,13 +2086,16 @@ namespace BLL updateLiftingWork.NextManId = newLiftingWork.NextManId; updateLiftingWork.States = newLiftingWork.States; - updateLiftingWork.WorkAreaId = newItem.WorkAreaId; - updateLiftingWork.LiftingHeight = newItem.LiftingHeight; - updateLiftingWork.FireWatchManName = newItem.FireWatchManName; - updateLiftingWork.WorkLeaderName = newItem.WorkLeaderName; - updateLiftingWork.WorkLeaderTel = newItem.WorkLeaderTel; - updateLiftingWork.QzgName = newItem.QzgName; - updateLiftingWork.QzgPhone = newItem.QzgPhone; + updateLiftingWork.WorkAreaId = newLiftingWork.WorkAreaId; + updateLiftingWork.LiftingHeight = newLiftingWork.LiftingHeight; + updateLiftingWork.FireWatchManName = newLiftingWork.FireWatchManName; + updateLiftingWork.WorkLeaderName = newLiftingWork.WorkLeaderName; + updateLiftingWork.WorkLeaderTel = newLiftingWork.WorkLeaderTel; + updateLiftingWork.QzgName = newLiftingWork.QzgName; + updateLiftingWork.QzgPhone = newLiftingWork.QzgPhone; + updateLiftingWork.SignatureUrl = newLiftingWork.SignatureUrl; + updateLiftingWork.SjName = newLiftingWork.SjName; + updateLiftingWork.SjPhone = newLiftingWork.SjPhone; } updateLiftingWork.States = newLiftingWork.States; } @@ -2098,7 +2131,8 @@ namespace BLL Reason = newItem.Reason, FireWatchManName = newItem.FireWatchManName, WorkLeaderName= newItem.WorkLeaderName, - WorkLeaderTel = newItem.WorkLeaderTel + WorkLeaderTel = newItem.WorkLeaderTel, + SignatureUrl=newItem.SignatureUrl }; if (newItem.States == Const.State_0) { @@ -2148,12 +2182,12 @@ namespace BLL updateElectricity.NextManId = newElectricity.NextManId; updateElectricity.States = newElectricity.States; - updateElectricity.WorkAreaId = newItem.WorkAreaId; - updateElectricity.Reason = newItem.Reason; - updateElectricity.FireWatchManName = newItem.FireWatchManName; - updateElectricity.WorkLeaderName = newItem.WorkLeaderName; - updateElectricity.WorkLeaderTel = newItem.WorkLeaderTel; - + updateElectricity.WorkAreaId = newElectricity.WorkAreaId; + updateElectricity.Reason = newElectricity.Reason; + updateElectricity.FireWatchManName = newElectricity.FireWatchManName; + updateElectricity.WorkLeaderName = newElectricity.WorkLeaderName; + updateElectricity.WorkLeaderTel = newElectricity.WorkLeaderTel; + updateElectricity.SignatureUrl = newElectricity.SignatureUrl; } updateElectricity.States = newElectricity.States; diff --git a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx index dbcddf7b..230a668b 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx @@ -35,15 +35,21 @@ - - + + - + + + + + + + @@ -70,13 +76,13 @@ HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left" > + HeaderText="动土作业安全措施" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true"> + HeaderText="确认人" HeaderTextAlign="Center" TextAlign="Left" > + HeaderText="是否合格" HeaderTextAlign="Center" TextAlign="Left" > @@ -105,121 +111,9 @@ - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs index e22d0a3b..1c90879e 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs @@ -46,9 +46,12 @@ { this.lbLicenseCode.Text = getBreakGround.LicenseCode; this.txtApplyUnit.Text = UnitService.GetUnitNameByUnitId(getBreakGround.ApplyUnitId); - this.txtApplyManName.Text = UserService.GetUserNameByUserId(getBreakGround.ApplyManId); + //this.txtApplyManName.Text = UserService.GetUserNameByUserId(getBreakGround.ApplyManId); + txtWorkAreaName.Text = UnitWorkService.GetUnitWorkName(getBreakGround.WorkAreaId); this.txtWorkPalce.Text = getBreakGround.WorkPalce; - this.txtWorkDepth.Text = getBreakGround.WorkDepth; + //this.txtWorkDepth.Text = getBreakGround.WorkDepth; + txtFireWatchManName.Text = getBreakGround.FireWatchManName; + txtReason.Text = getBreakGround.Reason; if (getBreakGround.ValidityStartTime.HasValue) { this.txtWorkDate.Text = getBreakGround.ValidityStartTime.Value.ToString("f") + " 至 "; @@ -112,96 +115,96 @@ this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } - var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); - if (getF2 != null) - { - this.txtForm2.Title = getF2.AuditFlowName + "："; - if (getF2.OperaterTime.HasValue) - { - if (getF2.IsAgree == true) - { - this.txtOpinion2.Text = "同意。"; - } - else - { - this.txtOpinion2.Text = getF2.Opinion; - } - this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); - this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); - } - } - var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); - if (getF3 != null) - { - this.txtForm3.Title = getF3.AuditFlowName + "："; - if (getF3.OperaterTime.HasValue) - { - if (getF3.IsAgree == true) - { - this.txtOpinion3.Text = "同意。"; - } - else - { - this.txtOpinion3.Text = getF3.Opinion; - } - this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); - this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); - } - } - var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); - if (getF4 != null) - { - this.txtForm4.Title = getF4.AuditFlowName + "："; - if (getF4.OperaterTime.HasValue) - { - if (getF4.IsAgree == true) - { - this.txtOpinion4.Text = "同意。"; - } - else - { - this.txtOpinion4.Text = getF4.Opinion; - } - this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); - this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); - } - } - var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); - if (getF5 != null) - { - this.txtForm5.Title = getF5.AuditFlowName + "："; - if (getF5.OperaterTime.HasValue) - { - if (getF5.IsAgree == true) - { - this.txtOpinion5.Text = "同意。"; - } - else - { - this.txtOpinion5.Text = getF5.Opinion; - } - this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); - this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); - } - } - var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); - if (getF6 != null) - { - this.txtForm6.Title = getF6.AuditFlowName + "："; - if (getF6.OperaterTime.HasValue) - { - if (getF6.IsAgree == true) - { - this.txtOpinion6.Text = "同意。"; - } - else - { - this.txtOpinion6.Text = getF6.Opinion; - } - this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); - this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); - } - } + //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + //if (getF2 != null) + //{ + // this.txtForm2.Title = getF2.AuditFlowName + "："; + // if (getF2.OperaterTime.HasValue) + // { + // if (getF2.IsAgree == true) + // { + // this.txtOpinion2.Text = "同意。"; + // } + // else + // { + // this.txtOpinion2.Text = getF2.Opinion; + // } + // this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); + // this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + // } + //} + //var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + //if (getF3 != null) + //{ + // this.txtForm3.Title = getF3.AuditFlowName + "："; + // if (getF3.OperaterTime.HasValue) + // { + // if (getF3.IsAgree == true) + // { + // this.txtOpinion3.Text = "同意。"; + // } + // else + // { + // this.txtOpinion3.Text = getF3.Opinion; + // } + // this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); + // this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + // } + //} + //var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + //if (getF4 != null) + //{ + // this.txtForm4.Title = getF4.AuditFlowName + "："; + // if (getF4.OperaterTime.HasValue) + // { + // if (getF4.IsAgree == true) + // { + // this.txtOpinion4.Text = "同意。"; + // } + // else + // { + // this.txtOpinion4.Text = getF4.Opinion; + // } + // this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); + // this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + // } + //} + //var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); + //if (getF5 != null) + //{ + // this.txtForm5.Title = getF5.AuditFlowName + "："; + // if (getF5.OperaterTime.HasValue) + // { + // if (getF5.IsAgree == true) + // { + // this.txtOpinion5.Text = "同意。"; + // } + // else + // { + // this.txtOpinion5.Text = getF5.Opinion; + // } + // this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); + // this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); + // } + //} + //var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); + //if (getF6 != null) + //{ + // this.txtForm6.Title = getF6.AuditFlowName + "："; + // if (getF6.OperaterTime.HasValue) + // { + // if (getF6.IsAgree == true) + // { + // this.txtOpinion6.Text = "同意。"; + // } + // else + // { + // this.txtOpinion6.Text = getF6.Opinion; + // } + // this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); + // this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); + // } + //} } } #endregion @@ -211,7 +214,7 @@ ///
private void BindGrid() { - string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '适用' ELSE '不适用' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '合格' ELSE '不合格' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + @" FROM License_LicenseItem AS L " + @" LEFT JOIN Sys_User AS U ON L.ConfirmManId =U.UserId" + @" WHERE L.DataId ='" + this.BreakGroundId +"'"; diff --git a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.designer.cs index 1795599b..274e3fa4 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.License { - - - public partial class BreakGroundView { - +namespace FineUIPro.Web.HSSE.License +{ + + + public partial class BreakGroundView + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// lbLicenseCode 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbLicenseCode; - + /// /// lbImageUrl 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbImageUrl; - + /// /// txtApplyUnit 控件。 /// @@ -65,16 +67,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtApplyUnit; - + /// - /// txtApplyManName 控件。 + /// txtWorkAreaName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtApplyManName; - + protected global::FineUIPro.TextBox txtWorkAreaName; + /// /// txtWorkPalce 控件。 /// @@ -83,16 +85,25 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkPalce; - + /// - /// txtWorkDepth 控件。 + /// txtFireWatchManName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtWorkDepth; - + protected global::FineUIPro.TextBox txtFireWatchManName; + + /// + /// txtReason 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtReason; + /// /// txtWorkDate 控件。 /// @@ -101,7 +112,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkDate; - + /// /// txtWorkMeasures 控件。 /// @@ -110,7 +121,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkMeasures; - + /// /// Grid1 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// txtForm1 控件。 /// @@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form txtForm1; - + /// /// txtOpinion1 控件。 /// @@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtOpinion1; - + /// /// Label6 控件。 /// @@ -146,7 +157,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label6; - + /// /// txtName1 控件。 /// @@ -155,7 +166,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtName1; - + /// /// txtTime1 控件。 /// @@ -164,232 +175,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtTime1; - - /// - /// txtForm2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm2; - - /// - /// txtOpinion2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion2; - - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label1; - - /// - /// txtName2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName2; - - /// - /// txtTime2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime2; - - /// - /// txtForm3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm3; - - /// - /// txtOpinion3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion3; - - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label2; - - /// - /// txtName3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName3; - - /// - /// txtTime3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime3; - - /// - /// txtForm4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm4; - - /// - /// txtOpinion4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion4; - - /// - /// Label5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label5; - - /// - /// txtName4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName4; - - /// - /// txtTime4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime4; - - /// - /// txtForm5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm5; - - /// - /// txtOpinion5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion5; - - /// - /// Label9 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label9; - - /// - /// txtName5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName5; - - /// - /// txtTime5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime5; - - /// - /// txtForm6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm6; - - /// - /// txtOpinion6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion6; - - /// - /// Label12 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label12; - - /// - /// txtName6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName6; - - /// - /// txtTime6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime6; - + /// /// txtCance 控件。 /// @@ -398,7 +184,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCance; - + /// /// txtClose 控件。 /// @@ -407,7 +193,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtClose; - + /// /// Toolbar1 控件。 /// @@ -416,7 +202,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// lbTemp 控件。 /// @@ -425,7 +211,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbTemp; - + /// /// btnAttachUrl 控件。 /// @@ -434,7 +220,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttachUrl; - + /// /// ToolbarFill1 控件。 /// @@ -443,7 +229,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnClose 控件。 /// @@ -452,7 +238,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx index 26a48405..f560f791 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx @@ -36,33 +36,42 @@ - - + + - - - - - - - - - - - - - + - + + + + + + + + + + + + + <%-- + + + + + --%> + + + @@ -74,10 +83,10 @@ HeaderText="检查单" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true"> + HeaderText="确认人" HeaderTextAlign="Center" TextAlign="Left" > + HeaderText="是否合格" HeaderTextAlign="Center" TextAlign="Left" > @@ -106,121 +115,10 @@ - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.cs index 557d14e9..74bdf22b 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.cs @@ -46,7 +46,7 @@ namespace FineUIPro.Web.HSSE.License { this.lbLicenseCode.Text = getElectricity.LicenseCode; this.txtApplyUnit.Text = UnitService.GetUnitNameByUnitId(getElectricity.ApplyUnitId); - this.txtApplyManName.Text = UserService.GetUserNameByUserId(getElectricity.ApplyManId); + //this.txtApplyManName.Text = UserService.GetUserNameByUserId(getElectricity.ApplyManId); this.txtWorkPalce.Text = getElectricity.WorkPalce; this.txtReason.Text = getElectricity.Reason; if (getElectricity.ValidityStartTime.HasValue) @@ -57,7 +57,7 @@ namespace FineUIPro.Web.HSSE.License this.txtWorkDate.Text += getElectricity.ValidityEndTime.Value.ToString("f"); } } - this.txtWorkMeasures.Text = getElectricity.WorkMeasures; + //this.txtWorkMeasures.Text = getElectricity.WorkMeasures; if (!string.IsNullOrEmpty(getElectricity.CancelManId)) { this.txtCance.Text = UserService.GetUserNameByUserId(getElectricity.CancelManId) + "；取消时间：" @@ -76,6 +76,10 @@ namespace FineUIPro.Web.HSSE.License + string.Format("{0:yyyy-MM-dd HH:mm}", getElectricity.CloseTime) + "。"; } } + txtWorkAreaName.Text = UnitWorkService.GetUnitWorkName(getElectricity.WorkAreaId); + txtWorkLeaderName.Text = getElectricity.WorkLeaderName; + txtFireWatchManName.Text = getElectricity.FireWatchManName; + } } // 绑定表格 @@ -112,96 +116,96 @@ namespace FineUIPro.Web.HSSE.License this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } - var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); - if (getF2 != null) - { - this.txtForm2.Title = getF2.AuditFlowName + "："; - if (getF2.OperaterTime.HasValue) - { - if (getF2.IsAgree == true) - { - this.txtOpinion2.Text = "同意。"; - } - else - { - this.txtOpinion2.Text = getF2.Opinion; - } - this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); - this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); - } - } - var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); - if (getF3 != null) - { - this.txtForm3.Title = getF3.AuditFlowName + "："; - if (getF3.OperaterTime.HasValue) - { - if (getF3.IsAgree == true) - { - this.txtOpinion3.Text = "同意。"; - } - else - { - this.txtOpinion3.Text = getF3.Opinion; - } - this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); - this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); - } - } - var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); - if (getF4 != null) - { - this.txtForm4.Title = getF4.AuditFlowName + "："; - if (getF4.OperaterTime.HasValue) - { - if (getF4.IsAgree == true) - { - this.txtOpinion4.Text = "同意。"; - } - else - { - this.txtOpinion4.Text = getF4.Opinion; - } - this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); - this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); - } - } - var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); - if (getF5 != null) - { - this.txtForm5.Title = getF5.AuditFlowName + "："; - if (getF5.OperaterTime.HasValue) - { - if (getF5.IsAgree == true) - { - this.txtOpinion5.Text = "同意。"; - } - else - { - this.txtOpinion5.Text = getF5.Opinion; - } - this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); - this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); - } - } - var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); - if (getF6 != null) - { - this.txtForm6.Title = getF6.AuditFlowName + "："; - if (getF6.OperaterTime.HasValue) - { - if (getF6.IsAgree == true) - { - this.txtOpinion6.Text = "同意。"; - } - else - { - this.txtOpinion6.Text = getF6.Opinion; - } - this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); - this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); - } - } + //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + //if (getF2 != null) + //{ + // this.txtForm2.Title = getF2.AuditFlowName + "："; + // if (getF2.OperaterTime.HasValue) + // { + // if (getF2.IsAgree == true) + // { + // this.txtOpinion2.Text = "同意。"; + // } + // else + // { + // this.txtOpinion2.Text = getF2.Opinion; + // } + // this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); + // this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + // } + //} + //var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + //if (getF3 != null) + //{ + // this.txtForm3.Title = getF3.AuditFlowName + "："; + // if (getF3.OperaterTime.HasValue) + // { + // if (getF3.IsAgree == true) + // { + // this.txtOpinion3.Text = "同意。"; + // } + // else + // { + // this.txtOpinion3.Text = getF3.Opinion; + // } + // this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); + // this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + // } + //} + //var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + //if (getF4 != null) + //{ + // this.txtForm4.Title = getF4.AuditFlowName + "："; + // if (getF4.OperaterTime.HasValue) + // { + // if (getF4.IsAgree == true) + // { + // this.txtOpinion4.Text = "同意。"; + // } + // else + // { + // this.txtOpinion4.Text = getF4.Opinion; + // } + // this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); + // this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + // } + //} + //var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); + //if (getF5 != null) + //{ + // this.txtForm5.Title = getF5.AuditFlowName + "："; + // if (getF5.OperaterTime.HasValue) + // { + // if (getF5.IsAgree == true) + // { + // this.txtOpinion5.Text = "同意。"; + // } + // else + // { + // this.txtOpinion5.Text = getF5.Opinion; + // } + // this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); + // this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); + // } + //} + //var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); + //if (getF6 != null) + //{ + // this.txtForm6.Title = getF6.AuditFlowName + "："; + // if (getF6.OperaterTime.HasValue) + // { + // if (getF6.IsAgree == true) + // { + // this.txtOpinion6.Text = "同意。"; + // } + // else + // { + // this.txtOpinion6.Text = getF6.Opinion; + // } + // this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); + // this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); + // } + //} } } #endregion diff --git a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.designer.cs index 586573d5..e663d772 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.designer.cs @@ -69,13 +69,13 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextBox txtApplyUnit; /// - /// txtApplyManName 控件。 + /// txtWorkAreaName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtApplyManName; + protected global::FineUIPro.TextBox txtWorkAreaName; /// /// txtWorkPalce 控件。 @@ -95,6 +95,24 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.TextBox txtReason; + /// + /// txtWorkLeaderName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkLeaderName; + + /// + /// txtFireWatchManName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtFireWatchManName; + /// /// txtWorkDate 控件。 /// @@ -104,15 +122,6 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.TextBox txtWorkDate; - /// - /// txtWorkMeasures 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtWorkMeasures; - /// /// Grid1 控件。 /// @@ -167,231 +176,6 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtTime1; - /// - /// txtForm2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm2; - - /// - /// txtOpinion2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion2; - - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label1; - - /// - /// txtName2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName2; - - /// - /// txtTime2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime2; - - /// - /// txtForm3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm3; - - /// - /// txtOpinion3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion3; - - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label2; - - /// - /// txtName3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName3; - - /// - /// txtTime3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime3; - - /// - /// txtForm4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm4; - - /// - /// txtOpinion4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion4; - - /// - /// Label5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label5; - - /// - /// txtName4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName4; - - /// - /// txtTime4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime4; - - /// - /// txtForm5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm5; - - /// - /// txtOpinion5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion5; - - /// - /// Label9 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label9; - - /// - /// txtName5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName5; - - /// - /// txtTime5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime5; - - /// - /// txtForm6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm6; - - /// - /// txtOpinion6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion6; - - /// - /// Label12 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label12; - - /// - /// txtName6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName6; - - /// - /// txtTime6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime6; - /// /// txtCance 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx index 247d5c16..c5cc62e5 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx @@ -29,15 +29,23 @@ - + + + - + + + + + + + @@ -47,12 +55,12 @@ - + <%-- - + --%> + HeaderText="动火作业安全措施" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true"> + HeaderText="确认人" HeaderTextAlign="Center" TextAlign="Left" > + HeaderText="是否合格" HeaderTextAlign="Center" TextAlign="Left" > @@ -99,121 +107,11 @@ - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs index 08a8a821..00d96290 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs @@ -46,7 +46,10 @@ { this.lbLicenseCode.Text = getFireWork.LicenseCode; this.txtApplyUnit.Text = UnitService.GetUnitNameByUnitId(getFireWork.ApplyUnitId); - this.txtApplyManName.Text = UserService.GetUserNameByUserId(getFireWork.ApplyManId); + //this.txtApplyManName.Text = UserService.GetUserNameByUserId(getFireWork.ApplyManId); + txtWorkAreaName.Text = UnitWorkService.GetUnitWorkName(getFireWork.WorkAreaId); + txtReason.Text = getFireWork.Reason; + txtFireLevel.Text = getFireWork.FireLevel; this.txtWorkPalce.Text = getFireWork.WorkPalce; string name = getFireWork.FireWatchManName; if (string.IsNullOrEmpty(getFireWork.FireWatchManName)) @@ -62,7 +65,7 @@ this.txtWorkDate.Text += getFireWork.ValidityEndTime.Value.ToString("f"); } } - this.txtWorkMeasures.Text = getFireWork.WorkMeasures; + //this.txtWorkMeasures.Text = getFireWork.WorkMeasures; if (!string.IsNullOrEmpty(getFireWork.CancelManId)) { this.txtCance.Text = UserService.GetUserNameByUserId(getFireWork.CancelManId) + "；取消时间：" @@ -117,96 +120,96 @@ this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } - var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); - if (getF2 != null) - { - this.txtForm2.Title = getF2.AuditFlowName + "："; - if (getF2.OperaterTime.HasValue) - { - if (getF2.IsAgree == true) - { - this.txtOpinion2.Text = "同意。"; - } - else - { - this.txtOpinion2.Text = getF2.Opinion; - } - this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); - this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); - } - } - var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); - if (getF3 != null) - { - this.txtForm3.Title = getF3.AuditFlowName + "："; - if (getF3.OperaterTime.HasValue) - { - if (getF3.IsAgree == true) - { - this.txtOpinion3.Text = "同意。"; - } - else - { - this.txtOpinion3.Text = getF3.Opinion; - } - this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); - this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); - } - } - var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); - if (getF4 != null) - { - this.txtForm4.Title = getF4.AuditFlowName + "："; - if (getF4.OperaterTime.HasValue) - { - if (getF4.IsAgree == true) - { - this.txtOpinion4.Text = "同意。"; - } - else - { - this.txtOpinion4.Text = getF4.Opinion; - } - this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); - this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); - } - } - var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); - if (getF5 != null) - { - this.txtForm5.Title = getF5.AuditFlowName + "："; - if (getF5.OperaterTime.HasValue) - { - if (getF5.IsAgree == true) - { - this.txtOpinion5.Text = "同意。"; - } - else - { - this.txtOpinion5.Text = getF5.Opinion; - } - this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); - this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); - } - } - var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); - if (getF6 != null) - { - this.txtForm6.Title = getF6.AuditFlowName + "："; - if (getF6.OperaterTime.HasValue) - { - if (getF6.IsAgree == true) - { - this.txtOpinion6.Text = "同意。"; - } - else - { - this.txtOpinion6.Text = getF6.Opinion; - } - this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); - this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); - } - } + //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + //if (getF2 != null) + //{ + // this.txtForm2.Title = getF2.AuditFlowName + "："; + // if (getF2.OperaterTime.HasValue) + // { + // if (getF2.IsAgree == true) + // { + // this.txtOpinion2.Text = "同意。"; + // } + // else + // { + // this.txtOpinion2.Text = getF2.Opinion; + // } + // this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); + // this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + // } + //} + //var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + //if (getF3 != null) + //{ + // this.txtForm3.Title = getF3.AuditFlowName + "："; + // if (getF3.OperaterTime.HasValue) + // { + // if (getF3.IsAgree == true) + // { + // this.txtOpinion3.Text = "同意。"; + // } + // else + // { + // this.txtOpinion3.Text = getF3.Opinion; + // } + // this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); + // this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + // } + //} + //var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + //if (getF4 != null) + //{ + // this.txtForm4.Title = getF4.AuditFlowName + "："; + // if (getF4.OperaterTime.HasValue) + // { + // if (getF4.IsAgree == true) + // { + // this.txtOpinion4.Text = "同意。"; + // } + // else + // { + // this.txtOpinion4.Text = getF4.Opinion; + // } + // this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); + // this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + // } + //} + //var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); + //if (getF5 != null) + //{ + // this.txtForm5.Title = getF5.AuditFlowName + "："; + // if (getF5.OperaterTime.HasValue) + // { + // if (getF5.IsAgree == true) + // { + // this.txtOpinion5.Text = "同意。"; + // } + // else + // { + // this.txtOpinion5.Text = getF5.Opinion; + // } + // this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); + // this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); + // } + //} + //var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); + //if (getF6 != null) + //{ + // this.txtForm6.Title = getF6.AuditFlowName + "："; + // if (getF6.OperaterTime.HasValue) + // { + // if (getF6.IsAgree == true) + // { + // this.txtOpinion6.Text = "同意。"; + // } + // else + // { + // this.txtOpinion6.Text = getF6.Opinion; + // } + // this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); + // this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); + // } + //} } } #endregion @@ -216,7 +219,7 @@ /// private void BindGrid() { - string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '适用' ELSE '不适用' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '合格' ELSE '不合格' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + @" FROM License_LicenseItem AS L " + @" LEFT JOIN Sys_User AS U ON L.ConfirmManId =U.UserId" + @" WHERE L.DataId ='" + this.FireWorkId +"'"; diff --git a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs index fe8113a9..0eaeabc6 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.License { - - - public partial class FireWorkView { - +namespace FineUIPro.Web.HSSE.License +{ + + + public partial class FireWorkView + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// lbLicenseCode 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbLicenseCode; - + /// /// txtApplyUnit 控件。 /// @@ -56,16 +58,25 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtApplyUnit; - + /// - /// txtApplyManName 控件。 + /// txtWorkAreaName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtApplyManName; - + protected global::FineUIPro.TextBox txtWorkAreaName; + + /// + /// txtReason 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtReason; + /// /// txtWorkPalce 控件。 /// @@ -74,7 +85,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkPalce; - + + /// + /// txtFireLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtFireLevel; + /// /// txtFireWatchManName 控件。 /// @@ -83,7 +103,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtFireWatchManName; - + /// /// txtWorkDate 控件。 /// @@ -92,16 +112,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkDate; - - /// - /// txtWorkMeasures 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtWorkMeasures; - + /// /// Grid1 控件。 /// @@ -110,7 +121,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// txtForm1 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form txtForm1; - + /// /// txtOpinion1 控件。 /// @@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtOpinion1; - + /// /// Label6 控件。 /// @@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label6; - + /// /// txtName1 控件。 /// @@ -146,7 +157,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtName1; - + /// /// txtTime1 控件。 /// @@ -155,232 +166,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtTime1; - - /// - /// txtForm2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm2; - - /// - /// txtOpinion2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion2; - - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label1; - - /// - /// txtName2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName2; - - /// - /// txtTime2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime2; - - /// - /// txtForm3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm3; - - /// - /// txtOpinion3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion3; - - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label2; - - /// - /// txtName3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName3; - - /// - /// txtTime3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime3; - - /// - /// txtForm4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm4; - - /// - /// txtOpinion4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion4; - - /// - /// Label5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label5; - - /// - /// txtName4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName4; - - /// - /// txtTime4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime4; - - /// - /// txtForm5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm5; - - /// - /// txtOpinion5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion5; - - /// - /// Label9 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label9; - - /// - /// txtName5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName5; - - /// - /// txtTime5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime5; - - /// - /// txtForm6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm6; - - /// - /// txtOpinion6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion6; - - /// - /// Label12 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label12; - - /// - /// txtName6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName6; - - /// - /// txtTime6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime6; - + /// /// txtCance 控件。 /// @@ -389,7 +175,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCance; - + /// /// txtClose 控件。 /// @@ -398,7 +184,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtClose; - + /// /// Toolbar1 控件。 /// @@ -407,7 +193,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// ToolbarFill1 控件。 /// @@ -416,7 +202,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnClose 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx b/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx index 4a4caea2..a8597032 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx @@ -29,18 +29,35 @@ - - + + - + + + + + + + + + + + + + + + + + + @@ -49,8 +66,7 @@ - - + @@ -70,13 +86,13 @@ HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left" > + HeaderText="高处作业安全措施" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true"> + HeaderText="确认人" HeaderTextAlign="Center" TextAlign="Left" > + HeaderText="是否合格" HeaderTextAlign="Center" TextAlign="Left" > @@ -105,121 +121,10 @@ - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs index c3fd4e0d..3f521841 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs @@ -46,9 +46,13 @@ { this.lbLicenseCode.Text = getHeightWork.LicenseCode; this.txtApplyUnit.Text = UnitService.GetUnitNameByUnitId(getHeightWork.ApplyUnitId); - this.txtApplyManName.Text = UserService.GetUserNameByUserId(getHeightWork.ApplyManId); + //this.txtApplyManName.Text = UserService.GetUserNameByUserId(getHeightWork.ApplyManId); + txtWorkAreaName.Text = UnitWorkService.GetUnitWorkName(getHeightWork.WorkAreaId); this.txtWorkPalce.Text = getHeightWork.WorkPalce; this.txtWorkType.Text = getHeightWork.WorkType; + txtWorkLeaderName.Text = getHeightWork.WorkLeaderName; + txtFireWatchManName.Text = getHeightWork.FireWatchManName; + txtWorkHeight.Text = getHeightWork.WorkHeight; if (getHeightWork.ValidityStartTime.HasValue) { this.txtWorkDate.Text = getHeightWork.ValidityStartTime.Value.ToString("f") + " 至 "; @@ -113,96 +117,96 @@ this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } - var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); - if (getF2 != null) - { - this.txtForm2.Title = getF2.AuditFlowName + "："; - if (getF2.OperaterTime.HasValue) - { - if (getF2.IsAgree == true) - { - this.txtOpinion2.Text = "同意。"; - } - else - { - this.txtOpinion2.Text = getF2.Opinion; - } - this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); - this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); - } - } - var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); - if (getF3 != null) - { - this.txtForm3.Title = getF3.AuditFlowName + "："; - if (getF3.OperaterTime.HasValue) - { - if (getF3.IsAgree == true) - { - this.txtOpinion3.Text = "同意。"; - } - else - { - this.txtOpinion3.Text = getF3.Opinion; - } - this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); - this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); - } - } - var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); - if (getF4 != null) - { - this.txtForm4.Title = getF4.AuditFlowName + "："; - if (getF4.OperaterTime.HasValue) - { - if (getF4.IsAgree == true) - { - this.txtOpinion4.Text = "同意。"; - } - else - { - this.txtOpinion4.Text = getF4.Opinion; - } - this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); - this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); - } - } - var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); - if (getF5 != null) - { - this.txtForm5.Title = getF5.AuditFlowName + "："; - if (getF5.OperaterTime.HasValue) - { - if (getF5.IsAgree == true) - { - this.txtOpinion5.Text = "同意。"; - } - else - { - this.txtOpinion5.Text = getF5.Opinion; - } - this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); - this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); - } - } - var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); - if (getF6 != null) - { - this.txtForm6.Title = getF6.AuditFlowName + "："; - if (getF6.OperaterTime.HasValue) - { - if (getF6.IsAgree == true) - { - this.txtOpinion6.Text = "同意。"; - } - else - { - this.txtOpinion6.Text = getF6.Opinion; - } - this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); - this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); - } - } + //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + //if (getF2 != null) + //{ + // this.txtForm2.Title = getF2.AuditFlowName + "："; + // if (getF2.OperaterTime.HasValue) + // { + // if (getF2.IsAgree == true) + // { + // this.txtOpinion2.Text = "同意。"; + // } + // else + // { + // this.txtOpinion2.Text = getF2.Opinion; + // } + // this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); + // this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + // } + //} + //var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + //if (getF3 != null) + //{ + // this.txtForm3.Title = getF3.AuditFlowName + "："; + // if (getF3.OperaterTime.HasValue) + // { + // if (getF3.IsAgree == true) + // { + // this.txtOpinion3.Text = "同意。"; + // } + // else + // { + // this.txtOpinion3.Text = getF3.Opinion; + // } + // this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); + // this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + // } + //} + //var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + //if (getF4 != null) + //{ + // this.txtForm4.Title = getF4.AuditFlowName + "："; + // if (getF4.OperaterTime.HasValue) + // { + // if (getF4.IsAgree == true) + // { + // this.txtOpinion4.Text = "同意。"; + // } + // else + // { + // this.txtOpinion4.Text = getF4.Opinion; + // } + // this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); + // this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + // } + //} + //var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); + //if (getF5 != null) + //{ + // this.txtForm5.Title = getF5.AuditFlowName + "："; + // if (getF5.OperaterTime.HasValue) + // { + // if (getF5.IsAgree == true) + // { + // this.txtOpinion5.Text = "同意。"; + // } + // else + // { + // this.txtOpinion5.Text = getF5.Opinion; + // } + // this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); + // this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); + // } + //} + //var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); + //if (getF6 != null) + //{ + // this.txtForm6.Title = getF6.AuditFlowName + "："; + // if (getF6.OperaterTime.HasValue) + // { + // if (getF6.IsAgree == true) + // { + // this.txtOpinion6.Text = "同意。"; + // } + // else + // { + // this.txtOpinion6.Text = getF6.Opinion; + // } + // this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); + // this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); + // } + //} } } #endregion @@ -212,7 +216,7 @@ /// private void BindGrid() { - string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '适用' ELSE '不适用' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '合格' ELSE '不合格' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + @" FROM License_LicenseItem AS L " + @" LEFT JOIN Sys_User AS U ON L.ConfirmManId =U.UserId" + @" WHERE L.DataId ='" + this.HeightWorkId +"'"; diff --git a/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.designer.cs index f64cd080..9e34a8c0 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.License { - - - public partial class HeightWorkView { - +namespace FineUIPro.Web.HSSE.License +{ + + + public partial class HeightWorkView + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// lbLicenseCode 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbLicenseCode; - + /// /// txtApplyUnit 控件。 /// @@ -56,16 +58,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtApplyUnit; - + /// - /// txtApplyManName 控件。 + /// txtWorkAreaName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtApplyManName; - + protected global::FineUIPro.TextBox txtWorkAreaName; + /// /// txtWorkPalce 控件。 /// @@ -74,25 +76,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkPalce; - - /// - /// txtWorkType 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtWorkType; - - /// - /// txtWorkDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtWorkDate; - + /// /// txtWorkMeasures 控件。 /// @@ -101,7 +85,52 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkMeasures; - + + /// + /// txtWorkLeaderName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkLeaderName; + + /// + /// txtFireWatchManName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtFireWatchManName; + + /// + /// txtWorkHeight 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkHeight; + + /// + /// txtWorkType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkType; + + /// + /// txtWorkDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkDate; + /// /// txtEquipmentTools 控件。 /// @@ -110,7 +139,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtEquipmentTools; - + /// /// Grid1 控件。 /// @@ -119,7 +148,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// txtForm1 控件。 /// @@ -128,7 +157,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form txtForm1; - + /// /// txtOpinion1 控件。 /// @@ -137,7 +166,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtOpinion1; - + /// /// Label6 控件。 /// @@ -146,7 +175,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label6; - + /// /// txtName1 控件。 /// @@ -155,7 +184,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtName1; - + /// /// txtTime1 控件。 /// @@ -164,232 +193,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtTime1; - - /// - /// txtForm2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm2; - - /// - /// txtOpinion2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion2; - - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label1; - - /// - /// txtName2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName2; - - /// - /// txtTime2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime2; - - /// - /// txtForm3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm3; - - /// - /// txtOpinion3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion3; - - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label2; - - /// - /// txtName3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName3; - - /// - /// txtTime3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime3; - - /// - /// txtForm4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm4; - - /// - /// txtOpinion4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion4; - - /// - /// Label5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label5; - - /// - /// txtName4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName4; - - /// - /// txtTime4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime4; - - /// - /// txtForm5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm5; - - /// - /// txtOpinion5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion5; - - /// - /// Label9 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label9; - - /// - /// txtName5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName5; - - /// - /// txtTime5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime5; - - /// - /// txtForm6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm6; - - /// - /// txtOpinion6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion6; - - /// - /// Label12 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label12; - - /// - /// txtName6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName6; - - /// - /// txtTime6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime6; - + /// /// txtCance 控件。 /// @@ -398,7 +202,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCance; - + /// /// txtClose 控件。 /// @@ -407,7 +211,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtClose; - + /// /// Toolbar1 控件。 /// @@ -416,7 +220,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// ToolbarFill1 控件。 /// @@ -425,7 +229,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnClose 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx index aef591b6..2a140728 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx @@ -29,14 +29,36 @@ - + + + + + + + + + - + + + + + + + + + + + + + + + @@ -47,21 +69,11 @@ - - - - - - - - - - - - + + - @@ -73,10 +85,10 @@ HeaderText="检查单" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true"> + HeaderText="确认人" HeaderTextAlign="Center" TextAlign="Left" > + HeaderText="是否合格" HeaderTextAlign="Center" TextAlign="Left" > @@ -105,121 +117,11 @@ - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs index d5f08b5a..b4a0f1b3 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs @@ -46,8 +46,8 @@ { this.lbLicenseCode.Text = getLiftingWork.LicenseCode; this.txtApplyUnit.Text = UnitService.GetUnitNameByUnitId(getLiftingWork.ApplyUnitId); - this.txtApplyManName.Text = UserService.GetUserNameByUserId(getLiftingWork.ApplyManId); - this.txtWorkPalce.Text = getLiftingWork.WorkPalce; + //this.txtApplyManName.Text = UserService.GetUserNameByUserId(getLiftingWork.ApplyManId); + //this.txtWorkPalce.Text = getLiftingWork.WorkPalce; this.txtWorkLevel.Text = getLiftingWork.WorkLevel; if (getLiftingWork.ValidityStartTime.HasValue) { @@ -77,6 +77,12 @@ + string.Format("{0:yyyy-MM-dd HH:mm}", getLiftingWork.CloseTime) + "。"; } } + + txtLiftingHeight.Text = getLiftingWork.LiftingHeight; + txtFireWatchManName.Text = getLiftingWork.FireWatchManName; + txtWorkLeaderName.Text = getLiftingWork.WorkLeaderName; + txtQzgName.Text = getLiftingWork.QzgName; + txtSjName.Text = getLiftingWork.SjName; } } // 绑定表格 @@ -113,96 +119,96 @@ this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } - var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); - if (getF2 != null) - { - this.txtForm2.Title = getF2.AuditFlowName + "："; - if (getF2.OperaterTime.HasValue) - { - if (getF2.IsAgree == true) - { - this.txtOpinion2.Text = "同意。"; - } - else - { - this.txtOpinion2.Text = getF2.Opinion; - } - this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); - this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); - } - } - var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); - if (getF3 != null) - { - this.txtForm3.Title = getF3.AuditFlowName + "："; - if (getF3.OperaterTime.HasValue) - { - if (getF3.IsAgree == true) - { - this.txtOpinion3.Text = "同意。"; - } - else - { - this.txtOpinion3.Text = getF3.Opinion; - } - this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); - this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); - } - } - var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); - if (getF4 != null) - { - this.txtForm4.Title = getF4.AuditFlowName + "："; - if (getF4.OperaterTime.HasValue) - { - if (getF4.IsAgree == true) - { - this.txtOpinion4.Text = "同意。"; - } - else - { - this.txtOpinion4.Text = getF4.Opinion; - } - this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); - this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); - } - } - var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); - if (getF5 != null) - { - this.txtForm5.Title = getF5.AuditFlowName + "："; - if (getF5.OperaterTime.HasValue) - { - if (getF5.IsAgree == true) - { - this.txtOpinion5.Text = "同意。"; - } - else - { - this.txtOpinion5.Text = getF5.Opinion; - } - this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); - this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); - } - } - var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); - if (getF6 != null) - { - this.txtForm6.Title = getF6.AuditFlowName + "："; - if (getF6.OperaterTime.HasValue) - { - if (getF6.IsAgree == true) - { - this.txtOpinion6.Text = "同意。"; - } - else - { - this.txtOpinion6.Text = getF6.Opinion; - } - this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); - this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); - } - } + //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + //if (getF2 != null) + //{ + // this.txtForm2.Title = getF2.AuditFlowName + "："; + // if (getF2.OperaterTime.HasValue) + // { + // if (getF2.IsAgree == true) + // { + // this.txtOpinion2.Text = "同意。"; + // } + // else + // { + // this.txtOpinion2.Text = getF2.Opinion; + // } + // this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); + // this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + // } + //} + //var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + //if (getF3 != null) + //{ + // this.txtForm3.Title = getF3.AuditFlowName + "："; + // if (getF3.OperaterTime.HasValue) + // { + // if (getF3.IsAgree == true) + // { + // this.txtOpinion3.Text = "同意。"; + // } + // else + // { + // this.txtOpinion3.Text = getF3.Opinion; + // } + // this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); + // this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + // } + //} + //var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + //if (getF4 != null) + //{ + // this.txtForm4.Title = getF4.AuditFlowName + "："; + // if (getF4.OperaterTime.HasValue) + // { + // if (getF4.IsAgree == true) + // { + // this.txtOpinion4.Text = "同意。"; + // } + // else + // { + // this.txtOpinion4.Text = getF4.Opinion; + // } + // this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); + // this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + // } + //} + //var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); + //if (getF5 != null) + //{ + // this.txtForm5.Title = getF5.AuditFlowName + "："; + // if (getF5.OperaterTime.HasValue) + // { + // if (getF5.IsAgree == true) + // { + // this.txtOpinion5.Text = "同意。"; + // } + // else + // { + // this.txtOpinion5.Text = getF5.Opinion; + // } + // this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); + // this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); + // } + //} + //var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); + //if (getF6 != null) + //{ + // this.txtForm6.Title = getF6.AuditFlowName + "："; + // if (getF6.OperaterTime.HasValue) + // { + // if (getF6.IsAgree == true) + // { + // this.txtOpinion6.Text = "同意。"; + // } + // else + // { + // this.txtOpinion6.Text = getF6.Opinion; + // } + // this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); + // this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); + // } + //} } } #endregion @@ -212,7 +218,7 @@ /// private void BindGrid() { - string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '适用' ELSE '不适用' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '合格' ELSE '不合格' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + @" FROM License_LicenseItem AS L " + @" LEFT JOIN Sys_User AS U ON L.ConfirmManId =U.UserId" + @" WHERE L.DataId ='" + this.LiftingWorkId +"'"; diff --git a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.designer.cs index 3664c3fb..7c590340 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.License { - - - public partial class LiftingWorkView { - +namespace FineUIPro.Web.HSSE.License +{ + + + public partial class LiftingWorkView + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// lbLicenseCode 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbLicenseCode; - + /// /// txtApplyUnit 控件。 /// @@ -56,43 +58,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtApplyUnit; - + /// - /// txtApplyManName 控件。 + /// txtSjName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtApplyManName; - - /// - /// txtWorkPalce 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtWorkPalce; - - /// - /// txtWorkLevel 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtWorkLevel; - - /// - /// txtWorkDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtWorkDate; - + protected global::FineUIPro.TextBox txtSjName; + /// /// txtWorkMeasures 控件。 /// @@ -101,7 +76,34 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkMeasures; - + + /// + /// txtQzgName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtQzgName; + + /// + /// txtWorkLeaderName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkLeaderName; + + /// + /// txtFireWatchManName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtFireWatchManName; + /// /// txtCraneCapacity 控件。 /// @@ -110,7 +112,34 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCraneCapacity; - + + /// + /// txtLiftingHeight 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtLiftingHeight; + + /// + /// txtWorkLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkLevel; + + /// + /// txtWorkDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkDate; + /// /// Grid1 控件。 /// @@ -119,7 +148,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// txtForm1 控件。 /// @@ -128,7 +157,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form txtForm1; - + /// /// txtOpinion1 控件。 /// @@ -137,7 +166,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtOpinion1; - + /// /// Label6 控件。 /// @@ -146,7 +175,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label6; - + /// /// txtName1 控件。 /// @@ -155,7 +184,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtName1; - + /// /// txtTime1 控件。 /// @@ -164,232 +193,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtTime1; - - /// - /// txtForm2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm2; - - /// - /// txtOpinion2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion2; - - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label1; - - /// - /// txtName2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName2; - - /// - /// txtTime2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime2; - - /// - /// txtForm3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm3; - - /// - /// txtOpinion3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion3; - - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label2; - - /// - /// txtName3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName3; - - /// - /// txtTime3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime3; - - /// - /// txtForm4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm4; - - /// - /// txtOpinion4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion4; - - /// - /// Label5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label5; - - /// - /// txtName4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName4; - - /// - /// txtTime4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime4; - - /// - /// txtForm5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm5; - - /// - /// txtOpinion5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion5; - - /// - /// Label9 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label9; - - /// - /// txtName5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName5; - - /// - /// txtTime5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime5; - - /// - /// txtForm6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm6; - - /// - /// txtOpinion6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion6; - - /// - /// Label12 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label12; - - /// - /// txtName6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName6; - - /// - /// txtTime6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime6; - + /// /// txtCance 控件。 /// @@ -398,7 +202,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCance; - + /// /// txtClose 控件。 /// @@ -407,7 +211,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtClose; - + /// /// Toolbar1 控件。 /// @@ -416,7 +220,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// ToolbarFill1 控件。 /// @@ -425,7 +229,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnClose 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx index 4e27c2be..4f956f95 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx @@ -29,8 +29,8 @@ - - + + @@ -52,10 +52,44 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -67,10 +101,10 @@ HeaderText="检查单" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true"> + HeaderText="确认人" HeaderTextAlign="Center" TextAlign="Left" > + HeaderText="是否合格" HeaderTextAlign="Center" TextAlign="Left" > @@ -99,121 +133,11 @@ - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.cs index 1946f21f..72989e02 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.cs @@ -46,8 +46,11 @@ { this.lbLicenseCode.Text = getLimitedSpace.LicenseCode; this.txtApplyUnit.Text = UnitService.GetUnitNameByUnitId(getLimitedSpace.ApplyUnitId); - this.txtApplyManName.Text = UserService.GetUserNameByUserId(getLimitedSpace.ApplyManId); + //this.txtApplyManName.Text = UserService.GetUserNameByUserId(getLimitedSpace.ApplyManId); this.txtWorkPalce.Text = getLimitedSpace.WorkPalce; + txtWorkAreaName.Text = UnitWorkService.GetUnitWorkName(getLimitedSpace.WorkAreaId); + txtFireWatchManName.Text = getLimitedSpace.FireWatchManName; + txtLimitedDescribe.Text = getLimitedSpace.LimitedDescribe; string name = getLimitedSpace.FireWatchManName; if (string.IsNullOrEmpty(getLimitedSpace.FireWatchManName)) { @@ -63,6 +66,27 @@ } } this.txtWorkMeasures.Text = getLimitedSpace.WorkMeasures; + if (getLimitedSpace.IsBoolOther == true) + { + txtIsBoolOther.Text = "是"; + } + else { + txtIsBoolOther.Text = "否"; + } + + if (getLimitedSpace.IsBoolHarmfulGas == true) + { + txtIsBoolHarmfulGas.Text = "是"; + } + else + { + txtIsBoolHarmfulGas.Text = "否"; + } + txtTestResult.Text = getLimitedSpace.TestResult; + txtTestDate.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getLimitedSpace.TestDate); + txtTestPerson.Text = getLimitedSpace.TestPerson; + txtVenStep.Text = getLimitedSpace.VenStep; + if (!string.IsNullOrEmpty(getLimitedSpace.CancelManId)) { this.txtCance.Text = UserService.GetUserNameByUserId(getLimitedSpace.CancelManId) + "；取消时间：" @@ -81,6 +105,8 @@ + string.Format("{0:yyyy-MM-dd HH:mm}", getLimitedSpace.CloseTime) + "。"; } } + + } } // 绑定表格 @@ -117,96 +143,96 @@ this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } - var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); - if (getF2 != null) - { - this.txtForm2.Title = getF2.AuditFlowName + "："; - if (getF2.OperaterTime.HasValue) - { - if (getF2.IsAgree == true) - { - this.txtOpinion2.Text = "同意。"; - } - else - { - this.txtOpinion2.Text = getF2.Opinion; - } - this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); - this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); - } - } - var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); - if (getF3 != null) - { - this.txtForm3.Title = getF3.AuditFlowName + "："; - if (getF3.OperaterTime.HasValue) - { - if (getF3.IsAgree == true) - { - this.txtOpinion3.Text = "同意。"; - } - else - { - this.txtOpinion3.Text = getF3.Opinion; - } - this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); - this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); - } - } - var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); - if (getF4 != null) - { - this.txtForm4.Title = getF4.AuditFlowName + "："; - if (getF4.OperaterTime.HasValue) - { - if (getF4.IsAgree == true) - { - this.txtOpinion4.Text = "同意。"; - } - else - { - this.txtOpinion4.Text = getF4.Opinion; - } - this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); - this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); - } - } - var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); - if (getF5 != null) - { - this.txtForm5.Title = getF5.AuditFlowName + "："; - if (getF5.OperaterTime.HasValue) - { - if (getF5.IsAgree == true) - { - this.txtOpinion5.Text = "同意。"; - } - else - { - this.txtOpinion5.Text = getF5.Opinion; - } - this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); - this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); - } - } - var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); - if (getF6 != null) - { - this.txtForm6.Title = getF6.AuditFlowName + "："; - if (getF6.OperaterTime.HasValue) - { - if (getF6.IsAgree == true) - { - this.txtOpinion6.Text = "同意。"; - } - else - { - this.txtOpinion6.Text = getF6.Opinion; - } - this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); - this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); - } - } + //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + //if (getF2 != null) + //{ + // this.txtForm2.Title = getF2.AuditFlowName + "："; + // if (getF2.OperaterTime.HasValue) + // { + // if (getF2.IsAgree == true) + // { + // this.txtOpinion2.Text = "同意。"; + // } + // else + // { + // this.txtOpinion2.Text = getF2.Opinion; + // } + // this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); + // this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + // } + //} + //var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + //if (getF3 != null) + //{ + // this.txtForm3.Title = getF3.AuditFlowName + "："; + // if (getF3.OperaterTime.HasValue) + // { + // if (getF3.IsAgree == true) + // { + // this.txtOpinion3.Text = "同意。"; + // } + // else + // { + // this.txtOpinion3.Text = getF3.Opinion; + // } + // this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); + // this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + // } + //} + //var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + //if (getF4 != null) + //{ + // this.txtForm4.Title = getF4.AuditFlowName + "："; + // if (getF4.OperaterTime.HasValue) + // { + // if (getF4.IsAgree == true) + // { + // this.txtOpinion4.Text = "同意。"; + // } + // else + // { + // this.txtOpinion4.Text = getF4.Opinion; + // } + // this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); + // this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + // } + //} + //var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); + //if (getF5 != null) + //{ + // this.txtForm5.Title = getF5.AuditFlowName + "："; + // if (getF5.OperaterTime.HasValue) + // { + // if (getF5.IsAgree == true) + // { + // this.txtOpinion5.Text = "同意。"; + // } + // else + // { + // this.txtOpinion5.Text = getF5.Opinion; + // } + // this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); + // this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); + // } + //} + //var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); + //if (getF6 != null) + //{ + // this.txtForm6.Title = getF6.AuditFlowName + "："; + // if (getF6.OperaterTime.HasValue) + // { + // if (getF6.IsAgree == true) + // { + // this.txtOpinion6.Text = "同意。"; + // } + // else + // { + // this.txtOpinion6.Text = getF6.Opinion; + // } + // this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); + // this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); + // } + //} } } #endregion @@ -216,7 +242,7 @@ /// private void BindGrid() { - string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '适用' ELSE '不适用' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '合格' ELSE '不合格' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + @" FROM License_LicenseItem AS L " + @" LEFT JOIN Sys_User AS U ON L.ConfirmManId =U.UserId" + @" WHERE L.DataId ='" + this.LimitedSpaceId +"'"; diff --git a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.designer.cs index c5cafc68..93c73713 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.License { - - - public partial class LimitedSpaceView { - +namespace FineUIPro.Web.HSSE.License +{ + + + public partial class LimitedSpaceView + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// lbLicenseCode 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbLicenseCode; - + /// /// txtApplyUnit 控件。 /// @@ -56,16 +58,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtApplyUnit; - + /// - /// txtApplyManName 控件。 + /// txtWorkAreaName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtApplyManName; - + protected global::FineUIPro.TextBox txtWorkAreaName; + /// /// txtWorkPalce 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkPalce; - + /// /// txtFireWatchManName 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtFireWatchManName; - + /// /// txtWorkMeasures 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkMeasures; - + /// /// txtWorkDate 控件。 /// @@ -101,7 +103,70 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkDate; - + + /// + /// txtLimitedDescribe 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtLimitedDescribe; + + /// + /// txtIsBoolOther 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtIsBoolOther; + + /// + /// txtIsBoolHarmfulGas 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtIsBoolHarmfulGas; + + /// + /// txtTestResult 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTestResult; + + /// + /// txtTestDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTestDate; + + /// + /// txtTestPerson 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTestPerson; + + /// + /// txtVenStep 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtVenStep; + /// /// Grid1 控件。 /// @@ -110,7 +175,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// txtForm1 控件。 /// @@ -119,7 +184,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form txtForm1; - + /// /// txtOpinion1 控件。 /// @@ -128,7 +193,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtOpinion1; - + /// /// Label6 控件。 /// @@ -137,7 +202,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label6; - + /// /// txtName1 控件。 /// @@ -146,7 +211,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtName1; - + /// /// txtTime1 控件。 /// @@ -155,232 +220,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtTime1; - - /// - /// txtForm2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm2; - - /// - /// txtOpinion2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion2; - - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label1; - - /// - /// txtName2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName2; - - /// - /// txtTime2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime2; - - /// - /// txtForm3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm3; - - /// - /// txtOpinion3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion3; - - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label2; - - /// - /// txtName3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName3; - - /// - /// txtTime3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime3; - - /// - /// txtForm4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm4; - - /// - /// txtOpinion4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion4; - - /// - /// Label5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label5; - - /// - /// txtName4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName4; - - /// - /// txtTime4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime4; - - /// - /// txtForm5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm5; - - /// - /// txtOpinion5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion5; - - /// - /// Label9 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label9; - - /// - /// txtName5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName5; - - /// - /// txtTime5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime5; - - /// - /// txtForm6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm6; - - /// - /// txtOpinion6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion6; - - /// - /// Label12 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label12; - - /// - /// txtName6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName6; - - /// - /// txtTime6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime6; - + /// /// txtCance 控件。 /// @@ -389,7 +229,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCance; - + /// /// txtClose 控件。 /// @@ -398,7 +238,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtClose; - + /// /// Toolbar1 控件。 /// @@ -407,7 +247,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// lbTemp 控件。 /// @@ -416,7 +256,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbTemp; - + /// /// btnAttachUrl 控件。 /// @@ -425,7 +265,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttachUrl; - + /// /// ToolbarFill1 控件。 /// @@ -434,7 +274,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnClose 控件。 /// @@ -443,7 +283,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx index 35b43d14..e35febcc 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx @@ -29,39 +29,40 @@ - - + + - + + + + + + + - + - - - - - - - + + <%-- - + --%> - @@ -73,10 +74,10 @@ HeaderText="检查单" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true"> + HeaderText="确认人" HeaderTextAlign="Center" TextAlign="Left" > + HeaderText="是否合格" HeaderTextAlign="Center" TextAlign="Left" > @@ -105,121 +106,10 @@ - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.cs index 0a79c868..7cdc55f1 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.cs @@ -46,7 +46,7 @@ { this.lbLicenseCode.Text = getOpenCircuit.LicenseCode; this.txtApplyUnit.Text = UnitService.GetUnitNameByUnitId(getOpenCircuit.ApplyUnitId); - this.txtApplyManName.Text = UserService.GetUserNameByUserId(getOpenCircuit.ApplyManId); + //this.txtApplyManName.Text = UserService.GetUserNameByUserId(getOpenCircuit.ApplyManId); this.txtWorkPalce.Text = getOpenCircuit.WorkPalce; if (getOpenCircuit.ValidityStartTime.HasValue) @@ -57,9 +57,9 @@ this.txtWorkDate.Text += getOpenCircuit.ValidityEndTime.Value.ToString("f"); } } - this.txtRoadName.Text = getOpenCircuit.RoadName; - this.txtSafeMeasures.Text = getOpenCircuit.SafeMeasures; - this.txtWorkMeasures.Text = getOpenCircuit.WorkMeasures; + //this.txtRoadName.Text = getOpenCircuit.RoadName; + //this.txtSafeMeasures.Text = getOpenCircuit.SafeMeasures; + //this.txtWorkMeasures.Text = getOpenCircuit.WorkMeasures; if (!string.IsNullOrEmpty(getOpenCircuit.CancelManId)) { this.txtCance.Text = UserService.GetUserNameByUserId(getOpenCircuit.CancelManId) + "；取消时间：" @@ -78,6 +78,11 @@ + string.Format("{0:yyyy-MM-dd HH:mm}", getOpenCircuit.CloseTime) + "。"; } } + txtWorkAreaName.Text = UnitWorkService.GetUnitWorkName(getOpenCircuit.WorkAreaId); + txtFireWatchManName.Text = getOpenCircuit.FireWatchManName; + txtReason.Text = getOpenCircuit.Reason; + + } } // 绑定表格 @@ -114,96 +119,96 @@ this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } - var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); - if (getF2 != null) - { - this.txtForm2.Title = getF2.AuditFlowName + "："; - if (getF2.OperaterTime.HasValue) - { - if (getF2.IsAgree == true) - { - this.txtOpinion2.Text = "同意。"; - } - else - { - this.txtOpinion2.Text = getF2.Opinion; - } - this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); - this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); - } - } - var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); - if (getF3 != null) - { - this.txtForm3.Title = getF3.AuditFlowName + "："; - if (getF3.OperaterTime.HasValue) - { - if (getF3.IsAgree == true) - { - this.txtOpinion3.Text = "同意。"; - } - else - { - this.txtOpinion3.Text = getF3.Opinion; - } - this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); - this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); - } - } - var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); - if (getF4 != null) - { - this.txtForm4.Title = getF4.AuditFlowName + "："; - if (getF4.OperaterTime.HasValue) - { - if (getF4.IsAgree == true) - { - this.txtOpinion4.Text = "同意。"; - } - else - { - this.txtOpinion4.Text = getF4.Opinion; - } - this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); - this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); - } - } - var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); - if (getF5 != null) - { - this.txtForm5.Title = getF5.AuditFlowName + "："; - if (getF5.OperaterTime.HasValue) - { - if (getF5.IsAgree == true) - { - this.txtOpinion5.Text = "同意。"; - } - else - { - this.txtOpinion5.Text = getF5.Opinion; - } - this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); - this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); - } - } - var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); - if (getF6 != null) - { - this.txtForm6.Title = getF6.AuditFlowName + "："; - if (getF6.OperaterTime.HasValue) - { - if (getF6.IsAgree == true) - { - this.txtOpinion6.Text = "同意。"; - } - else - { - this.txtOpinion6.Text = getF6.Opinion; - } - this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); - this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); - } - } + //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + //if (getF2 != null) + //{ + // this.txtForm2.Title = getF2.AuditFlowName + "："; + // if (getF2.OperaterTime.HasValue) + // { + // if (getF2.IsAgree == true) + // { + // this.txtOpinion2.Text = "同意。"; + // } + // else + // { + // this.txtOpinion2.Text = getF2.Opinion; + // } + // this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); + // this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + // } + //} + //var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + //if (getF3 != null) + //{ + // this.txtForm3.Title = getF3.AuditFlowName + "："; + // if (getF3.OperaterTime.HasValue) + // { + // if (getF3.IsAgree == true) + // { + // this.txtOpinion3.Text = "同意。"; + // } + // else + // { + // this.txtOpinion3.Text = getF3.Opinion; + // } + // this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); + // this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + // } + //} + //var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + //if (getF4 != null) + //{ + // this.txtForm4.Title = getF4.AuditFlowName + "："; + // if (getF4.OperaterTime.HasValue) + // { + // if (getF4.IsAgree == true) + // { + // this.txtOpinion4.Text = "同意。"; + // } + // else + // { + // this.txtOpinion4.Text = getF4.Opinion; + // } + // this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); + // this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + // } + //} + //var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); + //if (getF5 != null) + //{ + // this.txtForm5.Title = getF5.AuditFlowName + "："; + // if (getF5.OperaterTime.HasValue) + // { + // if (getF5.IsAgree == true) + // { + // this.txtOpinion5.Text = "同意。"; + // } + // else + // { + // this.txtOpinion5.Text = getF5.Opinion; + // } + // this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); + // this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); + // } + //} + //var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); + //if (getF6 != null) + //{ + // this.txtForm6.Title = getF6.AuditFlowName + "："; + // if (getF6.OperaterTime.HasValue) + // { + // if (getF6.IsAgree == true) + // { + // this.txtOpinion6.Text = "同意。"; + // } + // else + // { + // this.txtOpinion6.Text = getF6.Opinion; + // } + // this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); + // this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); + // } + //} } } #endregion @@ -213,7 +218,7 @@ /// private void BindGrid() { - string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '适用' ELSE '不适用' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '合格' ELSE '不合格' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + @" FROM License_LicenseItem AS L " + @" LEFT JOIN Sys_User AS U ON L.ConfirmManId =U.UserId" + @" WHERE L.DataId ='" + this.OpenCircuitId +"'"; diff --git a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.designer.cs index 49d422de..4b4810f0 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.License { - - - public partial class OpenCircuitView { - +namespace FineUIPro.Web.HSSE.License +{ + + + public partial class OpenCircuitView + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// lbLicenseCode 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbLicenseCode; - + /// /// txtApplyUnit 控件。 /// @@ -56,16 +58,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtApplyUnit; - + /// - /// txtApplyManName 控件。 + /// txtWorkAreaName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtApplyManName; - + protected global::FineUIPro.TextBox txtWorkAreaName; + /// /// txtWorkPalce 控件。 /// @@ -74,16 +76,25 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkPalce; - + /// - /// txtWorkMeasures 控件。 + /// txtFireWatchManName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtWorkMeasures; - + protected global::FineUIPro.TextBox txtFireWatchManName; + + /// + /// txtReason 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtReason; + /// /// txtWorkDate 控件。 /// @@ -92,25 +103,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkDate; - - /// - /// txtRoadName 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtRoadName; - - /// - /// txtSafeMeasures 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtSafeMeasures; - + /// /// Grid1 控件。 /// @@ -119,7 +112,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// txtForm1 控件。 /// @@ -128,7 +121,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form txtForm1; - + /// /// txtOpinion1 控件。 /// @@ -137,7 +130,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtOpinion1; - + /// /// Label6 控件。 /// @@ -146,7 +139,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label6; - + /// /// txtName1 控件。 /// @@ -155,7 +148,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtName1; - + /// /// txtTime1 控件。 /// @@ -164,232 +157,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtTime1; - - /// - /// txtForm2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm2; - - /// - /// txtOpinion2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion2; - - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label1; - - /// - /// txtName2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName2; - - /// - /// txtTime2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime2; - - /// - /// txtForm3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm3; - - /// - /// txtOpinion3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion3; - - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label2; - - /// - /// txtName3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName3; - - /// - /// txtTime3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime3; - - /// - /// txtForm4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm4; - - /// - /// txtOpinion4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion4; - - /// - /// Label5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label5; - - /// - /// txtName4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName4; - - /// - /// txtTime4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime4; - - /// - /// txtForm5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm5; - - /// - /// txtOpinion5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion5; - - /// - /// Label9 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label9; - - /// - /// txtName5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName5; - - /// - /// txtTime5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime5; - - /// - /// txtForm6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm6; - - /// - /// txtOpinion6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion6; - - /// - /// Label12 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label12; - - /// - /// txtName6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName6; - - /// - /// txtTime6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime6; - + /// /// txtCance 控件。 /// @@ -398,7 +166,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCance; - + /// /// txtClose 控件。 /// @@ -407,7 +175,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtClose; - + /// /// Toolbar1 控件。 /// @@ -416,7 +184,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// ToolbarFill1 控件。 /// @@ -425,7 +193,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnClose 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx b/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx index 9a0f1cb5..adbdf6ca 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx @@ -29,10 +29,19 @@ - + + + + + + + + + + @@ -41,35 +50,32 @@ + + + + + + + + + - - - - - - - + + <%-- - - + - + --%> + + - - - - - - - - - @@ -81,10 +87,10 @@ HeaderText="检查单" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true"> + HeaderText="确认人" HeaderTextAlign="Center" TextAlign="Left" > + HeaderText="是否合格" HeaderTextAlign="Center" TextAlign="Left" > @@ -113,121 +119,10 @@ - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.cs index 59ae18e7..23e26957 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.cs @@ -46,12 +46,13 @@ { this.lbLicenseCode.Text = getRadialWork.LicenseCode; this.txtApplyUnit.Text = UnitService.GetUnitNameByUnitId(getRadialWork.ApplyUnitId); - this.txtApplyManName.Text = UserService.GetUserNameByUserId(getRadialWork.ApplyManId); + //this.txtApplyManName.Text = UserService.GetUserNameByUserId(getRadialWork.ApplyManId); this.txtRadialType.Text = getRadialWork.RadialType; this.txtWorkLeader.Text = UserService.GetUserNameByUserId(getRadialWork.WorkLeaderId) + "/" + getRadialWork.WorkLeaderTel; this.txtWorkPalce.Text = getRadialWork.WorkPalce; this.txtFireWatchManName.Text = UserService.GetUserNameByUserId(getRadialWork.FireWatchManId); this.txtWatchManContact.Text = getRadialWork.WatchManContact; + txtWorkAreaName.Text = UnitWorkService.GetUnitWorkName(getRadialWork.WorkAreaId); if (getRadialWork.ValidityStartTime.HasValue) { this.txtWorkDate.Text = getRadialWork.ValidityStartTime.Value.ToString("f") + " 至 "; @@ -115,96 +116,96 @@ this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } - var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); - if (getF2 != null) - { - this.txtForm2.Title = getF2.AuditFlowName + "："; - if (getF2.OperaterTime.HasValue) - { - if (getF2.IsAgree == true) - { - this.txtOpinion2.Text = "同意。"; - } - else - { - this.txtOpinion2.Text = getF2.Opinion; - } - this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); - this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); - } - } - var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); - if (getF3 != null) - { - this.txtForm3.Title = getF3.AuditFlowName + "："; - if (getF3.OperaterTime.HasValue) - { - if (getF3.IsAgree == true) - { - this.txtOpinion3.Text = "同意。"; - } - else - { - this.txtOpinion3.Text = getF3.Opinion; - } - this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); - this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); - } - } - var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); - if (getF4 != null) - { - this.txtForm4.Title = getF4.AuditFlowName + "："; - if (getF4.OperaterTime.HasValue) - { - if (getF4.IsAgree == true) - { - this.txtOpinion4.Text = "同意。"; - } - else - { - this.txtOpinion4.Text = getF4.Opinion; - } - this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); - this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); - } - } - var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); - if (getF5 != null) - { - this.txtForm5.Title = getF5.AuditFlowName + "："; - if (getF5.OperaterTime.HasValue) - { - if (getF5.IsAgree == true) - { - this.txtOpinion5.Text = "同意。"; - } - else - { - this.txtOpinion5.Text = getF5.Opinion; - } - this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); - this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); - } - } - var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); - if (getF6 != null) - { - this.txtForm6.Title = getF6.AuditFlowName + "："; - if (getF6.OperaterTime.HasValue) - { - if (getF6.IsAgree == true) - { - this.txtOpinion6.Text = "同意。"; - } - else - { - this.txtOpinion6.Text = getF6.Opinion; - } - this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); - this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); - } - } + //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + //if (getF2 != null) + //{ + // this.txtForm2.Title = getF2.AuditFlowName + "："; + // if (getF2.OperaterTime.HasValue) + // { + // if (getF2.IsAgree == true) + // { + // this.txtOpinion2.Text = "同意。"; + // } + // else + // { + // this.txtOpinion2.Text = getF2.Opinion; + // } + // this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); + // this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + // } + //} + //var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + //if (getF3 != null) + //{ + // this.txtForm3.Title = getF3.AuditFlowName + "："; + // if (getF3.OperaterTime.HasValue) + // { + // if (getF3.IsAgree == true) + // { + // this.txtOpinion3.Text = "同意。"; + // } + // else + // { + // this.txtOpinion3.Text = getF3.Opinion; + // } + // this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); + // this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + // } + //} + //var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + //if (getF4 != null) + //{ + // this.txtForm4.Title = getF4.AuditFlowName + "："; + // if (getF4.OperaterTime.HasValue) + // { + // if (getF4.IsAgree == true) + // { + // this.txtOpinion4.Text = "同意。"; + // } + // else + // { + // this.txtOpinion4.Text = getF4.Opinion; + // } + // this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); + // this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + // } + //} + //var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); + //if (getF5 != null) + //{ + // this.txtForm5.Title = getF5.AuditFlowName + "："; + // if (getF5.OperaterTime.HasValue) + // { + // if (getF5.IsAgree == true) + // { + // this.txtOpinion5.Text = "同意。"; + // } + // else + // { + // this.txtOpinion5.Text = getF5.Opinion; + // } + // this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId); + // this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); + // } + //} + //var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); + //if (getF6 != null) + //{ + // this.txtForm6.Title = getF6.AuditFlowName + "："; + // if (getF6.OperaterTime.HasValue) + // { + // if (getF6.IsAgree == true) + // { + // this.txtOpinion6.Text = "同意。"; + // } + // else + // { + // this.txtOpinion6.Text = getF6.Opinion; + // } + // this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId); + // this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime); + // } + //} } } #endregion @@ -214,7 +215,7 @@ /// private void BindGrid() { - string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '适用' ELSE '不适用' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '合格' ELSE '不合格' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName" + @" FROM License_LicenseItem AS L " + @" LEFT JOIN Sys_User AS U ON L.ConfirmManId =U.UserId" + @" WHERE L.DataId ='" + this.RadialWorkId +"'"; diff --git a/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.designer.cs index 4901bbd7..bad502ca 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.License { - - - public partial class RadialWorkView { - +namespace FineUIPro.Web.HSSE.License +{ + + + public partial class RadialWorkView + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// lbLicenseCode 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbLicenseCode; - + /// /// txtApplyUnit 控件。 /// @@ -56,43 +58,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtApplyUnit; - + /// - /// txtApplyManName 控件。 + /// txtWorkAreaName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtApplyManName; - - /// - /// txtRadialType 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtRadialType; - - /// - /// txtWorkLeader 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtWorkLeader; - - /// - /// txtWorkDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtWorkDate; - + protected global::FineUIPro.TextBox txtWorkAreaName; + /// /// txtWorkPalce 控件。 /// @@ -101,16 +76,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkPalce; - - /// - /// txtWorkMeasures 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtWorkMeasures; - + /// /// txtFireWatchManName 控件。 /// @@ -119,7 +85,25 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtFireWatchManName; - + + /// + /// txtRadialType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRadialType; + + /// + /// txtWorkLeader 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkLeader; + /// /// txtWatchManContact 控件。 /// @@ -128,7 +112,25 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWatchManContact; - + + /// + /// txtWorkMeasures 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkMeasures; + + /// + /// txtWorkDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkDate; + /// /// Grid1 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// txtForm1 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form txtForm1; - + /// /// txtOpinion1 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtOpinion1; - + /// /// Label6 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label6; - + /// /// txtName1 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtName1; - + /// /// txtTime1 控件。 /// @@ -182,232 +184,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtTime1; - - /// - /// txtForm2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm2; - - /// - /// txtOpinion2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion2; - - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label1; - - /// - /// txtName2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName2; - - /// - /// txtTime2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime2; - - /// - /// txtForm3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm3; - - /// - /// txtOpinion3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion3; - - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label2; - - /// - /// txtName3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName3; - - /// - /// txtTime3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime3; - - /// - /// txtForm4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm4; - - /// - /// txtOpinion4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion4; - - /// - /// Label5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label5; - - /// - /// txtName4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName4; - - /// - /// txtTime4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime4; - - /// - /// txtForm5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm5; - - /// - /// txtOpinion5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion5; - - /// - /// Label9 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label9; - - /// - /// txtName5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName5; - - /// - /// txtTime5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime5; - - /// - /// txtForm6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm6; - - /// - /// txtOpinion6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion6; - - /// - /// Label12 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label12; - - /// - /// txtName6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName6; - - /// - /// txtTime6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime6; - + /// /// txtCance 控件。 /// @@ -416,7 +193,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCance; - + /// /// txtClose 控件。 /// @@ -425,7 +202,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtClose; - + /// /// Toolbar1 控件。 /// @@ -434,7 +211,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// lbTemp 控件。 /// @@ -443,7 +220,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbTemp; - + /// /// btnAttachUrl 控件。 /// @@ -452,7 +229,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttachUrl; - + /// /// ToolbarFill1 控件。 /// @@ -461,7 +238,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnClose 控件。 /// @@ -470,7 +247,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs b/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs index f6253ecf..f36217bc 100644 --- a/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs +++ b/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs @@ -498,5 +498,24 @@ namespace Model /// 起重工电话 /// public string QzgPhone { get; set; } + + /// + /// 司机姓名 + /// + public string SjName { get; set; } + + /// + /// 司机电话 + /// + public string SjPhone { get; set; } + + /// + /// 申请人签名 + /// + public string SignatureUrl + { + get; + set; + } } } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index dd087494..18e05fd5 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -206277,6 +206277,8 @@ namespace Model private string _FireWatchManName; + private string _SignatureUrl; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -206337,6 +206339,8 @@ namespace Model partial void OnReasonChanged(); partial void OnFireWatchManNameChanging(string value); partial void OnFireWatchManNameChanged(); + partial void OnSignatureUrlChanging(string value); + partial void OnSignatureUrlChanged(); #endregion public License_BreakGround() @@ -206829,6 +206833,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SignatureUrl", DbType="NVarChar(500)")] + public string SignatureUrl + { + get + { + return this._SignatureUrl; + } + set + { + if ((this._SignatureUrl != value)) + { + this.OnSignatureUrlChanging(value); + this.SendPropertyChanging(); + this._SignatureUrl = value; + this.SendPropertyChanged("SignatureUrl"); + this.OnSignatureUrlChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_BreakGround_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -207076,6 +207100,8 @@ namespace Model private string _WorkLeaderTel; + private string _SignatureUrl; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -207140,6 +207166,8 @@ namespace Model partial void OnWorkLeaderNameChanged(); partial void OnWorkLeaderTelChanging(string value); partial void OnWorkLeaderTelChanged(); + partial void OnSignatureUrlChanging(string value); + partial void OnSignatureUrlChanged(); #endregion public License_Electricity() @@ -207672,6 +207700,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SignatureUrl", DbType="NVarChar(500)")] + public string SignatureUrl + { + get + { + return this._SignatureUrl; + } + set + { + if ((this._SignatureUrl != value)) + { + this.OnSignatureUrlChanging(value); + this.SendPropertyChanging(); + this._SignatureUrl = value; + this.SendPropertyChanged("SignatureUrl"); + this.OnSignatureUrlChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_Electricity_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -208383,6 +208431,8 @@ namespace Model private string _FireLevel; + private string _SignatureUrl; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -208447,6 +208497,8 @@ namespace Model partial void OnReasonChanged(); partial void OnFireLevelChanging(string value); partial void OnFireLevelChanged(); + partial void OnSignatureUrlChanging(string value); + partial void OnSignatureUrlChanged(); #endregion public License_FireWork() @@ -208964,6 +209016,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SignatureUrl", DbType="NVarChar(500)")] + public string SignatureUrl + { + get + { + return this._SignatureUrl; + } + set + { + if ((this._SignatureUrl != value)) + { + this.OnSignatureUrlChanging(value); + this.SendPropertyChanging(); + this._SignatureUrl = value; + this.SendPropertyChanged("SignatureUrl"); + this.OnSignatureUrlChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_FireWork_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -209980,6 +210052,8 @@ namespace Model private string _WorkLeaderTel; + private string _SignatureUrl; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -210048,6 +210122,8 @@ namespace Model partial void OnWorkLeaderNameChanged(); partial void OnWorkLeaderTelChanging(string value); partial void OnWorkLeaderTelChanged(); + partial void OnSignatureUrlChanging(string value); + partial void OnSignatureUrlChanged(); #endregion public License_HeightWork() @@ -210620,6 +210696,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SignatureUrl", DbType="NVarChar(500)")] + public string SignatureUrl + { + get + { + return this._SignatureUrl; + } + set + { + if ((this._SignatureUrl != value)) + { + this.OnSignatureUrlChanging(value); + this.SendPropertyChanging(); + this._SignatureUrl = value; + this.SendPropertyChanged("SignatureUrl"); + this.OnSignatureUrlChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_HeightWork_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -212244,6 +212340,12 @@ namespace Model private string _QzgPhone; + private string _SjName; + + private string _SjPhone; + + private string _SignatureUrl; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -212314,6 +212416,12 @@ namespace Model partial void OnQzgNameChanged(); partial void OnQzgPhoneChanging(string value); partial void OnQzgPhoneChanged(); + partial void OnSjNameChanging(string value); + partial void OnSjNameChanged(); + partial void OnSjPhoneChanging(string value); + partial void OnSjPhoneChanged(); + partial void OnSignatureUrlChanging(string value); + partial void OnSignatureUrlChanged(); #endregion public License_LiftingWork() @@ -212906,6 +213014,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SjName", DbType="NVarChar(50)")] + public string SjName + { + get + { + return this._SjName; + } + set + { + if ((this._SjName != value)) + { + this.OnSjNameChanging(value); + this.SendPropertyChanging(); + this._SjName = value; + this.SendPropertyChanged("SjName"); + this.OnSjNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SjPhone", DbType="NVarChar(100)")] + public string SjPhone + { + get + { + return this._SjPhone; + } + set + { + if ((this._SjPhone != value)) + { + this.OnSjPhoneChanging(value); + this.SendPropertyChanging(); + this._SjPhone = value; + this.SendPropertyChanged("SjPhone"); + this.OnSjPhoneChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SignatureUrl", DbType="NVarChar(500)")] + public string SignatureUrl + { + get + { + return this._SignatureUrl; + } + set + { + if ((this._SignatureUrl != value)) + { + this.OnSignatureUrlChanging(value); + this.SendPropertyChanging(); + this._SignatureUrl = value; + this.SendPropertyChanged("SignatureUrl"); + this.OnSignatureUrlChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_LiftingWork_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -213161,6 +213329,8 @@ namespace Model private string _VenStep; + private string _SignatureUrl; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -213235,6 +213405,8 @@ namespace Model partial void OnTestPersonChanged(); partial void OnVenStepChanging(string value); partial void OnVenStepChanged(); + partial void OnSignatureUrlChanging(string value); + partial void OnSignatureUrlChanged(); #endregion public License_LimitedSpace() @@ -213852,6 +214024,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SignatureUrl", DbType="NVarChar(500)")] + public string SignatureUrl + { + get + { + return this._SignatureUrl; + } + set + { + if ((this._SignatureUrl != value)) + { + this.OnSignatureUrlChanging(value); + this.SendPropertyChanging(); + this._SignatureUrl = value; + this.SendPropertyChanged("SignatureUrl"); + this.OnSignatureUrlChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_LimitedSpace_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -214129,6 +214321,8 @@ namespace Model private string _OldLicenseId; + private string _SignatureUrl; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -214193,6 +214387,8 @@ namespace Model partial void OnNextManIdChanged(); partial void OnOldLicenseIdChanging(string value); partial void OnOldLicenseIdChanged(); + partial void OnSignatureUrlChanging(string value); + partial void OnSignatureUrlChanged(); #endregion public License_NightWork() @@ -214695,6 +214891,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SignatureUrl", DbType="NVarChar(500)")] + public string SignatureUrl + { + get + { + return this._SignatureUrl; + } + set + { + if ((this._SignatureUrl != value)) + { + this.OnSignatureUrlChanging(value); + this.SendPropertyChanging(); + this._SignatureUrl = value; + this.SendPropertyChanged("SignatureUrl"); + this.OnSignatureUrlChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_NightWork_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -215008,6 +215224,8 @@ namespace Model private string _FireWatchManName; + private string _SignatureUrl; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -215070,6 +215288,8 @@ namespace Model partial void OnReasonChanged(); partial void OnFireWatchManNameChanging(string value); partial void OnFireWatchManNameChanged(); + partial void OnSignatureUrlChanging(string value); + partial void OnSignatureUrlChanged(); #endregion public License_OpenCircuit() @@ -215582,6 +215802,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SignatureUrl", DbType="NVarChar(500)")] + public string SignatureUrl + { + get + { + return this._SignatureUrl; + } + set + { + if ((this._SignatureUrl != value)) + { + this.OnSignatureUrlChanging(value); + this.SendPropertyChanging(); + this._SignatureUrl = value; + this.SendPropertyChanged("SignatureUrl"); + this.OnSignatureUrlChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_OpenCircuit_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -215829,6 +216069,8 @@ namespace Model private string _WorkAreaId; + private string _SignatureUrl; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -215897,6 +216139,8 @@ namespace Model partial void OnOldLicenseIdChanged(); partial void OnWorkAreaIdChanging(string value); partial void OnWorkAreaIdChanged(); + partial void OnSignatureUrlChanging(string value); + partial void OnSignatureUrlChanged(); #endregion public License_RadialWork() @@ -216439,6 +216683,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SignatureUrl", DbType="NVarChar(500)")] + public string SignatureUrl + { + get + { + return this._SignatureUrl; + } + set + { + if ((this._SignatureUrl != value)) + { + this.OnSignatureUrlChanging(value); + this.SendPropertyChanging(); + this._SignatureUrl = value; + this.SendPropertyChanged("SignatureUrl"); + this.OnSignatureUrlChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_RadialWork_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { From b17e1900e27657a60c0ab1520a4c894bff0b14df Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 13 Sep 2023 14:52:39 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AE=B8=E5=8F=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2023-09-12.sql | 2 ++ SGGL/BLL/API/HSSE/APILicenseDataService.cs | 7 ++++-- SGGL/Model/APIItem/HSSE/FlowOperateItem.cs | 6 +++++ SGGL/Model/Model.cs | 24 +++++++++++++++++++ .../Controllers/HSSE/LicenseController.cs | 2 ++ 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-12.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-12.sql index ae05b46e..1b359d50 100644 --- a/DataBase/版本日志/SGGLDB_WH_2023-09-12.sql +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-12.sql @@ -32,3 +32,5 @@ ADD SignatureUrl nvarchar(500) null; ALTER TABLE License_NightWork ADD SignatureUrl nvarchar(500) null; +ALTER TABLE License_FlowOperate +ADD SignatureUrl nvarchar(500) null; \ No newline at end of file diff --git a/SGGL/BLL/API/HSSE/APILicenseDataService.cs b/SGGL/BLL/API/HSSE/APILicenseDataService.cs index 791344d5..f7d54dbc 100644 --- a/SGGL/BLL/API/HSSE/APILicenseDataService.cs +++ b/SGGL/BLL/API/HSSE/APILicenseDataService.cs @@ -1332,6 +1332,8 @@ namespace BLL IsAgree = x.IsAgree, Opinion = x.Opinion, IsFlowEnd = x.IsFlowEnd ?? false, + SignatureUrl = x.SignatureUrl, + AttachUrl = AttachFileService.getFileUrl(x.FlowOperateId) }).ToList(); return getInfoList; @@ -2333,7 +2335,7 @@ namespace BLL updateFlowOperate.IsAgree = newItem.IsAgree; updateFlowOperate.Opinion = newItem.Opinion; updateFlowOperate.IsClosed = true; - + updateFlowOperate.SignatureUrl = newItem.SignatureUrl; db.SubmitChanges(); /////增加一条审核明细记录 @@ -2777,7 +2779,8 @@ namespace BLL IsAgree = x.IsAgree, Opinion = x.Opinion, IsFlowEnd = x.IsFlowEnd ?? false, - SignatureUrl = db.Sys_User.First(y => y.UserId == x.OperaterId).SignatureUrl.Replace('\\', '/'), + SignatureUrl = x.SignatureUrl.Replace('\\', '/'), + AttachUrl = AttachFileService.getFileUrl(x.FlowOperateId) }; return getFlowOperate.FirstOrDefault(); } diff --git a/SGGL/Model/APIItem/HSSE/FlowOperateItem.cs b/SGGL/Model/APIItem/HSSE/FlowOperateItem.cs index a13643a9..87a80195 100644 --- a/SGGL/Model/APIItem/HSSE/FlowOperateItem.cs +++ b/SGGL/Model/APIItem/HSSE/FlowOperateItem.cs @@ -170,5 +170,11 @@ namespace Model get; set; } + + public string AttachUrl + { + get; + set; + } } } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 18e05fd5..ddb3e5f3 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -209297,6 +209297,8 @@ namespace Model private System.Nullable _OrderNum; + private string _SignatureUrl; + private EntityRef _Sys_User; private EntitySet _License_FlowOperateItem; @@ -209335,6 +209337,8 @@ namespace Model partial void OnGroupNumChanged(); partial void OnOrderNumChanging(System.Nullable value); partial void OnOrderNumChanged(); + partial void OnSignatureUrlChanging(string value); + partial void OnSignatureUrlChanged(); #endregion public License_FlowOperate() @@ -209648,6 +209652,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SignatureUrl", DbType="NVarChar(500)")] + public string SignatureUrl + { + get + { + return this._SignatureUrl; + } + set + { + if ((this._SignatureUrl != value)) + { + this.OnSignatureUrlChanging(value); + this.SendPropertyChanging(); + this._SignatureUrl = value; + this.SendPropertyChanged("SignatureUrl"); + this.OnSignatureUrlChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_FlowOperate_Sys_User", Storage="_Sys_User", ThisKey="OperaterId", OtherKey="UserId", IsForeignKey=true)] public Sys_User Sys_User { diff --git a/SGGL/WebAPI/Controllers/HSSE/LicenseController.cs b/SGGL/WebAPI/Controllers/HSSE/LicenseController.cs index 4f31fa11..2fad1d1d 100644 --- a/SGGL/WebAPI/Controllers/HSSE/LicenseController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/LicenseController.cs @@ -5,6 +5,7 @@ using System.Net; using System.Net.Http; using System.Web.Http; using BLL; +using Mvc.Controllers; namespace WebAPI.Controllers { @@ -191,6 +192,7 @@ namespace WebAPI.Controllers try { APILicenseDataService.SaveLicenseFlowOperate(flowOperateItem); + CheckListController.SaveAttachFile(flowOperateItem.FlowOperateId, BLL.Const.CheckListMenuId, flowOperateItem.AttachUrl); } catch (Exception ex) { From 7cca1b3cd34041302c4e1ec06c097f835a874463 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 13 Sep 2023 20:42:47 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2023-09-13.sql | 6 +++ SGGL/BLL/API/HSSE/APILicenseDataService.cs | 23 +++++++-- .../File/Word/HSSE/动火作业票.doc | Bin 46592 -> 31744 bytes .../HSSE/License/FireWork.aspx.cs | 24 +++++++++ .../HSSE/License/HeightWork.aspx.cs | 4 +- .../HSSE/License/LimitedSpaceView.aspx | 38 +++++++------- .../License/LimitedSpaceView.aspx.designer.cs | 18 +++---- SGGL/Model/Model.cs | 48 ++++++++++++++++++ 8 files changed, 128 insertions(+), 33 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-09-13.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-13.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-13.sql new file mode 100644 index 00000000..f89f55ae --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-13.sql @@ -0,0 +1,6 @@ +--߱ͼ໤ֶ + ALTER TABLE License_RadialWork +ADD WorkLeaderName nvarchar(50) null; + + ALTER TABLE License_RadialWork +ADD FireWatchManName nvarchar(50) null; \ No newline at end of file diff --git a/SGGL/BLL/API/HSSE/APILicenseDataService.cs b/SGGL/BLL/API/HSSE/APILicenseDataService.cs index f7d54dbc..431a9686 100644 --- a/SGGL/BLL/API/HSSE/APILicenseDataService.cs +++ b/SGGL/BLL/API/HSSE/APILicenseDataService.cs @@ -181,14 +181,18 @@ namespace BLL ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate), RadialType = x.RadialType, WorkLeaderId = x.WorkLeaderId, - WorkLeaderName = db.Sys_User.First(u => u.UserId == x.WorkLeaderId).UserName, + //负责人 + // WorkLeaderName = db.Sys_User.First(u => u.UserId == x.WorkLeaderId).UserName, + WorkLeaderName=x.WorkLeaderName, WorkLeaderTel = x.WorkLeaderTel, ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime), ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime), WorkPalce = x.WorkPalce, WorkMeasures = x.WorkMeasures, FireWatchManId = x.FireWatchManId, - FireWatchManName = db.Sys_User.First(u => u.UserId == x.FireWatchManId).UserName, + //监护人 + // FireWatchManName = db.Sys_User.First(u => u.UserId == x.FireWatchManId).UserName, + FireWatchManName=x.FireWatchManName, WatchManContact = x.WatchManContact, CancelManId = x.CancelManId, CancelManName = db.Sys_User.First(u => u.UserId == x.CancelManId).UserName, @@ -290,6 +294,7 @@ namespace BLL OldLicenseId = x.OldLicenseId, WorkAreaId = x.WorkAreaId, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), Reason = x.Reason, FireWatchManName = x.FireWatchManName, @@ -645,14 +650,16 @@ namespace BLL ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate), RadialType = x.RadialType, WorkLeaderId = x.WorkLeaderId, - WorkLeaderName = db.Sys_User.First(u => u.UserId == x.WorkLeaderId).UserName, + //WorkLeaderName = db.Sys_User.First(u => u.UserId == x.WorkLeaderId).UserName, + WorkLeaderName=x.WorkLeaderName, WorkLeaderTel = x.WorkLeaderTel, ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime), ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime), WorkPalce = x.WorkPalce, WorkMeasures = x.WorkMeasures, FireWatchManId = x.FireWatchManId, - FireWatchManName = db.Sys_User.First(u => u.UserId == x.FireWatchManId).UserName, + //FireWatchManName = db.Sys_User.First(u => u.UserId == x.FireWatchManId).UserName, + FireWatchManName=x.FireWatchManName, WatchManContact = x.WatchManContact, CancelManId = x.CancelManId, CancelManName = db.Sys_User.First(u => u.UserId == x.CancelManId).UserName, @@ -1578,7 +1585,8 @@ namespace BLL NextManId = newItem.NextManId, States = newItem.States, - LimitedDescribe=newItem.LimitedDescribe, + WorkAreaId=newItem.WorkAreaId, + LimitedDescribe =newItem.LimitedDescribe, IsBoolOther=newItem.IsBoolOther, IsBoolHarmfulGas=newItem.IsBoolHarmfulGas, TestResult=newItem.TestResult, @@ -1636,6 +1644,7 @@ namespace BLL updateLimitedSpace.NextManId = newLimitedSpace.NextManId; updateLimitedSpace.States = newLimitedSpace.States; + updateLimitedSpace.WorkAreaId = newLimitedSpace.WorkAreaId; updateLimitedSpace.LimitedDescribe = newLimitedSpace.LimitedDescribe; updateLimitedSpace.IsBoolOther = newLimitedSpace.IsBoolOther; updateLimitedSpace.IsBoolHarmfulGas = newLimitedSpace.IsBoolHarmfulGas; @@ -1662,12 +1671,14 @@ namespace BLL ApplyDate = Funs.GetNewDateTime(newItem.ApplyDate), RadialType = newItem.RadialType, WorkLeaderId = newItem.WorkLeaderId, + WorkLeaderName = newItem.WorkLeaderName, WorkLeaderTel = newItem.WorkLeaderTel, ValidityStartTime = Funs.GetNewDateTime(newItem.ValidityStartTime), ValidityEndTime = Funs.GetNewDateTime(newItem.ValidityEndTime), WorkPalce = newItem.WorkPalce, WorkMeasures = newItem.WorkMeasures, FireWatchManId = newItem.FireWatchManId, + FireWatchManName=newItem.FireWatchManName, WatchManContact = newItem.WatchManContact, CancelManId = newItem.CancelManId, CancelReasons = newItem.CancelReasons, @@ -1723,12 +1734,14 @@ namespace BLL { updateRadialWork.RadialType = newRadialWork.RadialType; updateRadialWork.WorkLeaderId = newRadialWork.WorkLeaderId; + updateRadialWork.WorkLeaderName = newRadialWork.WorkLeaderName; updateRadialWork.WorkLeaderTel = newRadialWork.WorkLeaderTel; updateRadialWork.ValidityStartTime = newRadialWork.ValidityStartTime; updateRadialWork.ValidityEndTime = newRadialWork.ValidityEndTime; updateRadialWork.WorkPalce = newRadialWork.WorkPalce; updateRadialWork.WorkMeasures = newRadialWork.WorkMeasures; updateRadialWork.FireWatchManId = newRadialWork.FireWatchManId; + updateRadialWork.FireWatchManName = newRadialWork.FireWatchManName; updateRadialWork.WatchManContact = newRadialWork.WatchManContact; updateRadialWork.NextManId = newRadialWork.NextManId; updateRadialWork.States = newRadialWork.States; diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc index 774bd6af91143e2569f1dbaee83da0d84c75d1be..d010ded167cc09b228f8f9ec3988901b85988c9e 100644 GIT binary patch literal 31744 zcmeI5349bqzQ_MPGdT$%Tmb{U!aUCo2K{i0-=S{r$Srq-U532__nFYChkov#YA> zUtLw*T~+<+EA0>8za!#9aZ{IzRch5B@i)0EFcVFMiCAEuy;fCK-BAQapE`$1;NQrr zU!4qX&=c#-0nh_M5C{fsKnQ3HLP0x#Dj@Aa2hb680-ZrP=mNTe3qSMU5^K1+JgV-vFJgfc7C|%S4YyQ~pMaQRa zD^^&OSlOWbBtzy)5q{IOv_~TsGm)ctnoF4!z+9{c_4pqx7KKqURTh@VKpq^AGP6*A zG7>4|XnB~Sl|a+-GZ5*Ug`~&Y@ISAsSL@Orubpe|X}M@PhI-$Ky7bvjH}?D)HZD_- zgV|u&Q6?-$wgvR(_0Malq3fUi#HY^P5~#%$6Rgz$2;8JtFAlG|_rwpW`C*UT9w>b- z-T5}#+dc4Ldr$xS093_x{IL#I0oJ2EfOY8*V14=ouujzg)~g=@uYvA}g!L;PI{TQB z(AmeNL1#ac4V`^WK6LgsCD6m5FNDrKR6u9H^Eh-vY573nbhjZ9_A`dJyP0V&mVC54 z#gZp>Db-93AH)1PPqj~l(qD36D?@9gAII~%QcBQ%6-c32SY%orSS|y!-by5ijuivG zer!mpqM4uB((&pU)w;R+w!au{q;Xx|g5W&<0{rnD*uP$b_;ZlT9OQZqT1>X!snBO? z?lWLBS{D6S9O6-VlRwk8y!qER@9y6%?01_W|GqywIudSvZf>u_?N&f}vYe9vR7D#8 zD6RfS!on;41uLKs;;=Jse!Axr~y5=vHI3|3t*+ zfbB}T4t}wSr>V*znW**CafUORdZ-pY6eY^?W|^=RY)mBm5omiSJ>*EFUIxxqq3vpN z|I0qhNN+r@)l$fDKK{#aB^9CUo06mMIDd2NZ^YY>&iYQ-HqH38E zScQ6dJ-bn#YE>m*kr1C$T9ri3#msCUH@hS|HNu&{sI7!AKbaAsww1W~C)Zw^aZPFf z?$&62(n(W*Fq~uj?h=|`E1zBRq;o>1?h}-kJmaFgw2k%QR;BNrtT+beEl7VcW6k9J z^oMhvo}v4$n|d-MK%UJ%l6Nii;)Pq+=1m`486a()mi5u|872lK%nzQcI64*18#j8% zGiw7TMlA`X%pLH3=uW*(W6o!U0f zIK~JWhmf5Lqoyj3g!y}yjb7sJA77X5`&q|s+q-OAPW1TTx!*a1ogu1Y{N814otv&( zzW9Z8ZJhCicRItThdRsCZ<@@!^~>FsW2BLQIMz&lzA|C{kty#j>$-gHCdEO0%=GaS zM=$B^eA2md-1c$IZ}j|qnQ8atr?c!V4&(Sl9Pd}0yODC)U6P;qZC1yb`{x$S3!nbN z?bR6!yRw`|*OzAi?kjm--<5q^{?g)qW^I{VJ~b#WcH_92<}d>hW}4lPz!tK zd$+Z9w#)vlGeJt1hNz*=*(K|X-@EOpMY?MYMyRDrja&`F(MC+#peMJY3$-6bccyt8g><*|(Yb2}Agq&}NJrl>v?B}}Q9V}E+aktwXr ztc8rf-L!pcSj*dr{b&BQREhyIn|`-$?dqGBFIiAJXLerBsUi!Q6Rk{3=`23owH!i6q;wapY`RNA;0kfK%Ox!9 zgWwbJDfk>51z&?2V8a7?e-H>lKqv?U$sh%c1!-U$$OM((7H}(A5AFaPz#i}ncorN0 z2f-n57<>di0iS~}!BKD_9?siAFYvFE-?-O?9sl!(ZTJ7TUL97gxM9)!xu_3#yWmz2 ztgySgd9$~Mu-@|4QtlGX@{Iz~pf?x?GC>xY1g3)P!BVgcRDhMB65Imr0r!Ciz=Pmn z@JDa}90Z5J|AAM*>)`L;UGP5m2z(Fz34R2%pb$?Ria`m0+>ig`iz6Str#A!7?|XXp z6Fb-rY+AEg6Z*X3+4;G8BVd$}jm?1Q|E_L^&6`g7lWu7#7F;vJh>DVfY^9($*%nv^ zy42M#clU&eXs@2;OIUDvpbqjgv5&2o(bg`fm11WUn<;AX&g0RQ^_ z+nS@Fe{!m~^%+`U2^exclkQp@@LC6bJjZ?<_Zee8j`wPrL+E9j`=vd7YQ0diJy>p_{={tlEtj-qO26d}{pZ3GMyl>YcXvRNf;|4XNnr~kD zX8IJ}PIu~lx>JwSozypRk~T@G_7lY#764tbSXT!_w^*%R{GnTI*1LnmMtP3}ypQ8O z+&J)!`NX`-|59@>-Hd^|UZ2lclf@_JpHa@L0-n?(;J$nf#Hw$%^*)r8^X%%K~ zXXVXZDqCyY;t&hl7SHWUg@?k{+Y87`Z!5Z0pE7o@H}_LtNj8`K{U~cbi{o=R;~8AC zIYsa7e{=Q!E;4Q9{lXoV;a#e_dA?4~rPfq)i}wGu7QO$k>ZJGo#WubF@9!rzK68B* z@VP6W1M(SQBm4iR%HJnvOh;|Wah`WMn_5=a7SU!r^ZgQX=W|~^^L3H`XXdKhsPVr~ z&aF<)-sMku8_)NHF?{DUe(&;s$6Og)u76*yO<3Dq2*jRHb8|QnMKjm%A zzxWhp&cX05f8Y4etpc1Qa`rBN%A50TjJYUVH@Sm z`9GZdW6b;UjsG-BYVQf%-v6Cv;{vg9p4SAxxn7*-#W`Ls*S~N4*PNGiE9)=BMtO5i z-;IFt`Z%Z0MgG3=-`U8&mC4y#e<3!?+nB$(6=u%i^e%tj_|L5}oFj7fE`Q3K^L356 zx-T|f{=V^_TV-f|t2ep*1b4UbALY&Y*_@kg%**zT|1?SdD#m}DhkqDwF1|4j-=+O; zzVV;yn@8XCzgF*E530Fx-_&?o`TVaw?HfO@NFR6N-Tm3j z|J&4FpAWRNo%kDTb+|?+1Z!=$M#os6)5z=J`y9Y#lD|)GkQe50*UPP`HQ!r!@#i`$ zuD{~CD`U+S*8~-VM#|sU{(ETSJUe-l!!PA7{**J&;HE?L{Uy)HIGip&b4;DV`azKEHBkKEEBnm4l60FKDUXJ6OhwJxP%h&?QhmO^3fl z=5LNz!CjZz)h*M!I#SwVuDoSX*gU&p>5B91fb+#XI*<;gYUkVm-z}(3J)tT}Z{!!< zE0n|EPm2w^Gf$3M!mRVyX<({cgp@ldSY;K+y@MH+DF-d!w-DMRWj?rbO*typUlApZ z)AmL6$0|~MaiQV7^wjdg{g;ir1T8o{FNLxtX{W>~g<3fNl~}BjzI@p zIg6!~*bTKKWa(Z~6HrQu3|F{Qw4rRW5IYjbXg>PR1moGNJ-zW4jX+%mL6V7-xV=%5g2%v$MP~(i zxgL^h;S zh4HZNgq3 zUN_khs}fk*m7De+N@tfWGV#mRdAkaC=h3V=$Sp8&+jWa(w~2MVkt;n6L+K$!R%rQV zNmgKU?wXy<6}=M%7)%~q$VQ`N(qh~8`}5{>C(St7reZOD07dv|-FBiIq*2z7)xIyu4} zJscBjC)ZA?wW)!~%Mf+4`k{KH$vFrNxXJj%ypR#);ZtepzBxkGCE`LZ;hCM8Q$bMKx^{SGO5~}12>kcXH z{3rRU_;Gol-xG2mYM0#A=P7wP;VH3a?2(TzJRm7uUXbU)56Ozbugfv(8}h}Fx20gh z7ZTd#E4UpMmin@*kICb}8B-&>LXXQMBY%{~LR8r{MU~@0d)uw*xSx%Tu{n7r&D<~@ z?QhL+TExG`j(-J>G=M9Q^T6Mg4@l@UL_1&nW|{}XS5Sb&0=_kNg%rk z{Se5romgueu%p?miH5F7P>s>_!g@+sBv?C+b%1;6GkkC89qQb*Q4%@{BMW=c)wf6D ztT0ztS)o)l9^u1>~HTxlgp+!L~9;P(8n&qmn7H> z8$LmG-;J1!?;uQrKVu8S7X}LO?SmQc*lKcF|`_`gbU1 zC0@fm3H8RX(aTm6}GPgL`{I$V6Y^R3yJB~yPa_dqrKvUKWw zx%a8rHx6=7#n%lAG}-ejN->ZIUHBaf%8@$j+nH2f1Yq;zQ|Dg^a4gFGo;V&|Yd*c@ zX3P0%Mw{<({~a_&t!fvVfDLn$`kAN^qHIt-zbn$;3-MxAyH#sicU|kDYuY{#O5HvX zDLutPxf}a@-DVbZrP=Z;GNaJ+Dj{=QR~={>`NzmbRX6sxR~@{vXH{Up#q00$>jga$ z`XyD^bg3%C+O_JiH8#y6G3y5^>T7rq;8W*O3Fzav80wcupVJ#Cwe=zJYkWAC=I+Q3Rg%xWfZ0uSF zTOr2l9Jk|<67B)8Cm-krdIH`*3;^7P={kT83L`j?o4`u24Lk^*2M56i;4nB2PJl4n zEwl%{K_74hNCIgf9pr#qz+2Ke;0EvzI1G+~PPh*m1g-%K!2RG+@CNuE3_`n*0}8?I z;Ll(W*aw~mRES2qH=>n&6UUx>oDu+d-^BCA9SH4OE(dA|TDKsHoU6v0{y4EHMOY z>^*j3C-xRK8XHlJ(Io8uox5DvU0p<@zP$JEz_-)S%$zg*&YgSeWR)9Vt+%+z)Km*5 zV#RWOCQ))1z#PomO&IF|Gr1MZ<#KZF2EeFQ|3w^lxN;xUVftdm3cKzhAuwLNSFl6^Z`R*egvDDRC;iIk-{WyeEr=xBs{wOP+j1To*&?cr^}P#J(>?~1w;N_COy5Yew3wr?`k zQ6nb(#D5z#V7>cmZvI zc7Q+76$k?2fkYq)7z(5VQ-Cjk*}!~YJFpYj4eSN>1BZayz+K=T@GI~TCeNJ;rMI zZe|vfFk~VN^R3PjYz1%=n^skIGg1%HqIIZh2vbD}7rn9GzO_NBHj(Pez*~~}o8(=j zJb2w#wp@A-i*gjL`JZqAt7wr8s~Q<25HK?vL5KdBZ?P~N79F{~@n)`;mU^qX3KWsT zYy>4?CF!1GV*?{8EDBYFFPCs`9MdT<7o&`Cf?h!g6VI0C zNE%h~s&P%qBqqA0sqqHMBs5MnC8?pjv!(EqETTrPq6|{dWr(X4(85ek=~q-Y{T+d; zy9#RjE<#5^KNbbFu|iuCrKt6~Q|;HC>b&mcTp(cr9T4RV2BJ6?MoA~+-LK4@G1ca8sC`xmRPzi91MsLTbGIe?1DRf6$RDj?zYn5n!| z3)D*Z{bqP1;qu!f6TfM#ts+{8NxCHIkF>*6k?~*sSqMD`QIWrj zMRR4~d%W`d8*cpHi5*&P3;#qdy!_FDiAmn-&%9JbuGyke8F=}ZuXFOBiYcd7{{IsB z(=$$bzN!37Q$^&Or+g|t<;z{``|&tXehV+ZKW1Y788$t?ZVt2n{-g81UZ{-P-r*DV z4opmPw+3v027m{^*Mn9tdjahLA0Pzi1M~yJfkUFl*a~b1b^><+!%9dW_#ChU?16DW29OOb0+s;FfP=sp-~wIlv!KkD>l}{Ksw5$buiva_Q2!{BwuT?K`)9)7netU_Q4gXVa$T zo6gZ$4p7l{wfyDl>x=!RQcl#H~;%XEB}Ab`tMEsw~EL$TU06oFaPp& zPX33{U2EGv81*T3c;43jX}qR!T6v6C5xL4NU$dorxodqt9tX;oaQXc)6Z3O2em+KX zFPd}Fd`t5>K&9zd&_Wz2Kd)TxFc%X!ZSMeHeTv?JN%(m+&7t`@Ge2L>#XMQ)iIa;! zZJhQKN{bqZ?6cRn-SQ z6@uL`g{(jL2`^eol;7f5rT2e}g5KNU-(0BXXW@4zw9;_BJ|FY_49#yb{F74fWuP}r zPL7tOeE1T4jC`w?n51z!O_D%UvkUdTFt`uaS8p^v9N-vHqIeM^|_0cXG!@B%`B zNPxzKTp$lP0vrQQ09Sx(zzx8r1>PY7WPlUk3}gTkf!V-ZU_Ouy>;*0WH-KBfZQ%2k z*w+E<0cXG!a0fhqR)81K251MoDth$G)w5@dP831?^2?z^MMY;h>)!1}8^2v~wupSb zEm|~p+SwB)P5@^olnBVMI`@u^Se4!MY zw^3-`tl04x7T~Mc<-v~6kcOV6=7VO{6lT@k9}PP`iX2|>HBd^Ew^5qBS&=5cTSR+T z1KQehahj0))MZ98BH8eAAvqBLRYvPiHNvYT`nI;jjsId}?f5TeO!0=tTgHC_zFkp! z(tPIoZG8W?_?KT=u6C@@)()C(mc0KX8%dcTA;cKPNwhy{)p!4hUS_Pa|TcOoaXd2%H!9EYatSou|L#RA<`l1eW z0{nrlKrqk)2m$&4{Q$ZXXohmRFjkhSv1LZa#wc4ptd9z5l^iIiSpl;EVZg!YNaGq0 z7^ZS1udONGRvS!pAphO!z<-(i4QbBg1Msr~2K1NE|& z>DU1E^BAj<7br5%yCE{nT0<>HtNv#=kgqbp3FhLiu{0)*5!6d#0u$YOX#(LSgL-K~ zQ4LAGG?93bzDIB+Mz3W5A&*}&HrP? zS@9<62$iMdVew%lVpkv%2nDKg@vulNDCZ^8#h*Nr@07jrszkAnYIvS0)$n*R)o^>A z56e$QR*QwuQN#00p`(V!i=m^2+v~hj4W|RW+Twih{zoevepP^BO|F1qeW0yu+RCPw z@Nt))@Ryn>josR|!?zf1+tCiAN^OOzgYtzz+O|_NvXr%xH<|t?$DQ(K$n&bu6m(S4A=H+*n!T1fI?aXtRg+UrO%lQX1MS$i2yLTK)(WYcyXgUaYh?{2|xOzE+6^ zuWjc}s8CiudN$Cmwd%iw1D2BNtSS?*p@PcT{uXh6v?WfblI8$P*`xx%4QC^;|nUa}zQ`fgvAdGsP7)%rBCVh4H|Bv>>68Soz4w-|Ohj2Mi z0dN0j&V7->2itoB9UB=N3^EGF0qD}P6lnrYweJcM7-()c?IW%X2uMb^Vk~4MlK+lZs zy#u>YST7da>Y02abUu_!B4+XZEwW-Vo5$dsGUIMsExi}D^jSD}L8_3;vy=^#7RmQ9 zDPFQuq%V_**o~+fU1Kt-bo44AZjoknF)luZZm4I%m0TtfvefzdLvY(O&ec}Ob=AVA zCP`9(u)PiQhYc$}39jVD?YidRMO794_5m-#;PyEyc6cfm2tG$Dl}o7Va8#wNd+!D# z=)*e{m%{oYhXQ;}!52BGs+0qZu{fW`s;K24%!Yc<^3%2A(ygMDuEp5b)9uQND+`zt zE{7&gC}b{XLs=Ya!d&2Djnu22JT%rD zORqD=v23=Hc?;r7X(kF$^TsrfncAH(H|7y+%HHFeT}aCmA1qR?$;4^@jv}!sY7fc8 zirv3fc@HfvHki;K^ex%$tX;tUSMH`|h2#Zj;hGOwR7Qa>U)l=uR6vXJjSS z&B{6R%3XNeC9OgF-|5ErsR38aA55O*{_|1qpYDjZbK6< zTW|cvyB zVAU^s!6#QpliGOSq^P)L2YdR>n0a!*0h!^XClhv!KRqho%mMTIX$~v1yd74I!iQN)FueZh1WBW}4@oG2@O-$XQii zulLZzi7Q52-rRSm|LGOY^Brrg^w}btQ?+vD#V$L$=6Xe*K5BBtx9w%;aGNo!W)1H9 zQ{DMXYTj_|boRMf*Pq<_<<4AvRKD?m?8K5T`^J1{cc-m5-fecL*xTV>t#bcGu|Gc`}Z#8Cp@x|deo3{5J_~iEsp%+j0_F3ZlmA_9%OAFgk_q`h$ zIiEV!qG-&TsovSeRTf|U@^RYAZhy5l`09ddyYF8tTyXuz6ZzAAkH0d~Jm865a_b%; z&!+xluzS+aEox=CuYUPr`=c(oe=f{HywNF@0(dg z>tFoz&GqXet~tVc+W2CgIi=vq!YgEEp+s z>vuTxFaKATZN2tS&+dDwW%04Q)2nZCtiC*H@;a-Z3R(tkTeG*{rnQ5fE}K`g@tk8T zj|G3-SF}3h;O4d8`hN4p{j==clLLN%_FI1Zb-)VeA1sy?t?(YQ@lr^mUPHa*mxRB3 zyW!R5LW|kIIyAm<`H^Jk>HP!!r#Lv=IR5s9T$tu#;&rXQZGT~KrEeyrg&7rpbN!3r9MKe4nNvpf#!_puxu$ix z6gBM-nZL)V*CtTlmr;VyO*57ig)iU#jjg0?pT(j4`UHZ$9jQu9!^2`@agDh$k7W{F_ z`ilO`9#tnDY8DnL7*caZ>Y>Gbwyub)8UJ|3&wB?gn%VhEXvU0?Ewya7EWcv$nSc1? zj#2dvn&pe8gijXMj<~;OL|n%Dh#{5r*8jD=zx2T9>C3LS_P??y?E1-;f1=XRIEWDVj2G;-4+{1#dl>D|xYOfA;LB;(#HCu2ebR zdw$QCmlvF}+MnBX;}7+|IT%0q)`=Of-1EAQ(2bZf<1~wSa&48dBz10&7AHGgH~wmE zTtxTqtL@Tq*FG?>^zi=0{_Fi7n}n^5)76dBUwZXu$jt@I+`UFFxa*m@{r9L!upHaLDdUEr5 z((w*+l(R$VzYI_8;dZ(?MA^D2{1 zTBP4?xAf^4w^w`92fuoh+}?Qi(!qzny|A`hjoK-5&wue~+i(4A#*bbdD{CRGTioev zo1gz+-nDw#_2^zN|Gdx7@+a-HqfS0MFWne-WvfNxNOM`PWWoK@$NsDt`ShaBA&b;& zvn-$8^IjTrf5FKt|4Xx~O&OBW;`b_rsr^q)Y+HZTOwYk-lKB~h0h^o3`rQ=H*fj0% zg1@F6$*Zbo?yglc*ZkUQsD8D?{yFm&Z?C>&#)?o^pP3$0+orBtkQO{Pa(5rw z=m&|N>IbH*%&vPq>Q|S`t?F+4QP1|`)GXPwi#7$dZPspVd&g$f>PmjeS*MzfaIh<= zW0%|L`9}Z7d2B$>pc{W~(Y=0V;OK2)YpM9~VA;aTL5t4#pIrXU_?Io}?K-g_Sh6?W z^LTpmGY_UbIP+-D)s<_~X882BnU=D#L(Iv0f-V__jfZA09`L-mv%STG=go7>Jnt9` zs@%2Fs(@X^_Ga^@yBx{?Nn){Z&bUL@2IqgbZjM#dE88_Mz1^KA&I}N4t9P!ueH+ox zzt7BTKI(=;V9%=dk<}*4Qn%WB#JXf=9=x)`X6?%XfA%zwSvN5AZg9wiafSQ7=sjt} z)30WYUv|0mp#xTrJ2rWEXv))+;ri8Ed|Um;9lic~+OPi6Lne>?+}(d4o^s-ewa@yb z&8us>OND*vmo>+Li+ZqRednB?iPz0&fB1b9q3liKD>lg`bi^gI!`)&5S+I-};i z+`BdVan0HTwnkpk8!>i3-q(TO#%HHapMBs=?uac}PZtF^KU)&pt@?SFtKCj)kPQ?i z@7@{mrCX2u5JQ*zhlR2CmpE*Du(6k$+h>uX!rDt-o;;m;^0bNJfNhRbv%`1xnAk0U zN$#ax5nJ{(S-p5w2lH-woC2Hu^8LE@?)m#}t@LPlBtN>bol$i1%HKDQPL1DP(0`Y= zt!3x=Nr!_B>i7T2dU`C_xkynf?mB)C1Q9zCn0ZRZ9yU2W|h z=O-C|=KJNMQ&WOorsuk^m>GQAdd1hRkL)<*^CETBvfma8M*d*4E8Jwnc~*0-f3|$% z-|iNZqaEs+g%$_2PQExn$9DOl6F2HDT-!-}toQcq2d|@GilPgIjWH3{G~q=sCH02s zuYX5X0_rosve+{4Q)xb^9#MTpRTi-(rkYAKE5$5JiT&!7)TcLPlnUNNiJR=G(@?Jj zWi*O#%aC$z%Bd3m9d$6vqVL-2uuzo#i2>P~x5VU1niiFm9GejDY3*n)vzA81M!S5~UyzpX?FlX&sZ2 zlIY>!kQ{;OXIQd*LSj@r{Q4&(4GK$vH7VL5GAV2b2oH*LaFWSf9R`KP##>9nqa8i1 z<5C>0r71&UiW~@2c(fC_IguMokpp20i-^Et2O&xfybJslE~R0b@GedGFwVS-Gw2x~Lr~ycU`T#8g=_@z%r4#zv1%2^=ZoQ|Q&*}DS zx&fJP!KIr}={8Kd5s_}iqnpvpLAwP&x1`Wb8FX6$y)jR3P1BoG^!5zBK|!bJDQz4e z=hmEv$`FiOJyHH?n*r~g(A&7&=XL2V_w`-fNfV}syg$Xc^R{Kc_htTWu= zOMUcNcf?9!1DQYE<2Y(2xIrNnZc*?H1Cx}qe z$X6;yDH$B-#^o{zU)7Va4lq+HDX^9KIH~wJDfu)}@oA#ukkStA|i za_DG|NBZ-v;wFras&DR zeF40=1qm`X9>@Sz0$&4rfW5$J;0#a*{011HBd7#e0(AigfMz*ffH%+?@B>1Ci2(I3 zKLXDHdJ19((36mKU^=h?_z5sahwKG(1QLNcz(QadumK8~_>$9D)BunUD;qTr`H$ zxJ~T4bTY)1tNeXU??yS$OLkLwZLxRAaDvO0B!=efQP_i;0f>? zpy3$X@2m=71K0yDKx=@W8g~Nxf!;t}A@T!^1ttJ@fk(hRRH$rV1+WtM8dwdi0lop& z0l5IxLmkw%PXS%jbY-BJ-26rgU4XI(fggY)KnBV%2^ft0QCX-QlvjL@SPdeMCefmL zN^&7tgaHvi8bGp`2#_pR10;+60LkJUK(crS5buqUHu2sHAl^Fx#QU}Y@to%W`+<`H z@xC!YZNED}GME8S``-vq`>zR5+oy6+`=_!j2mUj15pi->mI0YbQ9UQjR>~)zSK_+} zy;B)eXO$ZRR(% ztQcKEK&Q`|wrI?ThBRYz4MGdnk_~Cqh8?l@WpqWt@kD=iy;=afEDmHtLox1JbZ4%^ zda!Y^Jz1`9FJ|Ww!NSBbY<&M@me?tc{b)TDw;7CLtNha0SI%Quj9mt!>m2CgsdfA^ znU2{kMi(*ARS5gK&S8D*7qVac7P3j+OIV|nrL4)|<*Zpm4l5qBiuro3Wots#vUb*a z?3PO&yDwVLlB;iE58^j5`pza@;kmHU4)&wV4kiuU$>;?;-x`P6ezPNtt^$1`I?L`i zyU1dD+~=O5jrDlQX4ZSc=p~L#fS+R_``-9B_D!3=7+nCmGL%|=S=}Hrsu`2FGE5h6 zwTEgDDVoLdW?mQ4Qh`&DC@rtd1sIQ^pkr}FQ(Ypa%S~wqVsK4hL-0$kTrdg(r3ghj z4NN6V10^#JOzkbRKuRc-h;+nwnMEwOXE%BeWqYZ^B*i5Jou4KpGbyIYQAkh9x+2{{ z+~AIe1v)~egZE+tx)PxdktSuL(74}p`VGXicn}Lm%sAMZ*mJ2@l8A+*G^XAf9dRsD zqBt#$vjh`GLV<*d1f=!|*|Jw7Pr6gLP6`VOPVX>c&uHq}dg+)6?;dBfp_&EsAXY<6j$0cY3oC zYy~*-Ju{cqmg>n2WQHsj2pIJ8(S*F#>K$$QIh%I~~$4)k=F>1<+) z*tqnnYB{Dsf$&e1qAMo~dL73PR#5tjo*lkf>9wL>oaqHo?m}!E5y_hkYK%Ey= zbXqdMuB;SINX5ehof2Pj6az60#=KgF+3th(r`+ffGpQ>8R`*wqM`8VF=QYkgG9hIU z7gkezH!OdM7W!A#IW{6GAvvLcinL4r{;?5J((VaKk#KJXFv}~3v?AloyR)mck17yw z=J1{8%%ckg#5*bn>D29#P8~AoTBYTHmIGQ2XgQ$efR+PV4rn=`<$#t0S`KJApyj}a z;6Qonf8qK3^NZ|jnS419>wmkKxiTcU4xqI-R+fZK37>Z(7IG`j_aDPU(?On`ERDC4S>blglxCy+yOcf>H*Mc-R1yZ z+QC6390>zj0j&Wqz#C`-5Y2Yb+XFs82f!ET2y_C--w%2hz#j+zx&nbf5J3Ka1Kmr^ zWGDPv6&=V+z>bZSwZ);D6dWQOhMZSinK2y!UpCs8k?2!xVr(z>tNIDi8%Do9r}GXy z;g_!P2hZt!i?9;gyK6YRQkp*HqaqYOL!cnqh=Ov2)WUFhE)IwO-bWcDecGF%HdE2` zX&>z-RcYuzmWs~2S@mPSpWb4 diff --git a/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx.cs index 0164a33a..c0a67319 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx.cs @@ -667,6 +667,30 @@ namespace FineUIPro.Web.HSSE.License } } + var item13 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 13); + if (item13 != null) + { + if (item13.IsUsed == true) + { + Bookmark bookmarkUser13 = doc.Range.Bookmarks["User13"];//确认执行 + if (bookmarkUser13 != null) + { + bookmarkUser13.Text = "√"; + } + } + else + { + Bookmark bookmarkIsFit13 = doc.Range.Bookmarks["IsFit13"]; + if (bookmarkIsFit13 != null) + { + if (item13 != null) + { + bookmarkIsFit13.Text = "×"; + } + } + } + } + } //审核记录 diff --git a/SGGL/FineUIPro.Web/HSSE/License/HeightWork.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/HeightWork.aspx.cs index 959c7cb3..4bafa43b 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HeightWork.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/HeightWork.aspx.cs @@ -345,7 +345,7 @@ namespace FineUIPro.Web.HSSE.License Bookmark bookmarkWorkType = doc.Range.Bookmarks["WorkType"];//作业类别 if (bookmarkWorkType != null) { - if (getHeightWork != null) + if (getHeightWork.WorkType != null) { bookmarkWorkType.Text = getHeightWork.WorkType; @@ -380,7 +380,7 @@ namespace FineUIPro.Web.HSSE.License Bookmark bookmarkEquipmentTools = doc.Range.Bookmarks["EquipmentTools"];//设备及工具 if (bookmarkEquipmentTools != null) { - if (getHeightWork != null) + if (getHeightWork.EquipmentTools != null) { bookmarkEquipmentTools.Text = getHeightWork.EquipmentTools; diff --git a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx index 4f956f95..00ecf1a3 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx @@ -21,72 +21,76 @@ - + - + - + - + - + - + - + - + - - - + - + + - + - + - + - + + + + + + + - protected global::FineUIPro.TextBox txtIsBoolOther; - /// - /// txtIsBoolHarmfulGas 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtIsBoolHarmfulGas; - /// /// txtTestResult 控件。 /// @@ -167,6 +158,15 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.TextBox txtVenStep; + /// + /// txtIsBoolHarmfulGas 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtIsBoolHarmfulGas; + /// /// Grid1 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index ddb3e5f3..a3d83c74 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -216095,6 +216095,10 @@ namespace Model private string _SignatureUrl; + private string _WorkLeaderName; + + private string _FireWatchManName; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -216165,6 +216169,10 @@ namespace Model partial void OnWorkAreaIdChanged(); partial void OnSignatureUrlChanging(string value); partial void OnSignatureUrlChanged(); + partial void OnWorkLeaderNameChanging(string value); + partial void OnWorkLeaderNameChanged(); + partial void OnFireWatchManNameChanging(string value); + partial void OnFireWatchManNameChanged(); #endregion public License_RadialWork() @@ -216727,6 +216735,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLeaderName", DbType="NVarChar(50)")] + public string WorkLeaderName + { + get + { + return this._WorkLeaderName; + } + set + { + if ((this._WorkLeaderName != value)) + { + this.OnWorkLeaderNameChanging(value); + this.SendPropertyChanging(); + this._WorkLeaderName = value; + this.SendPropertyChanged("WorkLeaderName"); + this.OnWorkLeaderNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FireWatchManName", DbType="NVarChar(50)")] + public string FireWatchManName + { + get + { + return this._FireWatchManName; + } + set + { + if ((this._FireWatchManName != value)) + { + this.OnFireWatchManNameChanging(value); + this.SendPropertyChanging(); + this._FireWatchManName = value; + this.SendPropertyChanged("FireWatchManName"); + this.OnFireWatchManNameChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_RadialWork_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { From ba8a84b2e07c883da4511bac429f86054d50a937 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 14 Sep 2023 20:11:35 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2023-09-14.sql | 357 ++++++++++++++++++ SGGL/BLL/HSSE/Manager/HSSELogService.cs | 93 ++++- .../File/Word/HSSE/临时用电作业票.doc | Bin 0 -> 29184 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 1 + .../HSSE/License/Electricity.aspx.cs | 6 +- SGGL/Model/APIItem/HSSE/HSSELogItem.cs | 47 +++ SGGL/Model/Model.csproj | 1 + .../Controllers/HSSE/HSSELogController.cs | 118 ++++++ SGGL/WebAPI/WebAPI.csproj | 1 + 9 files changed, 620 insertions(+), 4 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-09-14.sql create mode 100644 SGGL/FineUIPro.Web/File/Word/HSSE/临时用电作业票.doc create mode 100644 SGGL/Model/APIItem/HSSE/HSSELogItem.cs create mode 100644 SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-14.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-14.sql new file mode 100644 index 00000000..dd9d259d --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-14.sql @@ -0,0 +1,357 @@ + +--ȡǰ˴ +ALTER PROCEDURE [dbo].[Sp_APP_GetToDoItems] + @projectId NVARCHAR(50)=NULL, + @userId NVARCHAR(200)=NULL +AS +/*ȡǰ˴*/ +BEGIN +SELECT HazardRegisterId AS DataId + ,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId + ,'ȫѲ' AS MenuName + ,register.RegisterDef AS Content + ,UserId + ,users.UserName + ,register.RegisterDate AS DataTime + ,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr + ,'/pagesHSSE/safe/inspecitonconfirm' AS UrlStr +FROM HSSE_Hazard_HazardRegister AS register +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE register.ProjectId=@projectId AND +((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') )) +OR (register.states = '2' AND register.CheckManId =@userId)) + +UNION ALL +SELECT PlanId AS DataId + ,'B782A26B-D85C-4F84-8B45-F7AA47B3159E' AS MenuId + ,'ѵƻ' AS MenuName + ,PlanName AS Content + ,UserId + ,users.UserName + ,DesignerDate AS DataTime + ,CONVERT(varchar(100),DesignerDate, 23) AS DataTimeStr + ,'/pagesTest/test/trainindex' AS UrlStr +FROM Training_Plan AS ePlan +LEFT JOIN Sys_User AS users ON ePlan.DesignerId= users.UserId +WHERE (ePlan.ProjectId=@projectId or (@projectId is null and ePlan.ProjectId is null)) + AND (States = '0' OR States = '1' ) AND ePlan.DesignerId =@userId + +UNION ALL +SELECT TestPlanId AS DataId + ,'FAF7F4A4-A4BC-4D94-9E88-0CF5A380DB34' AS MenuId + ,'Լƻ' AS MenuName + ,PlanName AS Content + ,UserId + ,users.UserName + ,PlanDate AS DataTime + ,CONVERT(varchar(100),PlanDate, 23) AS DataTimeStr + ,'/pagesTest/test/testplan' AS UrlStr +FROM Training_TestPlan AS TPlan +LEFT JOIN Sys_User AS users ON users.UserId =TPlan.PlanManId +WHERE (TPlan.ProjectId=@projectId or (@projectId is null and TPlan.ProjectId is null)) + AND (States = '0' OR States = '1' ) AND PlanManId =@userId + +UNION ALL +SELECT TaskId AS DataId + ,'E108F75D-89D0-4DCA-8356-A156C328805C' AS MenuId + ,'ѵ' AS MenuName + ,Plans.PlanName AS Content + ,users.UserId + ,users.UserName + ,TaskDate AS DataTime + ,CONVERT(varchar(100),TaskDate, 23) AS DataTimeStr + ,('/pagesTest/test/taskindex') AS UrlStr +FROM Training_Task AS Task + LEFT JOIN Sys_User AS users ON users.UserId =@userId + LEFT JOIN Training_Plan AS Plans ON Plans.PlanId =Task.PlanId +WHERE (Task.ProjectId=@projectId or (@projectId is null and Task.ProjectId is null)) + AND (Task.States IS NULL OR Task.States != 2) + AND Task.UserId = @userId + +UNION ALL +SELECT TestRecordId AS DataId + ,'0EEB138D-84F9-4686-8CBB-CAEAA6CF1B2A' AS MenuId + ,'ɨ뿼' AS MenuName + ,TestPlan.PlanName AS Content + ,TestRecord.TestManId + ,Person.PersonName + ,TestPlan.TestStartTime AS DataTime + ,CONVERT(varchar(100),TestPlan.TestStartTime, 23) AS DataTimeStr + ,('/pages/temp_index/index') AS UrlStr +FROM Training_TestRecord AS TestRecord +left join Training_TestPlan as TestPlan on TestRecord.TestPlanId = TestPlan.TestPlanId +left join SitePerson_Person as Person on Person.PersonId = TestRecord.TestManId +left join Sys_User as uses on Person.IdentityCard = uses.IdentityCard +WHERE (TestRecord.ProjectId=@projectId or (@projectId is null and TestRecord.ProjectId is null)) +AND TestPlan.States ='1' +AND TestRecord.TestEndTime IS NULL +AND (TestRecord.TestManId = @userId or uses.UserId = @userId) + +UNION ALL +SELECT FireWorkId AS DataId + ,'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' AS MenuId + ,'ҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/dhuo/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_FireWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT HeightWorkId AS DataId + ,'DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9' AS MenuId + ,'ߴҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/gchu/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_HeightWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT LimitedSpaceId AS DataId + ,'AEC9166D-1C91-45F0-8BFE-D3D0479A28C7' AS MenuId + ,'޿ռ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/sxkj/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_LimitedSpace AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT RadialWorkId AS DataId + ,'F72FF20B-D3EB-46A5-97F7-C99B2473A140' AS MenuId + ,'ҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/sx/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_RadialWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT OpenCircuitId AS DataId + ,'4E607E83-41FC-4F49-B26F-A21CFE38328F' AS MenuId + ,'·(ռ)' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/dlu/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_OpenCircuit AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT BreakGroundId AS DataId + ,'755C6AC9-2E38-4D4F-AF33-33CB1744A907' AS MenuId + ,'ҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/dtu/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_BreakGround AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT NightWorkId AS DataId + ,'7BBAE649-7B00-4475-A911-BFE3A37AC55B' AS MenuId + ,'ҹʩ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/yjsg/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_NightWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT LiftingWorkId AS DataId + ,'A1BE3AB6-9D4A-41E7-8870-E73423165451' AS MenuId + ,'װҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/dzhuang/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_LiftingWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT RectifyNoticesId AS DataId + ,'0038D764-D628-46F0-94FF-D0A22C3C45A3' AS MenuId + ,'' AS MenuName + ,(CASE WHEN Rectify.States =1 THEN 'ǩ' + WHEN Rectify.States =2 THEN 'ģ' + WHEN Rectify.States =3 THEN 'ˣ' + WHEN Rectify.States =4 THEN '飺' + WHEN Rectify.States =5 THEN 'ɣ' + ELSE 'ύ' END + RectifyNoticesCode) AS Content + ,users.UserId + ,users.UserName + ,CheckedDate AS DataTime + ,CONVERT(varchar(100),CheckedDate, 23) AS DataTimeStr + ,(CASE WHEN ISNULL(Rectify.States,0) =0 THEN '/pagesHSSE/rn/rn_add' --ύ + WHEN Rectify.States =1 THEN '/pagesHSSE/rn/rn_approval' --ǩ + WHEN Rectify.States =2 THEN '/pagesHSSE/rn/rn_rectify' -- + WHEN Rectify.States =3 THEN '/pagesHSSE/rn/rn_rectifycf' -- + WHEN Rectify.States =4 THEN '/pagesHSSE/rn/rn_confirm' -- + ELSE '/pagesHSSE/rn/rn_add' END) AS UrlStr +FROM Check_RectifyNotices AS Rectify + LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Rectify.Projectid=@projectId AND Rectify.States <> 5 + AND ((ISNULL(Rectify.States,0) =0 AND Rectify.CompleteManId LIKE '%'+ @userId+'%') + OR (Rectify.States =1 AND Rectify.SignPerson LIKE '%'+ @userId+'%') + OR (Rectify.States =2 AND Rectify.DutyPersonId LIKE '%'+ @userId+'%') + OR (Rectify.States =3 AND Rectify.UnitHeadManId LIKE '%'+ @userId+'%') + OR (Rectify.States =4 AND Rectify.CheckPerson LIKE '%'+ @userId+'%') + OR (Rectify.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND (ProfessionalEngineerTime1 IS NULL OR ProfessionalEngineerTime2 IS NULL)) + OR (Rectify.ConstructionManagerId LIKE '%'+ @userId+'%' AND (ConstructionManagerTime1 IS NULL OR ConstructionManagerTime2 IS NULL)) + OR (Rectify.ProjectManagerId LIKE '%'+ @userId+'%' AND (ProjectManagerTime1 IS NULL OR ProjectManagerTime2 IS NULL))) + +UNION ALL +SELECT PersonId AS DataId + ,'EE260447-028F-46AF-8864-9A5DC9DAA5BD' AS MenuId + ,'ֳԱ' AS MenuName + ,Person.PersonName AS Content + ,users.UserId + ,users.UserName + ,Person.InTime AS DataTime + ,CONVERT(varchar(100),Person.InTime, 23) AS DataTimeStr + ,('/pagesHSSE/info/peopledetail') AS UrlStr +FROM SitePerson_Person AS Person + LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Person.ProjectId=@projectId AND (Person.IsUsed IS NULL OR Person.IsUsed= 0) + AND Person.AuditorId = @userId AND Person.AuditorDate IS NULL + + +UNION ALL +SELECT PauseNoticeId AS DataId + ,'C81DB7ED-165E-4C69-86B0-A3AAE37059FE' AS MenuId + ,'ͣ' AS MenuName + ,(CASE WHEN PauseNotice.PauseStates =1 THEN 'ǩ' + WHEN PauseNotice.PauseStates =2 THEN '׼' + WHEN PauseNotice.PauseStates =3 THEN 'գ' + ELSE 'ύ' END + PauseNoticeCode) AS Content + ,users.UserId + ,users.UserName + ,PauseTime AS DataTime + ,CONVERT(varchar(100),PauseTime, 23) AS DataTimeStr + ,(CASE WHEN ISNULL(PauseNotice.PauseStates,0) =0 THEN '/pagesHSSE/info/stop_add ' --ύ + WHEN PauseNotice.PauseStates =1 AND PauseNotice.SignManId=@userId THEN '/pagesHSSE/info/stop_approval' --ǩ + WHEN PauseNotice.PauseStates =2 AND PauseNotice.ApproveManId=@userId THEN '/pagesHSSE/info/stop_confirm' --׼ + WHEN PauseNotice.PauseStates =3 AND PauseNotice.DutyPersonId=@userId THEN '/pagesHSSE/info/stop_feedback' -- + ELSE '/pagesHSSE/info/stop_detail' END) AS UrlStr +FROM Check_PauseNotice AS PauseNotice + LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE PauseNotice.ProjectId=@projectId AND PauseNotice.PauseStates <> 4 + AND ((ISNULL(PauseNotice.PauseStates,0) =0 AND PauseNotice.CompileManId LIKE '%'+ @userId+'%') + OR (PauseNotice.PauseStates =1 AND PauseNotice.SignManId LIKE '%'+ @userId+'%') + OR (PauseNotice.PauseStates =2 AND PauseNotice.ApproveManId LIKE '%'+ @userId+'%') + OR (PauseNotice.PauseStates =3 AND PauseNotice.DutyPersonId LIKE '%'+ @userId+'%') + OR (PauseNotice.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND ProfessionalEngineerTime IS NULL) + OR (PauseNotice.ConstructionManagerId LIKE '%'+ @userId+'%' AND ConstructionManagerTime IS NULL) + OR (PauseNotice.UnitHeadManId LIKE '%'+ @userId+'%' AND UnitHeadManTime IS NULL) + OR (PauseNotice.SupervisorManId LIKE '%'+ @userId+'%' AND SupervisorManTime IS NULL) + OR (PauseNotice.OwnerId LIKE '%'+ @userId+'%' AND OwnerTime IS NULL)) +UNION ALL +SELECT PunishNoticeId AS DataId + ,'755F1C1D-2178-47D8-9F82-A501B53A2436' AS MenuId + ,'' AS MenuName + ,(CASE WHEN PunishNotice.PunishStates =1 THEN 'ǩ' + WHEN PunishNotice.PunishStates =2 THEN '׼' + WHEN PunishNotice.PunishStates =3 THEN 'ִ' + ELSE 'ύ' END + PunishNoticeCode) AS Content + ,users.UserId + ,users.UserName + ,PunishNoticeDate AS DataTime + ,CONVERT(varchar(100),PunishNoticeDate, 23) AS DataTimeStr + ,(CASE WHEN ISNULL(PunishNotice.PunishStates,0) =0 THEN '/pagesTest/punish/add' --ύ + WHEN PunishNotice.PunishStates =1 AND PunishNotice.SignMan=@userId THEN '/pagesTest/punish/approval' --ǩ + WHEN PunishNotice.PunishStates =2 AND PunishNotice.ApproveMan=@userId THEN '/pagesTest/punish/rectify' --׼ + WHEN PunishNotice.PunishStates =3 AND PunishNotice.DutyPersonId=@userId THEN '/pagesTest/punish/rectifycf' --ִ + ELSE '/pagesTest/punish/detail' END) AS UrlStr +FROM Check_PunishNotice AS PunishNotice + LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE PunishNotice.ProjectId=@projectId AND PunishNotice.PunishStates <> 4 + AND ((ISNULL(PunishNotice.PunishStates,0) =0 AND PunishNotice.CompileMan LIKE '%'+ @userId+'%') + OR (PunishNotice.PunishStates =1 AND PunishNotice.SignMan LIKE '%'+ @userId+'%') + OR (PunishNotice.PunishStates =2 AND PunishNotice.ApproveMan LIKE '%'+ @userId+'%') + OR (PunishNotice.PunishStates =3 AND PunishNotice.DutyPersonId LIKE '%'+ @userId+'%') + OR (PunishNotice.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND ProfessionalEngineerTime IS NULL) + OR (PunishNotice.ConstructionManagerId LIKE '%'+ @userId+'%' AND ConstructionManagerTime IS NULL) + OR (PunishNotice.UnitHeadManId LIKE '%'+ @userId+'%' AND UnitHeadManTime IS NULL)) +UNION ALL +SELECT ElectricityId AS DataId + ,'48F64E0F-38B2-4BDC-9B61-6200BD02CBF5' AS MenuId + ,'ʱõ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/ldian/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_Electricity AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +ORDER BY DataTime DESC +END + + + + + + +GO + + diff --git a/SGGL/BLL/HSSE/Manager/HSSELogService.cs b/SGGL/BLL/HSSE/Manager/HSSELogService.cs index 6b39376a..4c1d448e 100644 --- a/SGGL/BLL/HSSE/Manager/HSSELogService.cs +++ b/SGGL/BLL/HSSE/Manager/HSSELogService.cs @@ -102,7 +102,7 @@ namespace BLL { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - Model.Manager_HSSELog newHSSELog =db.Manager_HSSELog.FirstOrDefault(e => e.HSSELogId == updateHSSELog.HSSELogId); + Model.Manager_HSSELog newHSSELog = db.Manager_HSSELog.FirstOrDefault(e => e.HSSELogId == updateHSSELog.HSSELogId); if (newHSSELog != null) { newHSSELog.CompileDate = updateHSSELog.CompileDate; @@ -980,5 +980,96 @@ namespace BLL } } #endregion + + #region 小程序接口 + /// + /// 返回列表 + /// + /// + /// + /// + public static List getHSSELogDataList(string projectId, string userId) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + List getInfoList = new List(); + getInfoList = (from x in db.Manager_HSSELog + join y in db.Sys_User on x.CompileMan equals y.UserId + join z in db.Sys_Const on x.Weather equals z.ConstValue + orderby x.CompileDate + where x.IsVisible != false && z.GroupId == BLL.ConstValue.Group_Weather && x.ProjectId == projectId + select new Model.HSSELogItem + { + HSSELogId = x.HSSELogId, + ProjectId = x.ProjectId, + CompileDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.CompileDate), + CompileMan = x.CompileMan, + Weather = x.Weather, + IsVisible = x.IsVisible, + CompileManName = y.UserName, + WeatherName = z.ConstText + }).ToList(); + Model.Project_ProjectUser projectUser = BLL.ProjectUserService.GetProjectUserByUserIdProjectId(projectId, userId); + if (projectUser != null) + { + if (projectUser.RoleId.Contains(BLL.Const.HSSEEngineer)) //项目安全工程师只能看到自己的日志内容 + { + getInfoList = getInfoList.Where(x => x.CompileMan == userId).ToList(); + } + } + return getInfoList; + } + } + + public static Model.HSSELogItem getHSSELogData(string HSSELogId) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + Model.HSSELogItem model = new Model.HSSELogItem(); + model = (from x in db.Manager_HSSELog + join y in db.Sys_User on x.CompileMan equals y.UserId + join z in db.Sys_Const on x.Weather equals z.ConstValue + orderby x.CompileDate + where x.IsVisible != false && z.GroupId == BLL.ConstValue.Group_Weather && x.HSSELogId == HSSELogId + select new Model.HSSELogItem + { + HSSELogId = x.HSSELogId, + ProjectId = x.ProjectId, + CompileDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.CompileDate), + CompileMan = x.CompileMan, + Weather = x.Weather, + IsVisible = x.IsVisible, + CompileManName = y.UserName, + WeatherName = z.ConstText, + + + Num11=x.Num11, + Contents12=x.Contents12, + Contents13=x.Contents13, + Contents21=x.Contents21, + Num21=x.Num21, + Contents22=x.Contents22, + Num22=x.Num22, + Contents23=x.Contents23, + Num23=x.Num23, + Contents24=x.Contents24, + Num24=x.Num24, + Contents210=x.Contents210, + Num210=x.Num210, + Num211=x.Num211, + Contents31=x.Contents31, + Num31=x.Num31, + Contents32=x.Contents32, + Num32=x.Num32, + Contents41=x.Contents41, + Contents42=x.Contents42 + }).FirstOrDefault(); + + return model; + } + } + + + #endregion } } diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/临时用电作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/临时用电作业票.doc new file mode 100644 index 0000000000000000000000000000000000000000..10c82e65a4017e553a689a8bf477d93c6e2fb468 GIT binary patch literal 29184 zcmeI53tUxIzQ_OjoWtRuynG=cH9FmC*!TC}n+I`HbAu6f#qj}Cy8tsIt3Vm~0XKoMU>t}54j_U^5Cx(^42T7s_wmg-jD4z| z5=f@i_$z}fW>FFJ5?Y6n>$nO+jZvfLzQF3ky#moI@-NL+H03uir+CZ@XFd|luvT$p zgYu#jDyKsH<;ZEzMJ`q#MR9`E$1PPX!o@a$ze&Z>3zv_cx7-(SNO^0y1%t$$8*%iIqnzqIh5;Cr|Qq*Ee#PCF%_w_Jg=mQxqh`)Q50{6_HXT;&VV+kr+*)zywG=1}DvR~6&^cn1R8vDhJ%P>{Rz;JK~rB#68VidaW zmvK=gYB=}o9aR%B1cf8;dl(8`xNsYE9u5D1{P0ut-=qN|h7*jM^wWALW8QlfV5UB>R5wnHA7A=2un*Eqgm%Okb0Cq-NxLTk31u%y(_xHod@C zVppI1*mCQp;(G_Adb^I-_)2`o2a4ZBI$J8($0wgtO<%lcJ;&LaYBW;amihbY*z(g$ zgyqL--pS2MX!VWJ_;TKB9uh>>=Od=M>&G|`I`=2nC3DQ9%8#WcKITf&-&1V!^-3N% z*P(VF=ie)KIFD|0B!}4rG1Q)l^@?$LG7YmI&O5z?%Zy81y}Q=DI1tx@`(w+WU%wTp zoJ~2l&6@md-htvR6_b`en|JnJy1g{1HS~B*=mqx|;r;_w$CmTGyV86m4*UH2R+mS1 zJ)Ft5y5y{c*z#$Ge$E>g|ErUqK@0IL>MLpe&*y#rpyIErVU*G^Y0^?9#&J&LINOhr zebxAUrHUkNikzblN$b*@2Q`locs^*o`?!|7f9HO`#ZN95(~r~?ZL+0KcD06?fG`zF zcV*H;o44gv&q~@-q1JY#EpfeMiEw*jpM%atsR231wsGt8BYO}0>&jet)1;+dDcybV zU76!niLm6<+z)bwI8QI>Uunzk4%u~O{#*0RweG}5Ygu>X*xpTbm&^RU3TqkHn6A%v zSC+FKISp}6a&}KnyS99}R2x#N3qvH%wKtU}ef^-)JMsE^pSlW40ILiZU<3Xj5Cnl> zFa|^b2Z#d`K|GiaW&e1i5wEx#n|N9e<{c_ii+U?a_sy3`GD=u*5F3rNr0PoeKgq(RpE}L%Q#Q)z? z_n$E@l;k@OrC8f$a<^Zr^A`%|_*hCo(Hx7d43OS`a~prUj?29s{04juPJuJvOYjx= z1}wr$x(tv7mV#v<7gT_?pb~5ZRp3tWB6t}b1V_Lt;6H!~FWfA^3i<(G;15I)1!6!P zm+8frzqqgFp1U@!UsJkzc}w#g+FUE#Z}4*0mY$wI-N0o% z8H~g#&lnH^L=XiWAP!6f$siS^feerZvOxt{3o5}zumkJ_yTIq*+poVo^Pg`WKln@? zn(~ICRmskIv!_p;OiDZISZlg@2HIT0Jb@DDnJ5W*v$W^WF_F8(Z=WMr)KVYD;SFj= zM{7)POj}>7?Ue!zWf`3UW3jp$0oH;_PzxRaJHSrxDL4sYFfoV&i69xIf;8|b*bN>B zUxKfI2`}$0zzS?28Ki;z055_jV8WY>e*EqS3|%fMWhAW%*?nZqe4T$sCpm$@G+0UC9f`8RWG+w)7S+WD z7q5n33-aNKK@B1@D6v;Z^&t*n@Ogx{HH46`L;8_-^t4gJ&K*)n1HVs|hACR8qJ=4% z^Z}9-D7L|i1hdO-R6=;9(-o=KE||jwvax)5F0anxc@Dooo1JM|3-7LNQKMT-I)hPO zI_pl)_bh2;k!6QeX+0cJHrTVwbfwTqiz09IvBWzQS{T;Q#woO|Q&?Lkxqeuh>&F=@ z>WN@7&+vh6GMitrKsQ^=)&0rB^3DeQ+{Vvr1>iev=5_Lq)B4=3wRkpT(yz4WmbMHR zx7OW5<@{RjmGiu2IoG$y*{JQ2h2>oY_!<4@V7*q5C0ff0t))krjqcJzox7`N^(`Wq zxNq^?uT*&`Y^A?|yp+CTSVN03wAC2aYLxo}lUsjq=QU(znQsTYF2idwd%-h6R}WTe zbFf@%N!MEDYb`&?Y$VAJxbv{q(%Tq?r`{xgPbJw^^7mp{^BNGZ|EOy}#^e7aZC*Oi z{~MJ*wqALXkxq6!a$NYiY2%QL5YO#YTQ;3FckB3n-lUBG-w#yA|Bsu;g~z?f!fSp1 z4S2ne*ZO#!&v^XT&Hp+e|0`0?Rh<>CCj4cRvr#)Fi@L6x4Y~8$F0bqAKgtAn0X!l2kqT{t+jlnwRE8U_qsm3 zN_&HyH1`sjYx`ufu)O)5jrzXk5X`#vZ!G^0I$1t_!GBT-7`0&|cdeW?Vf1~nh2_of z==lAd`fjdo{wE7cUe#+|t&`V(+MEAX{RHt|roMwL{4Ul8_ihl} zya#rGzWLv!h@5(f%(Z2=wwrFQ?#0> zd{@Y3)Iyv`rEFcgHJtp8+sHH_u*5Eyf^okCu{|Ao=s*(4#uoJ)xQ(HvgmaQ0j6r?_ zIMXCrz2w;Jl%6>fTP$qywH!8^h9l*H0=7!pa4?1(mQ(gwLv$lfyvhmZiMu}Kk-1iE z0!&0!unokDeUmtGv;Dk`kn_Ul&!~CvS<^Nz1@v(Ieu@?f2qy}6VXE)0g|&)>+*pM%PX?*+2(xeN-1_cri14!qBu_d4@FW;}z)=go1w#fT}N zHOFCjFC_1W<2_NlFNXI<@cVIoN6PQX_+1IFm-Ct_ubc7O2|qvcGZfFGc`n8CCf@VT zd)m3B_<|syoTbyf=ce+$ZCN!R#DlCWhmDQ1)Czawpd>4q1y)B*wEKTIoQUHAj+Hv} z&s~3XBhjr0jZNSttJ%wf?Sd95f=*_xmA~SVLrVh1qryq4IM}QZ$3~Ts9nCP0)bKgY4JX!|WsNqCLtUZJ%g2k8oTk zh$hi2`iT8SKQTZYAPy0Sir0#crio2cn&O*gHf1zrHDxyml1cKCyd@vWSMrxaq+!x< z=@uzo%955y+0seg7}{kj98D_|8@-;OCz11Dd#K$e_7iwq|=?wfz5lj*9-J3GF7?Dx65usj!3TTvgyZvDl+yMe;LdfN^L84js&tu!{Bd-~_Mv|C>WTqW zj{)G+Z9z0*T@dY>5=L)MzJb0SH;%q3yqWxObx=;JgD&{Qk!|S&x^68F7ML@U=H7Y> z4H!9#-nXVu)W8gSDt`%mpPx%*AuH*8@M@}Gw}w8ASWD@_>uA#TTj&qtw$eJsR@$0! zH-$N?NvN!$^Vi-_*ZVv`IYE!m#KK2t%7Q)gSjCexZOAjUC+=AqKJFD7G5;9u;W%x~ zf1MsIe}neTew!Y>=6#wL`ab>7q>t$HHGiagrhGz?mQ!R;J40c&pCNO>8S)?cR|?Jk zhPVVPCO6UtmUHx!^Bnn>en+3t_hjF2VNP~sVG@@~bAN?Vm-`j@Xt2iVY$0o-9lrv4 zX%-YWM73qIS+z$~|3Iw}OB=amE-mwN!28u|RpK(aNm801SJlK?U|im;>W zYa9h#AfHCH`-HVcnW&$99m|os2o666`oLy)`S4-%^=cN5Vi+EP#98Q5&0HxYX&l1$ z$DBerrLzbfW*$zQ<1-@j5Na+u%zT_0>4FQNKxd_kV(9jve1=@nx{T!+2+ z+_|bgKF#L`-+}9M;LoRkwz|!Ptr+pR5JQ^mzY=M3%T$l$Ym)`ljLh7H9k=~pD2w_w9Y45;}fIviP8AP>U?4~J`SCaL*p}E z=QCd86Q}cu)A&r#`Ak5GC!m~G%B9YyO-G_s*oDvQCGBBWBck35F zM)CK^{lA9;I=-(|Sx4j!P5xG-bNjzX2P*qPr{cj%{XUbw%iIU}yG-?)Ox-%L@%o?f z9`G)gf1lj=JD#b5M)kV0?qucX6#nLxzqeJtwdHR?`Prp|@;{+%+^=daee1v4(tx?M z^6BpI7ziO}es1LFRO9~M?KXOi)u{aX`VplcArs4;zw_obiU+iEy<2O!I?RT(r2yq~ zMSeF-CYHPUeZNlrwO5DCFM5~!ymeFkC;WMVEr$+UvSi`Gg+dO?5hjn;(E>%E z+O`>7146(q@NZxrcp4l6yp;Dg_!jX0jG7Bpg9pJ=-~{*^;C7J!lEG78AJ`8*0uu1T z`cXgN4_F~Oc`XWF@)9AhE%Cy*H{i!Qyk= + diff --git a/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs index 0d69be05..a6cb41e6 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs @@ -289,7 +289,7 @@ namespace FineUIPro.Web.HSSE.License string uploadfilepath = string.Empty; string newUrl = string.Empty; string filePath = string.Empty; - initTemplatePath = "File\\Word\\HSSE\\动土作业票.doc"; + initTemplatePath = "File\\Word\\HSSE\\临时用电作业票.doc"; uploadfilepath = rootPath + initTemplatePath; newUrl = uploadfilepath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".doc"); filePath = initTemplatePath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".pdf"); @@ -340,12 +340,12 @@ namespace FineUIPro.Web.HSSE.License } } - Bookmark bookmarkWorkDepth = doc.Range.Bookmarks["WorkDepth"];//开挖深度 + Bookmark bookmarkWorkDepth = doc.Range.Bookmarks["WorkDepth"];//作业原因 if (bookmarkWorkDepth != null) { if (getElectricity != null) { - bookmarkWorkDepth.Text = getElectricity.WorkDepth; + bookmarkWorkDepth.Text = getElectricity.Reason; } } diff --git a/SGGL/Model/APIItem/HSSE/HSSELogItem.cs b/SGGL/Model/APIItem/HSSE/HSSELogItem.cs new file mode 100644 index 00000000..8aa16960 --- /dev/null +++ b/SGGL/Model/APIItem/HSSE/HSSELogItem.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model +{ + public class HSSELogItem + { + public string HSSELogId { get; set; } + + public string ProjectId { get; set; } + public string CompileDate { get; set; } + public string CompileMan { get; set; } + public string Weather { get; set; } + public bool? IsVisible { get; set; } + public string CompileManName { get; set; } + public string WeatherName { get; set; } + + public int? Num11 { get; set; } + + + + public string Contents12 { get; set; } + public string Contents13 { get; set; } + public string Contents21 { get; set; } + + public int? Num21 { get; set; } + public string Contents22 { get; set; } + + public int? Num22 { get; set; } + public string Contents23 { get; set; } + public int? Num23 { get; set; } + public string Contents24 { get; set; } + public int? Num24 { get; set; } + public string Contents210 { get; set; } + public int? Num210 { get; set; } + public int? Num211 { get; set; } + public string Contents31 { get; set; } + public int? Num31 { get; set; } + public string Contents32 { get; set; } + public int? Num32 { get; set; } + public string Contents41 { get; set; } + public string Contents42 { get; set; } + } +} diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj index 021d6974..132bd4b1 100644 --- a/SGGL/Model/Model.csproj +++ b/SGGL/Model/Model.csproj @@ -94,6 +94,7 @@ + diff --git a/SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs b/SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs new file mode 100644 index 00000000..a9642904 --- /dev/null +++ b/SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs @@ -0,0 +1,118 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Web.Http; +using BLL; +using Mvc.Controllers; + +namespace WebAPI.Controllers.HSSE +{ + public class HSSELogController : ApiController + { + /// + /// 加载日志列表 + /// + /// + /// + /// + /// + public Model.ResponeData getHSSELogDataList( string projectId, string userId, int pageIndex=0) + { + var responeData = new Model.ResponeData(); + try + { + var getDataList = HSSELogService.getHSSELogDataList(projectId, userId); + int pageCount = getDataList.Count; + if (pageCount > 0 && pageIndex > 0) + { + getDataList = (from x in getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize) + select x).ToList(); + } + responeData.data = new { pageCount, getDataList }; + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + + /// + /// 加载日志列表 + /// + /// + /// + /// + /// + public Model.ResponeData getHSSELogData(string HSSELogId) + { + var responeData = new Model.ResponeData(); + try + { + responeData.data = HSSELogService.getHSSELogData(HSSELogId); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + + /// + /// 加载天气 + /// + /// + public Model.ResponeData getWeatherDataList() + { + var responeData = new Model.ResponeData(); + try + { + responeData.data = ConstValue.drpConstItemList(BLL.ConstValue.Group_Weather); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + + /// + /// 保存日志 + /// + /// 作业票记录 + [HttpPost] + public Model.ResponeData SaveHSSELogData([FromBody] Model.Manager_HSSELog HSSELog) + { + var responeData = new Model.ResponeData(); + HSSELog.IsVisible = true; + try + { + if (!string.IsNullOrEmpty(HSSELog.HSSELogId)) + { + BLL.HSSELogService.UpdateHSSELog(HSSELog); + responeData.message = "修改成功"; + } + else + { + HSSELog.HSSELogId = SQLHelper.GetNewID(typeof(Model.Manager_HSSELog)); + BLL.HSSELogService.AddHSSELog(HSSELog); + responeData.message = "保存成功"; + } + + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + ErrLogInfo.WriteLog(string.Empty, ex); + } + + return responeData; + } + } +} \ No newline at end of file diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index c8a5f5f8..36935d17 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -181,6 +181,7 @@ + From 1c9a21058e239989ad11d2e44822e6805484832b Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 18 Sep 2023 19:58:10 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2023-09-18.sql | Bin 0 -> 9952 bytes .../Check/Check_ProjectCheckItemSetService.cs | 56 +++---- SGGL/BLL/HSSE/Manager/HSSELogService.cs | 137 +++++++++++++++--- .../InspectionSummary.aspx.cs | 39 ++++- SGGL/Model/APIItem/HSSE/HSSELogItem.cs | 23 +++ .../Controllers/HSSE/HSSELogController.cs | 10 +- 6 files changed, 211 insertions(+), 54 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-09-18.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-18.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-18.sql new file mode 100644 index 0000000000000000000000000000000000000000..7d7c6905d9439ec9a9fb2110f4a64dfa41769bfa GIT binary patch literal 9952 zcmeI2%TE(g6vj_tqK$-qfEBES#5BzC1~*Dfz{r%g1J#rQ_CZIKhb=;iiI0_#Y77eu zx-cQJVQ1V*BEb!=jB%w~j9u!&xG^#6Ih5g^=_ttHjZl@}ZP(s^yWpf6fiw6Yc{Mj0Qe4Yx8lFSA za(by>O*|firCsrVed-VcMRa z338@Q!W0_W`|gG5T7EhIA^dHmFRc0n4Vr~4G#!xa%TzJ;BGqMat}Vh9wWUTMuZn$Y zEDmz6t-=*r4#?GjPIUXW2WS(b&{{^6_qA@%N|i#~np3)@1VL2`oj{4J4)wwn+Wr$) zUs`dMjKvd`hDm@YgMZ1bxy+l~K%mMX=W46x18%~sN@?$9WC0WWkrh80suuDUC^dSS{HORBw_wN)!QR(IrBKHriJ z`WN#?Zb|hRdsTE)y!5f$S2dQ6T+g%Zkt4T1v3bB%qxH^i6y7z^rFYXSoZ%i79dm~8VQp%P*7o#ifR czeKyXej`P*eQGXR+~+}^lG8hBJKs!x1M6eab^rhX literal 0 HcmV?d00001 diff --git a/SGGL/BLL/HSSE/Check/Check_ProjectCheckItemSetService.cs b/SGGL/BLL/HSSE/Check/Check_ProjectCheckItemSetService.cs index ed18e1b8..381f4147 100644 --- a/SGGL/BLL/HSSE/Check/Check_ProjectCheckItemSetService.cs +++ b/SGGL/BLL/HSSE/Check/Check_ProjectCheckItemSetService.cs @@ -62,36 +62,42 @@ namespace BLL string type = string.Empty; if (CheckItem != null) { - Model.Check_ProjectCheckItemDetail detail = BLL.Check_ProjectCheckItemDetailService.GetCheckItemDetailById(CheckItem.ToString()); + //Model.Check_ProjectCheckItemDetail detail = BLL.Check_ProjectCheckItemDetailService.GetCheckItemDetailById(CheckItem.ToString()); + + //修改为项目安全检查项 + Model.Technique_CheckItemSet detail = Funs.DB.Technique_CheckItemSet.FirstOrDefault(x => x.CheckItemSetId == CheckItem.ToString()); + if (detail != null) { - Model.Check_ProjectCheckItemSet item = BLL.Check_ProjectCheckItemSetService.GetCheckItemSetById(detail.CheckItemSetId); - if (item != null) - { - if (item.SupCheckItem == "0") - { - type = item.CheckItemName; - } - else - { - type = BLL.Check_ProjectCheckItemSetService.GetCheckItemNameBySupCheckItem(item.SupCheckItem); - } - } + type = detail.CheckItemName; + //Model.Check_ProjectCheckItemSet item = BLL.Check_ProjectCheckItemSetService.GetCheckItemSetById(detail.CheckItemSetId); + //if (item != null) + //{ + // if (item.SupCheckItem == "0") + // { + // type = item.CheckItemName; + // } + // else + // { + // type = BLL.Check_ProjectCheckItemSetService.GetCheckItemNameBySupCheckItem(item.SupCheckItem); + // } + //} } else { - Model.Check_ProjectCheckItemSet item = BLL.Check_ProjectCheckItemSetService.GetCheckItemSetById(CheckItem.ToString()); - if (item != null) - { - if (item.SupCheckItem == "0") - { - type = item.CheckItemName; - } - else - { - type = BLL.Check_ProjectCheckItemSetService.GetCheckItemNameBySupCheckItem(item.SupCheckItem); - } - } + type = "季节性/节假日检查（无类型）"; + //Model.Check_ProjectCheckItemSet item = BLL.Check_ProjectCheckItemSetService.GetCheckItemSetById(CheckItem.ToString()); + //if (item != null) + //{ + // if (item.SupCheckItem == "0") + // { + // type = item.CheckItemName; + // } + // else + // { + // type = BLL.Check_ProjectCheckItemSetService.GetCheckItemNameBySupCheckItem(item.SupCheckItem); + // } + //} } } return type; diff --git a/SGGL/BLL/HSSE/Manager/HSSELogService.cs b/SGGL/BLL/HSSE/Manager/HSSELogService.cs index 4c1d448e..690f45be 100644 --- a/SGGL/BLL/HSSE/Manager/HSSELogService.cs +++ b/SGGL/BLL/HSSE/Manager/HSSELogService.cs @@ -988,7 +988,7 @@ namespace BLL /// /// /// - public static List getHSSELogDataList(string projectId, string userId) + public static List getHSSELogDataList(string projectId, string userId,string CompileMan,string CompileDate) { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { @@ -1017,6 +1017,15 @@ namespace BLL getInfoList = getInfoList.Where(x => x.CompileMan == userId).ToList(); } } + if (!string.IsNullOrEmpty(CompileMan)) + { + getInfoList = getInfoList.Where(x => x.CompileMan == CompileMan).ToList(); + } + if (!string.IsNullOrEmpty(CompileDate)) + { + getInfoList = getInfoList.Where(x => x.CompileDate == CompileDate).ToList(); + } + return getInfoList; } } @@ -1043,33 +1052,117 @@ namespace BLL WeatherName = z.ConstText, - Num11=x.Num11, - Contents12=x.Contents12, - Contents13=x.Contents13, - Contents21=x.Contents21, - Num21=x.Num21, - Contents22=x.Contents22, - Num22=x.Num22, - Contents23=x.Contents23, - Num23=x.Num23, - Contents24=x.Contents24, - Num24=x.Num24, - Contents210=x.Contents210, - Num210=x.Num210, - Num211=x.Num211, - Contents31=x.Contents31, - Num31=x.Num31, - Contents32=x.Contents32, - Num32=x.Num32, - Contents41=x.Contents41, - Contents42=x.Contents42 + Content1 = x.Num11.ToString(), + Content2= x.Contents12, + Content3= x.Contents13, + Content4= x.Contents21, + Content5= x.Num21.ToString(), + Content6= x.Contents22, + Content7 = x.Num22.ToString(), + Content8 = x.Contents23, + Content9 = x.Num23.ToString(), + Content10 = x.Contents24, + Content11 = x.Num24.ToString(), + Content12 = x.Contents210, + Content13 = x.Num210.ToString(), + Content14 = x.Num211.ToString(), + Content15 = x.Contents31, + Content16 = x.Num31.ToString(), + Content17 = x.Contents32, + Content18 = x.Num32.ToString(), + Content19 = x.Contents41, + Content20 = x.Contents42 }).FirstOrDefault(); return model; } } - + /// + /// 增加HSSE日志暨管理数据收集 + /// + /// HSSE日志暨管理数据收集实体 + public static void AddHSSELogApi(Model.HSSELogItem HSSELog) + { + Model.Manager_HSSELog newHSSELog = new Model.Manager_HSSELog + { + HSSELogId = HSSELog.HSSELogId, + ProjectId = HSSELog.ProjectId, + CompileDate = Convert.ToDateTime(HSSELog.CompileDate), + CompileMan = HSSELog.CompileMan, + Weather = HSSELog.Weather, + IsVisible = HSSELog.IsVisible, + Num11 = Convert.ToInt32(HSSELog.Content1), + Contents12 = HSSELog.Content2, + Contents13 = HSSELog.Content3, + Contents21 = HSSELog.Content4, + Num21 = Convert.ToInt32(HSSELog.Content5), + Contents22 = HSSELog.Content6, + Num22 = Convert.ToInt32(HSSELog.Content7), + Contents23 = HSSELog.Content8, + Num23 = Convert.ToInt32(HSSELog.Content9), + Contents24 = HSSELog.Content10, + Num24 = Convert.ToInt32(HSSELog.Content11), + + Contents210 = HSSELog.Content12, + Num210 = Convert.ToInt32(HSSELog.Content13), + Num211 = Convert.ToInt32(HSSELog.Content14), + Contents31 = HSSELog.Content15, + Num31 = Convert.ToInt32(HSSELog.Content16), + Contents32 = HSSELog.Content17, + Num32 = Convert.ToInt32(HSSELog.Content18), + + Contents41 = HSSELog.Content19, + Contents42 = HSSELog.Content20 + }; + Funs.DB.Manager_HSSELog.InsertOnSubmit(newHSSELog); + Funs.DB.SubmitChanges(); + } + + /// + /// 修改HSSE日志暨管理数据收集 + /// + /// + public static void UpdateHSSELogApi(Model.HSSELogItem updateHSSELog) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + Model.Manager_HSSELog newHSSELog = db.Manager_HSSELog.FirstOrDefault(e => e.HSSELogId == updateHSSELog.HSSELogId); + if (newHSSELog != null) + { + newHSSELog.CompileDate = Convert.ToDateTime(updateHSSELog.CompileDate); + newHSSELog.CompileMan = updateHSSELog.CompileMan; + newHSSELog.Weather = updateHSSELog.Weather; + newHSSELog.IsVisible = updateHSSELog.IsVisible; + + newHSSELog.Num11 = Convert.ToInt32(updateHSSELog.Content1); + newHSSELog.Contents12 = updateHSSELog.Content2; + newHSSELog.Contents13 = updateHSSELog.Content3; + newHSSELog.Contents21 = updateHSSELog.Content4; + newHSSELog.Num21 = Convert.ToInt32(updateHSSELog.Content5); + newHSSELog.Contents22 = updateHSSELog.Content6; + newHSSELog.Num22 = Convert.ToInt32(updateHSSELog.Content7); + newHSSELog.Contents23 = updateHSSELog.Content8; + newHSSELog.Num23 = Convert.ToInt32(updateHSSELog.Content9); + newHSSELog.Contents24 = updateHSSELog.Content10; + newHSSELog.Num24 = Convert.ToInt32(updateHSSELog.Content11); + + newHSSELog.Contents210 = updateHSSELog.Content12; + newHSSELog.Num210 = Convert.ToInt32(updateHSSELog.Content13); + newHSSELog.Num211 = Convert.ToInt32(updateHSSELog.Content14); + newHSSELog.Contents31 = updateHSSELog.Content15; + newHSSELog.Num31 = Convert.ToInt32(updateHSSELog.Content16); + newHSSELog.Contents32 = updateHSSELog.Content17; + newHSSELog.Num32 = Convert.ToInt32(updateHSSELog.Content18); + + newHSSELog.Contents41 = updateHSSELog.Content19; + newHSSELog.Contents42 = updateHSSELog.Content20; + db.SubmitChanges(); + } + } + } + + #endregion } } diff --git a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs index 93fa7ba8..8968a929 100644 --- a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs @@ -137,6 +137,8 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary public string ProjectId { get; set; } public DateTime? Mdate { get; set; } + + public string state { get; set; } } #region 生成按钮 @@ -171,7 +173,8 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary { ProblemTypes = x.ProblemTypes, ProjectId = x.ProjectId, - CheckTime=x.CheckTime + CheckTime=x.CheckTime, + States=x.States }).Where(x => x.ProblemTypes == "1").ToList(); //周例会 var list3 = Funs.DB.Meeting_WeekMeeting.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.WeekMeetingDate }).ToList(); @@ -196,7 +199,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary var list7 = Funs.DB.Manager_MonthReportC.Select(x=> new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.Months }).ToList(); //质量巡检 - var list8 = Funs.DB.Check_CheckControl.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.CheckDate }).ToList(); + var list8 = Funs.DB.Check_CheckControl.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.CheckDate,state=x.State }).ToList(); //设备材料报验 var list10 = Funs.DB.Comprehensive_InspectionEquipment.Select @@ -335,6 +338,21 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary allList.Add(model); + //安全巡检已闭合 + model = new Inspection_Summary(); + model.ProjectId = pid; + model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim(); + model.InspectionSummaryId = Guid.NewGuid().ToString(); + model.InspectionSummaryMbId = "28"; + AqxjCount = list2.Where(x => x.ProjectId == pid && x.States=="3").ToList().Count(); + model.SummeryResult = AqxjCount.ToString(); + //时间 + if (AqxjCount > 0) + { + model.CompileDate = list2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.CheckTime).FirstOrDefault().CheckTime; + } + + allList.Add(model); //周例会 model = new Inspection_Summary(); @@ -437,6 +455,23 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary } allList.Add(model); + //质量巡检已闭合项 + model = new Inspection_Summary(); + model.ProjectId = pid; + model.CompileDate = DateTime.Now; + model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim(); + model.InspectionSummaryId = Guid.NewGuid().ToString(); + model.InspectionSummaryMbId = "29"; + //已闭合 + ZlxjCount = list8.Where(x => x.ProjectId == pid&&x.state=="7").ToList().Count; + model.SummeryResult = ZlxjCount.ToString(); + if (ZlxjCount > 0) + { + //巡检日期 + model.CompileDate = list8.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate; + } + allList.Add(model); + //WBS数据 model = new Inspection_Summary(); model.ProjectId = pid; diff --git a/SGGL/Model/APIItem/HSSE/HSSELogItem.cs b/SGGL/Model/APIItem/HSSE/HSSELogItem.cs index 8aa16960..9083866d 100644 --- a/SGGL/Model/APIItem/HSSE/HSSELogItem.cs +++ b/SGGL/Model/APIItem/HSSE/HSSELogItem.cs @@ -43,5 +43,28 @@ namespace Model public int? Num32 { get; set; } public string Contents41 { get; set; } public string Contents42 { get; set; } + + #region 添加修改时字段 + public string Content1 { get; set; } + public string Content2 { get; set; } + public string Content3 { get; set; } + public string Content4 { get; set; } + public string Content5 { get; set; } + public string Content6 { get; set; } + public string Content7 { get; set; } + public string Content8 { get; set; } + public string Content9 { get; set; } + public string Content10 { get; set; } + public string Content11 { get; set; } + public string Content12 { get; set; } + public string Content13 { get; set; } + public string Content14 { get; set; } + public string Content15 { get; set; } + public string Content16 { get; set; } + public string Content17 { get; set; } + public string Content18 { get; set; } + public string Content19 { get; set; } + public string Content20 { get; set; } + #endregion } } diff --git a/SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs b/SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs index a9642904..e1064260 100644 --- a/SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs @@ -18,12 +18,12 @@ namespace WebAPI.Controllers.HSSE /// /// /// - public Model.ResponeData getHSSELogDataList( string projectId, string userId, int pageIndex=0) + public Model.ResponeData getHSSELogDataList( string projectId, string userId,string CompileDate="",string CompileMan="", int pageIndex=0) { var responeData = new Model.ResponeData(); try { - var getDataList = HSSELogService.getHSSELogDataList(projectId, userId); + var getDataList = HSSELogService.getHSSELogDataList(projectId, userId, CompileMan, CompileDate); int pageCount = getDataList.Count; if (pageCount > 0 && pageIndex > 0) { @@ -86,7 +86,7 @@ namespace WebAPI.Controllers.HSSE /// /// 作业票记录 [HttpPost] - public Model.ResponeData SaveHSSELogData([FromBody] Model.Manager_HSSELog HSSELog) + public Model.ResponeData SaveHSSELogData([FromBody] Model.HSSELogItem HSSELog) { var responeData = new Model.ResponeData(); HSSELog.IsVisible = true; @@ -94,13 +94,13 @@ namespace WebAPI.Controllers.HSSE { if (!string.IsNullOrEmpty(HSSELog.HSSELogId)) { - BLL.HSSELogService.UpdateHSSELog(HSSELog); + BLL.HSSELogService.UpdateHSSELogApi(HSSELog); responeData.message = "修改成功"; } else { HSSELog.HSSELogId = SQLHelper.GetNewID(typeof(Model.Manager_HSSELog)); - BLL.HSSELogService.AddHSSELog(HSSELog); + BLL.HSSELogService.AddHSSELogApi(HSSELog); responeData.message = "保存成功"; } From 4c983ce0a24c201b59cc854ba2d9579b459fbb94 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 19 Sep 2023 16:12:26 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=95=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2023-09-19.sql | 322 +++++ SGGL/BLL/Common/Const.cs | 5 + SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 28 + .../BeforeTestRun/InspectTailTermEdit.aspx | 171 +++ .../BeforeTestRun/InspectTailTermEdit.aspx.cs | 500 ++++++++ .../InspectTailTermEdit.aspx.designer.cs | 269 ++++ .../BeforeTestRun/InspectTailTermList.aspx | 163 +++ .../BeforeTestRun/InspectTailTermList.aspx.cs | 243 ++++ .../InspectTailTermList.aspx.designer.cs | 206 ++++ .../TestRun/BeforeTestRun/SubInspectTerm.aspx | 79 +- .../BeforeTestRun/SubInspectTerm.aspx.cs | 536 ++++++-- .../SubInspectTerm.aspx.designer.cs | 117 ++ .../TestRun/BeforeTestRun/SubWorkInspect.aspx | 9 +- .../BeforeTestRun/SubWorkInspect.aspx.cs | 101 +- .../SubWorkInspect.aspx.designer.cs | 2 +- .../BeforeTestRun/TailTermApprove.aspx | 139 +++ .../BeforeTestRun/TailTermApprove.aspx.cs | 221 ++++ .../TailTermApprove.aspx.designer.cs | 269 ++++ .../BeforeTestRun/TailTermApproveList.aspx | 145 +++ .../BeforeTestRun/TailTermApproveList.aspx.cs | 138 +++ .../TailTermApproveList.aspx.designer.cs | 152 +++ SGGL/Model/Model.cs | 1084 ++++++++++++++++- 22 files changed, 4758 insertions(+), 141 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-09-19.sql create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.designer.cs diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-19.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-19.sql new file mode 100644 index 00000000..0c0a1213 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-19.sql @@ -0,0 +1,322 @@ +--==ģ +--WP01 Գ +delete PreRun_WorkInspectTemplate where WorkInspectId='4A52BDAB-2143-4C61-8C7D-F91BE24A2B71' +delete PreRun_WorkInspectTemplate where WorkInspectId='4FCA00CE-391B-43D3-8B6D-D47052CE6565' +delete PreRun_WorkInspectTemplate where WorkInspectId='777B8494-09EC-480D-97C9-702C9FCCC0EB' +delete PreRun_WorkInspectTemplate where WorkInspectId='BC51D8E6-2689-4F04-90C5-79F1C84C41FB' +delete PreRun_WorkInspectTemplate where WorkInspectId='4560A417-F1B9-4121-B058-AFD983BEC194' +delete PreRun_WorkInspectTemplate where WorkInspectId='F504A7E2-ADB9-4BCE-8A7E-F3E971EB9DDD' +delete PreRun_WorkInspectTemplate where WorkInspectId='4FD78960-91ED-4A23-B8D5-E7189152E452' +delete PreRun_WorkInspectTemplate where WorkInspectId='72EAEDF3-DFB1-4B5F-A601-B80BBB718760' +delete PreRun_WorkInspectTemplate where WorkInspectId='A1929105-319D-4637-9251-B4300FDE4C0D' +delete PreRun_WorkInspectTemplate where WorkInspectId='6E1A98B5-7B1E-404D-847C-8E9B7889B13F' +delete PreRun_WorkInspectTemplate where WorkInspectId='78F1C600-EA2E-4CD4-B67A-B9C3432F981B' +delete PreRun_WorkInspectTemplate where WorkInspectId='0AFFD4A5-6853-4875-97AE-9C6B925C9334' +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('4A52BDAB-2143-4C61-8C7D-F91BE24A2B71','1C01150C-977E-499A-9173-95F319BEEF87','ðװȫƺ͹淶Ĺ涨װ¼ȫ','','',GETDATE(),1) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('4FCA00CE-391B-43D3-8B6D-D47052CE6565','1C01150C-977E-499A-9173-95F319BEEF87','ιཬѴﵽǿȣĨѾɡ','','',GETDATE(),2) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('777B8494-09EC-480D-97C9-702C9FCCC0EB','1C01150C-977E-499A-9173-95F319BEEF87','ܵϵͳѹϴɨϸϸ','','',GETDATE(),3) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('BC51D8E6-2689-4F04-90C5-79F1C84C41FB','1C01150C-977E-499A-9173-95F319BEEF87','ȫҪ','','',GETDATE(),4) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('4560A417-F1B9-4121-B058-AFD983BEC194','1C01150C-977E-499A-9173-95F319BEEF87','ܷ͹ܵ豸ϴϸ񣬲תϸ','','',GETDATE(),5) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('F504A7E2-ADB9-4BCE-8A7E-F3E971EB9DDD','1C01150C-977E-499A-9173-95F319BEEF87','ʴʩѻɡ','','',GETDATE(),6) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('4FD78960-91ED-4A23-B8D5-E7189152E452','1C01150C-977E-499A-9173-95F319BEEF87','ڴ涨','','',GETDATE(),7) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('72EAEDF3-DFB1-4B5F-A601-B80BBB718760','1C01150C-977E-499A-9173-95F319BEEF87','DZװ꣬ơĵԷҪ','','',GETDATE(),8) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('A1929105-319D-4637-9251-B4300FDE4C0D','1C01150C-977E-499A-9173-95F319BEEF87','߱ȴˮܷˮDZȷӦ','','',GETDATE(),9) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('6E1A98B5-7B1E-404D-847C-8E9B7889B13F','1C01150C-977E-499A-9173-95F319BEEF87','ֳȫʩͶƷ׼','','',GETDATE(),10) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('78F1C600-EA2E-4CD4-B67A-B9C3432F981B','1C01150C-977E-499A-9173-95F319BEEF87','DZߡ¼뱸Աλ','','',GETDATE(),11) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('0AFFD4A5-6853-4875-97AE-9C6B925C9334','1C01150C-977E-499A-9173-95F319BEEF87','','','',GETDATE(),12) +--WP02 ܵϴ +delete PreRun_WorkInspectTemplate where WorkInspectId='D114152C-AB8F-4A27-BB99-047EFC6A659B' +delete PreRun_WorkInspectTemplate where WorkInspectId='A9EE383E-9073-4C6A-9BF9-6A55D13DED78' +delete PreRun_WorkInspectTemplate where WorkInspectId='ECEAF45C-43E1-4DBD-9ECF-EB509B30C727' +delete PreRun_WorkInspectTemplate where WorkInspectId='123E15BA-8885-445A-8C88-FFEE69E6AAC3' +delete PreRun_WorkInspectTemplate where WorkInspectId='98E970F7-58E2-4EFC-B74F-0D724B968ED2' +delete PreRun_WorkInspectTemplate where WorkInspectId='2340CB66-6CB4-47A6-A80C-F7C523E7F19D' +delete PreRun_WorkInspectTemplate where WorkInspectId='FE74C3B5-33D7-4DB2-A234-CF61248AE508' +delete PreRun_WorkInspectTemplate where WorkInspectId='C57CBFFD-B11F-4F8F-A637-B7EF6344B818' +delete PreRun_WorkInspectTemplate where WorkInspectId='BDD6D5B1-C82C-46A1-BCC5-5F66BFCE4C72' +delete PreRun_WorkInspectTemplate where WorkInspectId='C6171D1B-9B3C-47A5-A5BE-BB21525C67A9' +delete PreRun_WorkInspectTemplate where WorkInspectId='2DA39968-C16D-4723-9932-80804B0F88E6' +delete PreRun_WorkInspectTemplate where WorkInspectId='11F562CB-9867-46E3-A42A-3DCF6C9B80A6' +delete PreRun_WorkInspectTemplate where WorkInspectId='435AF81B-23CD-4EE8-8023-7F26BF8672AA' +delete PreRun_WorkInspectTemplate where WorkInspectId='948611DC-519D-465A-BBA2-5BD26C70C62A' +delete PreRun_WorkInspectTemplate where WorkInspectId='2F77D05B-837C-4A74-AAAD-2BCDAF7444D7' +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('D114152C-AB8F-4A27-BB99-047EFC6A659B','641DA0F4-42A7-4DE3-9A57-95A606016655','ϴɨ·ڵĹܵѹϸ','','',GETDATE(),1) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('A9EE383E-9073-4C6A-9BF9-6A55D13DED78','641DA0F4-42A7-4DE3-9A57-95A606016655','װƵĿװȡ','','',GETDATE(),2) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('ECEAF45C-43E1-4DBD-9ECF-EB509B30C727','641DA0F4-42A7-4DE3-9A57-95A606016655','ҪѲȡЧʩ','','',GETDATE(),3) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('123E15BA-8885-445A-8C88-FFEE69E6AAC3','641DA0F4-42A7-4DE3-9A57-95A606016655','ڷѲѲȡʩ','','',GETDATE(),4) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('98E970F7-58E2-4EFC-B74F-0D724B968ED2','641DA0F4-42A7-4DE3-9A57-95A606016655','Ҫ¶ȼƲԪʱͷס','','',GETDATE(),5) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('2340CB66-6CB4-47A6-A80C-F7C523E7F19D','641DA0F4-42A7-4DE3-9A57-95A606016655','ҪDZѲȡЧʩ','','',GETDATE(),6) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('FE74C3B5-33D7-4DB2-A234-CF61248AE508','641DA0F4-42A7-4DE3-9A57-95A606016655','ͽλ״̬ϳϴɨҪ','','',GETDATE(),7) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('C57CBFFD-B11F-4F8F-A637-B7EF6344B818','641DA0F4-42A7-4DE3-9A57-95A606016655','֧״̬ϳϴɨҪ','','',GETDATE(),8) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('BDD6D5B1-C82C-46A1-BCC5-5F66BFCE4C72','641DA0F4-42A7-4DE3-9A57-95A606016655','ưѲä塣','','',GETDATE(),9) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('C6171D1B-9B3C-47A5-A5BE-BB21525C67A9','641DA0F4-42A7-4DE3-9A57-95A606016655','豸ڼĭ̵ѲȡЧʩ','','',GETDATE(),10) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('2DA39968-C16D-4723-9932-80804B0F88E6','641DA0F4-42A7-4DE3-9A57-95A606016655','ϴܵ޹ϵͳäʩƱʾ','','',GETDATE(),11) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('11F562CB-9867-46E3-A42A-3DCF6C9B80A6','641DA0F4-42A7-4DE3-9A57-95A606016655','ųѼӹ̣ʱ̶ʩϳϴɨҪ','','',GETDATE(),12) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('435AF81B-23CD-4EE8-8023-7F26BF8672AA','641DA0F4-42A7-4DE3-9A57-95A606016655','ȫʩϳϴɨҪ','','',GETDATE(),13) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('948611DC-519D-465A-BBA2-5BD26C70C62A','641DA0F4-42A7-4DE3-9A57-95A606016655','ʩϳϴɨҪ','','',GETDATE(),14) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('2F77D05B-837C-4A74-AAAD-2BCDAF7444D7','641DA0F4-42A7-4DE3-9A57-95A606016655','','','',GETDATE(),15) +--WP03 ܵɨ +delete PreRun_WorkInspectTemplate where WorkInspectId='BC693EF5-405B-4341-8D7F-E1A7DF613CB5' +delete PreRun_WorkInspectTemplate where WorkInspectId='D1977C77-1823-4EC6-8B6A-576ED5C664BC' +delete PreRun_WorkInspectTemplate where WorkInspectId='BC5B90E2-BE72-4957-98CF-0018F8F79900' +delete PreRun_WorkInspectTemplate where WorkInspectId='B8700369-6E43-4D4A-8D35-5D46E064511C' +delete PreRun_WorkInspectTemplate where WorkInspectId='4CBE76B2-1760-428C-9855-30FBD610157D' +delete PreRun_WorkInspectTemplate where WorkInspectId='CC5718D2-10D4-449E-8527-3ABD6E12F120' +delete PreRun_WorkInspectTemplate where WorkInspectId='99068D60-FD45-4435-890C-52E5BC743645' +delete PreRun_WorkInspectTemplate where WorkInspectId='A830F841-C86F-45F6-A888-7EFFA9914F9C' +delete PreRun_WorkInspectTemplate where WorkInspectId='7671F673-6BF1-4A65-9848-6ED60E541C38' +delete PreRun_WorkInspectTemplate where WorkInspectId='41B4C1ED-0D00-4C8F-BDB6-8C3450330255' +delete PreRun_WorkInspectTemplate where WorkInspectId='A0CD44CB-48FC-46E7-A7EA-177B8D880409' +delete PreRun_WorkInspectTemplate where WorkInspectId='3C5F0A0B-0A45-45BE-BDC8-8444415DFEAC' +delete PreRun_WorkInspectTemplate where WorkInspectId='AE04B9B6-0143-411D-BD45-C53FEC73D78C' +delete PreRun_WorkInspectTemplate where WorkInspectId='F51EAB4B-96E8-48C6-848D-DD0EBEDA7539' +delete PreRun_WorkInspectTemplate where WorkInspectId='7428215F-D5BE-4FE3-98B9-6D962B13224B' +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('BC693EF5-405B-4341-8D7F-E1A7DF613CB5','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ϴɨ·ڵĹܵѹϸ','','',GETDATE(),1) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('D1977C77-1823-4EC6-8B6A-576ED5C664BC','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','װƵĿװȡ','','',GETDATE(),2) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('BC5B90E2-BE72-4957-98CF-0018F8F79900','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ҪѲȡЧʩ','','',GETDATE(),3) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('B8700369-6E43-4D4A-8D35-5D46E064511C','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ڷѲѲȡʩ','','',GETDATE(),4) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('4CBE76B2-1760-428C-9855-30FBD610157D','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','Ҫ¶ȼƲԪʱͷס','','',GETDATE(),5) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('CC5718D2-10D4-449E-8527-3ABD6E12F120','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ҪDZѲȡЧʩ','','',GETDATE(),6) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('99068D60-FD45-4435-890C-52E5BC743645','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ͽλ״̬ϳϴɨҪ','','',GETDATE(),7) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('A830F841-C86F-45F6-A888-7EFFA9914F9C','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','֧״̬ϳϴɨҪ','','',GETDATE(),8) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('7671F673-6BF1-4A65-9848-6ED60E541C38','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ưѲä塣','','',GETDATE(),9) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('41B4C1ED-0D00-4C8F-BDB6-8C3450330255','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','豸ڼĭ̵ѲȡЧʩ','','',GETDATE(),10) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('A0CD44CB-48FC-46E7-A7EA-177B8D880409','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ϴܵ޹ϵͳäʩƱʾ','','',GETDATE(),11) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('3C5F0A0B-0A45-45BE-BDC8-8444415DFEAC','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ųѼӹ̣ʱ̶ʩϳϴɨҪ','','',GETDATE(),12) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('AE04B9B6-0143-411D-BD45-C53FEC73D78C','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ȫʩϳϴɨҪ','','',GETDATE(),13) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('F51EAB4B-96E8-48C6-848D-DD0EBEDA7539','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ʩϳϴɨҪ','','',GETDATE(),14) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('7428215F-D5BE-4FE3-98B9-6D962B13224B','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','','','',GETDATE(),15) +--WP05 ѧϴ +delete PreRun_WorkInspectTemplate where WorkInspectId='2C74C5DE-D600-425E-9870-061715D0AA93' +delete PreRun_WorkInspectTemplate where WorkInspectId='F2F146F9-4A2A-40E2-9FA3-83B954DF4775' +delete PreRun_WorkInspectTemplate where WorkInspectId='EF527C06-4CAB-46EC-A6C6-FB5C9152C03B' +delete PreRun_WorkInspectTemplate where WorkInspectId='25D55B52-6083-4856-BEAA-F983DB250CE2' +delete PreRun_WorkInspectTemplate where WorkInspectId='14DBD15B-F40E-4FAD-B903-5FACEF1D85F4' +delete PreRun_WorkInspectTemplate where WorkInspectId='89D04B6E-16D0-4870-B006-7ADA9FED4F8D' +delete PreRun_WorkInspectTemplate where WorkInspectId='B534309B-1767-47A2-9729-46ACB732AAD2' +delete PreRun_WorkInspectTemplate where WorkInspectId='D76DB877-D8C6-45EB-BDB0-E33AC3EA3272' +delete PreRun_WorkInspectTemplate where WorkInspectId='6CB94B9D-2ED6-4C6D-A164-1AE8EE3CB02E' +delete PreRun_WorkInspectTemplate where WorkInspectId='F9B9A741-A9F1-4863-86C1-B061A4645B1F' +delete PreRun_WorkInspectTemplate where WorkInspectId='4C1F3A32-A3CF-48A9-83A5-ACD7C6CBE644' +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('2C74C5DE-D600-425E-9870-061715D0AA93','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ѧϴ·Ĺܵѹϸ','','',GETDATE(),1) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('F2F146F9-4A2A-40E2-9FA3-83B954DF4775','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ϵͳ·ıáѹѵԳϸ','','',GETDATE(),2) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('EF527C06-4CAB-46EC-A6C6-FB5C9152C03B','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ҪDZڷѲȡЧʩ','','',GETDATE(),3) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('25D55B52-6083-4856-BEAA-F983DB250CE2','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ϵͳе豸ڼѲȡʩ','','',GETDATE(),4) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('14DBD15B-F40E-4FAD-B903-5FACEF1D85F4','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ҪIJԪʱͷס','','',GETDATE(),5) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('89D04B6E-16D0-4870-B006-7ADA9FED4F8D','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','֧ܵܰװϷҪ','','',GETDATE(),6) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('B534309B-1767-47A2-9729-46ACB732AAD2','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','֧״̬ϻѧϴҪ','','',GETDATE(),7) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('D76DB877-D8C6-45EB-BDB0-E33AC3EA3272','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ưѲä塣','','',GETDATE(),8) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('6CB94B9D-2ED6-4C6D-A164-1AE8EE3CB02E','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ϴϵͳ޹ϵͳäʩƱʾ','','',GETDATE(),9) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('F9B9A741-A9F1-4863-86C1-B061A4645B1F','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ѧϴʱʩԴҩƷѧߵȽѱ롣','','',GETDATE(),10) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('4C1F3A32-A3CF-48A9-83A5-ACD7C6CBE644','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ȫʩϻѧϴҪ','','',GETDATE(),11) + +--WP06 ¯ +delete PreRun_WorkInspectTemplate where WorkInspectId='CB8F1765-C8BB-484C-9F26-21C8E9CB4CE7' +delete PreRun_WorkInspectTemplate where WorkInspectId='F2F29570-1975-4014-A99A-4A03DB4A536D' +delete PreRun_WorkInspectTemplate where WorkInspectId='1A00CB42-25E4-4F97-A1B5-3F7C4490F223' +delete PreRun_WorkInspectTemplate where WorkInspectId='9DECCBE6-65CC-419A-A048-979783FD6842' +delete PreRun_WorkInspectTemplate where WorkInspectId='21BF145B-EA14-4E55-B037-E819234F1F7A' +delete PreRun_WorkInspectTemplate where WorkInspectId='5E0511A0-C5A9-4B61-9685-4E6C8037F4C6' +delete PreRun_WorkInspectTemplate where WorkInspectId='C7593DCE-AA2A-4049-91E5-39E0E9B0E13A' +delete PreRun_WorkInspectTemplate where WorkInspectId='583F587F-DAC6-480B-9731-5BAC193E7F96' +delete PreRun_WorkInspectTemplate where WorkInspectId='5DFCD094-DDF7-4B2C-9734-37FF80763974' +delete PreRun_WorkInspectTemplate where WorkInspectId='FA2DCD68-F4CE-495A-AF9F-E368248D5386' +delete PreRun_WorkInspectTemplate where WorkInspectId='3DEF5BB6-E60F-4F7A-85AB-74FE48BE3E93' +delete PreRun_WorkInspectTemplate where WorkInspectId='ED369C77-1B1A-46DE-826E-DDD9E866A4D7' +delete PreRun_WorkInspectTemplate where WorkInspectId='A0C6A601-ABBE-4EBF-9193-2796F56ADD91' +delete PreRun_WorkInspectTemplate where WorkInspectId='177F8D2C-BE13-437E-92EB-B0C79797F161' +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('CB8F1765-C8BB-484C-9F26-21C8E9CB4CE7','3289A3D2-0691-4AD1-BDF3-1FD784564E71','¯ǽ(졢̵ͷ)½ڲɾ','','',GETDATE(),1) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('F2F29570-1975-4014-A99A-4A03DB4A536D','3289A3D2-0691-4AD1-BDF3-1FD784564E71','豸еĵºͨˮ֣ѲȡͨˮͨȴʩԷܵ¡','','',GETDATE(),2) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('1A00CB42-25E4-4F97-A1B5-3F7C4490F223','3289A3D2-0691-4AD1-BDF3-1FD784564E71','ߺ¯Ҫȷ¯ϵͳϵͳȫ롣','','',GETDATE(),3) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('9DECCBE6-65CC-419A-A048-979783FD6842','3289A3D2-0691-4AD1-BDF3-1FD784564E71','ָʾװϣָλ','','',GETDATE(),4) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('21BF145B-EA14-4E55-B037-E819234F1F7A','3289A3D2-0691-4AD1-BDF3-1FD784564E71','¯豸װϲкϸ','','',GETDATE(),5) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('5E0511A0-C5A9-4B61-9685-4E6C8037F4C6','3289A3D2-0691-4AD1-BDF3-1FD784564E71','¯õȹ͵DZװϲУϸ','','',GETDATE(),6) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('C7593DCE-AA2A-4049-91E5-39E0E9B0E13A','3289A3D2-0691-4AD1-BDF3-1FD784564E71','̵̵尲װϲԣ̵ųڰȫλá','','',GETDATE(),7) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('583F587F-DAC6-480B-9731-5BAC193E7F96','3289A3D2-0691-4AD1-BDF3-1FD784564E71','µѾҪúá','','',GETDATE(),8) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('5DFCD094-DDF7-4B2C-9734-37FF80763974','3289A3D2-0691-4AD1-BDF3-1FD784564E71','¯߱Ѿò¯ңͻϹӦ̣ȷϡ','','',GETDATE(),9) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('FA2DCD68-F4CE-495A-AF9F-E368248D5386','3289A3D2-0691-4AD1-BDF3-1FD784564E71','ͻϵѾòñ,¯ѡĸλá','','',GETDATE(),10) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('3DEF5BB6-E60F-4F7A-85AB-74FE48BE3E93','3289A3D2-0691-4AD1-BDF3-1FD784564E71','¯ȼϣͣȼȵλ','','',GETDATE(),11) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('ED369C77-1B1A-46DE-826E-DDD9E866A4D7','3289A3D2-0691-4AD1-BDF3-1FD784564E71','ʱ¯ϡ','','',GETDATE(),12) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('A0C6A601-ABBE-4EBF-9193-2796F56ADD91','3289A3D2-0691-4AD1-BDF3-1FD784564E71','𡢰ȫʩϺ¯Ҫ','','',GETDATE(),13) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('177F8D2C-BE13-437E-92EB-B0C79797F161','3289A3D2-0691-4AD1-BDF3-1FD784564E71','','','',GETDATE(),14) + +--WP12 Գ +delete PreRun_WorkInspectTemplate where WorkInspectId='19BE0861-1AD7-40A3-AA18-01C5CEB64131' +delete PreRun_WorkInspectTemplate where WorkInspectId='B55865DC-035D-48B5-84BE-7C34C3353B21' +delete PreRun_WorkInspectTemplate where WorkInspectId='0B8CB7D6-8D89-4427-A62E-739643E2F1C2' +delete PreRun_WorkInspectTemplate where WorkInspectId='2D114EBD-FE45-4D50-AF13-C79063C8D475' +delete PreRun_WorkInspectTemplate where WorkInspectId='F58D79AE-9579-4BB9-AA39-AC5B92D21059' +delete PreRun_WorkInspectTemplate where WorkInspectId='EC7F7D2E-CE08-4F89-9538-03650EFB45BD' +delete PreRun_WorkInspectTemplate where WorkInspectId='F71B00D0-2029-458F-A3AE-D4B624F0908A' +delete PreRun_WorkInspectTemplate where WorkInspectId='1427A267-A5A2-4D46-A2AA-EE3337966481' +delete PreRun_WorkInspectTemplate where WorkInspectId='A1EEC73A-7499-4E3E-BFF3-6C997E5F9122' +delete PreRun_WorkInspectTemplate where WorkInspectId='44EF73C6-AE42-4062-80FA-F9A9AD72E8BD' +delete PreRun_WorkInspectTemplate where WorkInspectId='94493ADE-6942-43B3-A91E-528C5F9A9494' +delete PreRun_WorkInspectTemplate where WorkInspectId='5A4BF482-A006-4C74-85E6-2CB819498435' +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('19BE0861-1AD7-40A3-AA18-01C5CEB64131','963E658B-CB53-4FEA-BA7D-723C538B2BD5','鰲װȫƺ͹淶Ĺ涨װ¼ȫ','','',GETDATE(),1) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('B55865DC-035D-48B5-84BE-7C34C3353B21','963E658B-CB53-4FEA-BA7D-723C538B2BD5','ܵϵͳѹϴɨϸϸ','','',GETDATE(),2) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('0B8CB7D6-8D89-4427-A62E-739643E2F1C2','963E658B-CB53-4FEA-BA7D-723C538B2BD5','·ϵͳѧϴͳϴϸ','','',GETDATE(),3) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('2D114EBD-FE45-4D50-AF13-C79063C8D475','963E658B-CB53-4FEA-BA7D-723C538B2BD5','DZװ꣬ϵͳơĵԷҪ','','',GETDATE(),4) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('F58D79AE-9579-4BB9-AA39-AC5B92D21059','963E658B-CB53-4FEA-BA7D-723C538B2BD5','ٻ١ΣϵͳװϡԺϸ','','',GETDATE(),5) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('EC7F7D2E-CE08-4F89-9538-03650EFB45BD','963E658B-CB53-4FEA-BA7D-723C538B2BD5','ʴʩѻɡ','','',GETDATE(),6) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('F71B00D0-2029-458F-A3AE-D4B624F0908A','963E658B-CB53-4FEA-BA7D-723C538B2BD5','鰲װҪ','','',GETDATE(),7) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('1427A267-A5A2-4D46-A2AA-EE3337966481','963E658B-CB53-4FEA-BA7D-723C538B2BD5','߱ȴˮDZȷӦ','','',GETDATE(),8) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('A1EEC73A-7499-4E3E-BFF3-6C997E5F9122','963E658B-CB53-4FEA-BA7D-723C538B2BD5','DZߡ¼뱸Աλ','','',GETDATE(),9) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('44EF73C6-AE42-4062-80FA-F9A9AD72E8BD','963E658B-CB53-4FEA-BA7D-723C538B2BD5','ֳȫʩͶƷ׼','','',GETDATE(),10) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('94493ADE-6942-43B3-A91E-528C5F9A9494','963E658B-CB53-4FEA-BA7D-723C538B2BD5','DZߡ¼룬Աλ','','',GETDATE(),11) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('5A4BF482-A006-4C74-85E6-2CB819498435','963E658B-CB53-4FEA-BA7D-723C538B2BD5','','','',GETDATE(),12) + +--ҵ߼ɾ +truncate table PreRun_SubInspectTerm +truncate table PreRun_SubInspectTermItem + +--Ӽβ˵ +delete Sys_Menu where MenuId='B6A6EA7D-EDAB-40C8-920D-A106731D0E08' +delete Sys_Menu where MenuId='8542644D-BD9B-4188-9FDE-AE5D6D6D9A40' +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('B6A6EA7D-EDAB-40C8-920D-A106731D0E08','β',null,'TestRun/BeforeTestRun/InspectTailTermList.aspx',8,'AD6E08B6-5571-4FFB-BDBE-9E6811770BD6','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('8542644D-BD9B-4188-9FDE-AE5D6D6D9A40','',null,'TestRun/BeforeTestRun/TailTermApproveList.aspx',9,'AD6E08B6-5571-4FFB-BDBE-9E6811770BD6','Menu_TestRun',0,1,1) +GO + +--ְ +alter table PreRun_SubInspectTerm add Subcontractor varchar(50) null +--а +alter table PreRun_SubInspectTerm add Contractor varchar(50) null +-- +alter table PreRun_SubInspectTerm add Supervision varchar(50) null +--ҵ +alter table PreRun_SubInspectTerm add Owner varchar(50) null +--0=ȫ1=ܵ2=豸 +alter table PreRun_WorkPackage add WorkPackType int null +alter table PreRun_SubInspectTerm add WorkPackType int null +--ܵ豸 +alter table PreRun_SubInspectTerm add PropertyTechnologyId varchar(50) null +go + +--==ϵͳ +if object_id(N'PreRun_SubInspectTermItem',N'U') is not null +drop table dbo.PreRun_SubInspectTermItem +CREATE TABLE dbo.PreRun_SubInspectTermItem( + TermItemId varchar(50) NOT NULL,-- + SubItemId varchar(50) NULL,-- + SubInspectId varchar(50) NULL,-- + WorkPackId varchar(50) NULL,-- + ProjectId varchar(50) NULL,--Ŀ + WorkInspectId varchar(50) NOT NULL,--ģ + WorkInspectName varchar(500) NULL,-- + InstallationId varchar(50) NULL,--װ(ֶΣڹ) + ProcessesId varchar(50) NULL,--(ֶΣڹ) + SystemId varchar(50) NULL,--ϵͳ(ֶΣڹ) + SubSystemId varchar(50) NULL,--ϵͳ + InspectedUser varchar(50) NULL,-- + InspectionResults int NULL,--0:δͨ 1:ͨ + InspectionIllustrate varchar(200) NULL,--˵ + Subcontractor varchar(50) null,--ְ + Contractor varchar(50) null,--а + Supervision varchar(50) null,-- + Owner varchar(50) null,--ҵ + WorkPackType int null,--0=ȫ1=ܵ2=豸 + PropertyTechnologyId varchar(50) null,--ܵ豸 + Remark varchar(200) NULL,--ע + AddUser varchar(50) NULL,-- + AddTime datetime NULL,-- + Sort int NULL,-- + CONSTRAINT PK_PreRun_SubInspectTermItem PRIMARY KEY CLUSTERED +( + TermItemId ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +--Ԥ +delete PreRun_WorkPackage where WorkPackId='1C01150C-977E-499A-9173-95F319BEEF87' +delete PreRun_WorkPackage where WorkPackId='641DA0F4-42A7-4DE3-9A57-95A606016655' +delete PreRun_WorkPackage where WorkPackId='BEB24AE8-F66D-458B-ADFD-3810405B5EB8' +delete PreRun_WorkPackage where WorkPackId='02BC1E1E-E531-4738-B6EC-5CE5BDC47B43' +delete PreRun_WorkPackage where WorkPackId='474F94B6-E927-4E9A-A544-F8E1AE63F6FF' +delete PreRun_WorkPackage where WorkPackId='3289A3D2-0691-4AD1-BDF3-1FD784564E71' +delete PreRun_WorkPackage where WorkPackId='445B915B-3E6D-47BE-BFF4-8762695ADB20' +delete PreRun_WorkPackage where WorkPackId='73C7D1D7-6DA3-44DD-A88B-7DF0FF15AA4F' +delete PreRun_WorkPackage where WorkPackId='8845C52D-4C56-442E-9237-CE33E8FC66AA' +delete PreRun_WorkPackage where WorkPackId='B0D040D4-5867-4335-9258-75504E73987E' +delete PreRun_WorkPackage where WorkPackId='84C6DAD6-3ED8-4869-ADB4-2EDA3512DB16' +delete PreRun_WorkPackage where WorkPackId='963E658B-CB53-4FEA-BA7D-723C538B2BD5' +delete PreRun_WorkPackage where WorkPackId='598A028A-5812-40E3-9D9D-5180A36F4453' +delete PreRun_WorkPackage where WorkPackId='6D827784-6ABD-4327-ABB7-FDABAC99853F' +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('1C01150C-977E-499A-9173-95F319BEEF87','Գ',2,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),1) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('641DA0F4-42A7-4DE3-9A57-95A606016655','ܵϴ',1,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),2) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ܵɨ',1,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),3) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('02BC1E1E-E531-4738-B6EC-5CE5BDC47B43','ɨ',1,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),4) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ѧϴ',1,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),5) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('3289A3D2-0691-4AD1-BDF3-1FD784564E71','¯',2,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),6) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('445B915B-3E6D-47BE-BFF4-8762695ADB20','߻װ',2,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),7) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('73C7D1D7-6DA3-44DD-A88B-7DF0FF15AA4F','ɸװ',2,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),8) +--INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +--VALUES('8845C52D-4C56-442E-9237-CE33E8FC66AA','','','','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),9) +--INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +--VALUES('B0D040D4-5867-4335-9258-75504E73987E','DZ','','','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),10) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('84C6DAD6-3ED8-4869-ADB4-2EDA3512DB16','ֻԳ',2,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),11) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('963E658B-CB53-4FEA-BA7D-723C538B2BD5','Գ',2,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),12) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('598A028A-5812-40E3-9D9D-5180A36F4453','',1,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),13) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('6D827784-6ABD-4327-ABB7-FDABAC99853F','ȼ',0,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),14) +go + +--==β +if object_id(N'PreRun_InspectTailTerm',N'U') is not null +drop table dbo.PreRun_InspectTailTerm +CREATE TABLE dbo.PreRun_InspectTailTerm( + TailTermId varchar(50) NOT NULL,-- + ProjectId varchar(50) NULL,--Ŀ + ProjectName varchar(50) NULL,--Ŀ + TailTermCode varchar(50) NULL,--Ѳ + ConstructionUnit varchar(50) NULL,--ʩλ + ProblemType int NULL,--1:ܵ2:豸 + QuestionTechnologyId varchar(50) NULL,--ܵ豸 + TermItemId varchar(50) NULL,-- + WorkPackId varchar(50) NULL,-- + QuestionDesc varchar(max) NULL,-- + RectifyOpinion varchar(max) NULL,-- + RectifyTime datetime NULL,--ʱ + InspectUser varchar(50) NULL,-- + ApproveUser varchar(50) NULL,-- + ApproveState int NULL,--0:ύ1:˻2:3:ͨ + AddUser varchar(50) NULL,-- + AddTime datetime NULL,-- + CONSTRAINT PK_PreRun_InspectTailTerm PRIMARY KEY CLUSTERED +( + TailTermId ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +--==˼¼ +if object_id(N'PreRun_InspectTermApproveRecords',N'U') is not null +drop table dbo.PreRun_InspectTermApproveRecords +CREATE TABLE dbo.PreRun_InspectTermApproveRecords( + InspectTermId varchar(50) NOT NULL,-- + ProjectId varchar(50) NULL,--Ŀ + TermItemId varchar(50) NULL,-- + TailTermId varchar(50) NULL,--β + ApproveOpinion varchar(max) NULL,-- + ApproveTime datetime NULL,--ʱ + ApproveUser varchar(50) NULL,-- + ApproveState int NULL,--0:˻1:ͨ + AddUser varchar(50) NULL,-- + AddTime datetime NULL,-- + CONSTRAINT PK_PreRun_InspectTermApproveRecords PRIMARY KEY CLUSTERED +( + InspectTermId ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 699a4762..6537a285 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -5547,5 +5547,10 @@ namespace BLL /// 实业 /// public const string SYHSEData_DataMenuId = "S89E5EC2-F725-4656-9110-5AF83C18FB6C"; + + /// + /// 检查表尾项管理 + /// + public const string InspectTailTerm = "B6A6EA7D-EDAB-40C8-920D-A106731D0E08"; } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 4a4aefca..608607e3 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1655,6 +1655,8 @@ + + @@ -1664,6 +1666,8 @@ + + @@ -14969,6 +14973,18 @@ DeviceRunEdit.aspx + + InspectTailTermEdit.aspx + + + InspectTailTermEdit.aspx + + + InspectTailTermList.aspx + + + InspectTailTermList.aspx + InspectTemplate.aspx ASPXCodeBehind @@ -15032,6 +15048,18 @@ SysPipingDeviceImport.aspx + + TailTermApprove.aspx + + + TailTermApprove.aspx + + + TailTermApproveList.aspx + + + TailTermApproveList.aspx + GoodsBuy.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx new file mode 100644 index 00000000..0c964cbb --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx @@ -0,0 +1,171 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectTailTermEdit.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.InspectTailTermEdit" %> + + + + + + 质量巡检 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs new file mode 100644 index 00000000..4087645f --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs @@ -0,0 +1,500 @@ +using BLL; +using Model; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + public partial class InspectTailTermEdit : PageBase + { + /// + /// 主键 + /// + public string TailTermId + { + get { return (string)ViewState["TailTermId"]; } + set { ViewState["TailTermId"] = value; } + } + + /// + /// 是否查看 + /// + public bool IsView + { + get { return (bool)ViewState["IsView"]; } + set { ViewState["IsView"] = value; } + } + + /// + /// 问题图片是否可编辑 + /// + public int QuestionEditImg + { + get { return (int)ViewState["QuestionEditImg"]; } + set { ViewState["QuestionEditImg"] = value; } + } + + /// + /// 整改图片是否可编辑 + /// + public int RectifyEditImg + { + get { return (int)ViewState["RectifyEditImg"]; } + set { ViewState["RectifyEditImg"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.TailTermId = Request["TailTermId"]; + //是否查看 + this.IsView = string.IsNullOrWhiteSpace(Request["IsView"]) ? false : bool.Parse(Request["IsView"]); + //数据绑定 + PageInit(); + //审批已经绑定 + gvApproveBrid(); + //判断是否查看 + if (IsView) + { + btnSave.Hidden = true; + btnSubmit.Hidden = true; + QuestionEditImg = -1; + RectifyEditImg = -1; + txtTailTermCode.Enabled = false; + ddlConstructionUnit.Enabled = false; + ddlProblemType.Enabled = false; + ddlQuestionTechnologyId.Enabled = false; + ddlTermItemId.Enabled = false; + txtQuestionDesc.Enabled = false; + txtRectifyOpinion.Enabled = false; + txtRectifyTime.Enabled = false; + ddlInspectUser.Enabled = false; + ddlApproveUser.Enabled = false; + } + } + } + + /// + /// 默认绑定 + /// + public void PageInit() + { + QuestionEditImg = 0; + RectifyEditImg = 0; + //施工单位 + UnitService.InitUnitByProjectIdUnitTypeDropDownList(ddlConstructionUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); + //获取用户信息 + var users = from user in Funs.DB.Sys_User + join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId + where projectrole.ProjectId == this.CurrUser.LoginProjectId + select user; + //检查人和审核人 + if (users.Count() > 0) + { + //检查人 + ddlInspectUser.DataTextField = "UserName"; + ddlInspectUser.DataValueField = "UserId"; + ddlInspectUser.DataSource = users; + ddlInspectUser.DataBind(); + //审核人 + ddlApproveUser.DataTextField = "UserName"; + ddlApproveUser.DataValueField = "UserId"; + ddlApproveUser.DataSource = users; + ddlApproveUser.DataBind(); + } + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (model != null) + { + //项目名称 + txtProjectName.Text = model.ProjectName; + //巡检编号 + txtTailTermCode.Text = model.TailTermCode; + //施工单位 + ddlConstructionUnit.SelectedValue = model.ConstructionUnit; + //问题类别 + ddlProblemType.SelectedValue = model.ProblemType.ToString(); + //绑定管道或者设备 + if (model.ProblemType == 1) + { + var sysPipingData = from proper in Funs.DB.PreRun_PropertySysPiping + join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId + join termitem in Funs.DB.PreRun_SubInspectTermItem on proper.PropertyId equals termitem.PropertyTechnologyId + where termitem.InspectionResults == 0 && termitem.InspectedUser == this.CurrUser.UserId + group proper by new { proper.PropertyId, proper.PipingCode } into t + select new + { + Id = t.Key.PropertyId, + Code = $"管道：({t.Key.PipingCode})" + }; + if (sysPipingData.Count() > 0) + { + ddlQuestionTechnologyId.DataTextField = "Code"; + ddlQuestionTechnologyId.DataValueField = "Id"; + ddlQuestionTechnologyId.DataSource = sysPipingData; + ddlQuestionTechnologyId.DataBind(); + } + } + else + { + var sysPipingData = from technology in Funs.DB.PreRun_TechnologySysPiping + join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId + join termitem in Funs.DB.PreRun_SubInspectTermItem on technology.TechnologyId equals termitem.PropertyTechnologyId + where termitem.InspectionResults == 0 && termitem.InspectedUser == this.CurrUser.UserId + group technology by new { technology.TechnologyId, technology.TagNumber } into t + select new + { + Id = t.Key.TechnologyId, + Code = $"设备：({t.Key.TagNumber})" + }; + if (sysPipingData.Count() > 0) + { + ddlQuestionTechnologyId.DataTextField = "Code"; + ddlQuestionTechnologyId.DataValueField = "Id"; + ddlQuestionTechnologyId.DataSource = sysPipingData; + ddlQuestionTechnologyId.DataBind(); + } + } + //管道/设备 + ddlQuestionTechnologyId.SelectedValue = model.QuestionTechnologyId; + //绑定检查项 + if (!string.IsNullOrWhiteSpace(ddlQuestionTechnologyId.SelectedValue)) + { + var TermItemIds = Funs.DB.PreRun_InspectTailTerm.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TailTermId != this.TailTermId).Select(a => a.TermItemId).ToList(); + var list = new List(); + if (TermItemIds.Count > 0) + { + list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.PropertyTechnologyId == ddlQuestionTechnologyId.SelectedValue && !TermItemIds.Contains(x.TermItemId)).ToList(); + } + else + { + list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.PropertyTechnologyId == ddlQuestionTechnologyId.SelectedValue).ToList(); + } + if (list.Count() > 0) + { + ddlTermItemId.DataTextField = "WorkInspectName"; + ddlTermItemId.DataValueField = "TermItemId"; + ddlTermItemId.DataSource = list; + ddlTermItemId.DataBind(); + } + } + //检查项 + ddlTermItemId.SelectedValue = model.TermItemId; + //问题描述 + txtQuestionDesc.Text = model.QuestionDesc; + //整改意见 + txtRectifyOpinion.Text = model.RectifyOpinion; + //整改时间 + txtRectifyTime.Text = model.RectifyTime != null ? model.RectifyTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty; + //检查人 + ddlInspectUser.SelectedValue = model.InspectUser; + //审核人 + ddlApproveUser.SelectedValue = model.ApproveUser; + if (model.ApproveState > 1) + { + QuestionEditImg = -1; + RectifyEditImg = -1; + } + } + else + { + this.TailTermId = Guid.NewGuid().ToString(); + var projectModel = Funs.DB.Base_Project.FirstOrDefault(e => e.ProjectId == this.CurrUser.LoginProjectId); + if (projectModel != null) + { + txtProjectName.Text = projectModel.ProjectName; + string code = projectModel.ProjectCode + "-06-CM03-XJ-"; + txtTailTermCode.Text = SQLHelper.RunProcNewId("SpGetNewCode5", "dbo.PreRun_InspectTailTerm", "TailTermCode", code); + } + } + } + + /// + /// 审批意见绑定 + /// + public void gvApproveBrid() + { + string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveState,(case a.ApproveState when 0 then '退回' when 1 then '通过' else '' end) as ApproveStateName,a.AddUser,a.AddTime from PreRun_InspectTermApproveRecords as a inner join PreRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId where 1=1 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId "; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@TailTermId", this.TailTermId)); + strSql += " order by a.AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + gvApprove.DataSource = tb; + gvApprove.DataBind(); + } + + #region 按钮 + + /// + /// 保存 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrWhiteSpace(ddlConstructionUnit.SelectedValue)) + { + ShowNotify("请选择施工单位!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlProblemType.SelectedValue)) + { + ShowNotify("请选择问题类别!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlQuestionTechnologyId.SelectedValue)) + { + ShowNotify("请选择管道/设备!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlTermItemId.SelectedValue)) + { + ShowNotify("请选择检查项!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlInspectUser.SelectedValue)) + { + ShowNotify("请选择检查人!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlApproveUser.SelectedValue)) + { + ShowNotify("请选择审核人!", MessageBoxIcon.Warning); + return; + } + var isAdd = false; + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (model == null) + { + isAdd = true; + model = new PreRun_InspectTailTerm(); + model.TailTermId = this.TailTermId; + model.ProjectId = this.CurrUser.LoginProjectId; + } + model.ProjectName = txtProjectName.Text; + model.TailTermCode = txtTailTermCode.Text; + model.ConstructionUnit = ddlConstructionUnit.SelectedValue; + model.ProblemType = int.Parse(ddlProblemType.SelectedValue); + model.QuestionTechnologyId = ddlQuestionTechnologyId.SelectedValue; + model.TermItemId = ddlTermItemId.SelectedValue; + model.QuestionDesc = txtQuestionDesc.Text.Trim(); + model.RectifyOpinion = txtRectifyOpinion.Text.Trim(); + model.RectifyTime = DateTime.Parse(txtRectifyTime.Text); + model.InspectUser = ddlInspectUser.SelectedValue; + model.ApproveUser = ddlApproveUser.SelectedValue; + model.ApproveState = 0; + model.AddUser = this.CurrUser.LoginProjectId; + model.AddTime = DateTime.Now; + var workPack = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == model.TermItemId); + if (workPack != null) + { + model.WorkPackId = workPack.WorkPackId; + } + if (isAdd) + { + Funs.DB.PreRun_InspectTailTerm.InsertOnSubmit(model); + } + Funs.DB.SubmitChanges(); + ShowNotify("操作成功!", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 保存并提交 + /// + protected void btnSubmit_Click(object sender, EventArgs e) + { + if (string.IsNullOrWhiteSpace(ddlConstructionUnit.SelectedValue)) + { + ShowNotify("请选择施工单位!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlProblemType.SelectedValue)) + { + ShowNotify("请选择问题类别!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlQuestionTechnologyId.SelectedValue)) + { + ShowNotify("请选择管道/设备!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlTermItemId.SelectedValue)) + { + ShowNotify("请选择检查项!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlInspectUser.SelectedValue)) + { + ShowNotify("请选择检查人!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlApproveUser.SelectedValue)) + { + ShowNotify("请选择审核人!", MessageBoxIcon.Warning); + return; + } + var isAdd = false; + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (model == null) + { + isAdd = true; + model = new PreRun_InspectTailTerm(); + model.TailTermId = this.TailTermId; + model.ProjectId = this.CurrUser.LoginProjectId; + } + model.ProjectName = txtProjectName.Text; + model.TailTermCode = txtTailTermCode.Text; + model.ConstructionUnit = ddlConstructionUnit.SelectedValue; + model.ProblemType = int.Parse(ddlProblemType.SelectedValue); + model.QuestionTechnologyId = ddlQuestionTechnologyId.SelectedValue; + model.TermItemId = ddlTermItemId.SelectedValue; + model.QuestionDesc = txtQuestionDesc.Text.Trim(); + model.RectifyOpinion = txtRectifyOpinion.Text.Trim(); + model.RectifyTime = DateTime.Parse(txtRectifyTime.Text); + model.InspectUser = ddlInspectUser.SelectedValue; + model.ApproveUser = ddlApproveUser.SelectedValue; + model.ApproveState = 2; + model.AddUser = this.CurrUser.LoginProjectId; + model.AddTime = DateTime.Now; + var workPack = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == model.TermItemId); + if (workPack != null) + { + model.WorkPackId = workPack.WorkPackId; + } + if (isAdd) + { + Funs.DB.PreRun_InspectTailTerm.InsertOnSubmit(model); + } + Funs.DB.SubmitChanges(); + ShowNotify("操作成功!", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 问题图片 + /// + protected void imgBtnQuestionFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", QuestionEditImg, this.TailTermId + "q", Const.InspectTailTerm))); + } + + /// + /// 整改图片 + /// + protected void imgBtnRectifyFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", RectifyEditImg, this.TailTermId + "h", Const.InspectTailTerm))); + } + + #endregion + + #region 事件 + + /// + /// 问题类别事件 + /// + protected void ddlProblemType_SelectedIndexChanged(object sender, EventArgs e) + { + if (!string.IsNullOrWhiteSpace(ddlProblemType.SelectedValue)) + { + if (ddlProblemType.SelectedValue == "1") + { + var sysPipingData = from proper in Funs.DB.PreRun_PropertySysPiping + join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId + join termitem in Funs.DB.PreRun_SubInspectTermItem on proper.PropertyId equals termitem.PropertyTechnologyId + where termitem.InspectionResults == 0 && termitem.InspectedUser == this.CurrUser.UserId + group proper by new { proper.PropertyId, proper.PipingCode } into t + select new + { + Id = t.Key.PropertyId, + Code = $"管道：({t.Key.PipingCode})" + }; + ddlQuestionTechnologyId.Items.Clear(); + if (sysPipingData.Count() > 0) + { + ddlQuestionTechnologyId.DataTextField = "Code"; + ddlQuestionTechnologyId.DataValueField = "Id"; + ddlQuestionTechnologyId.DataSource = sysPipingData; + ddlQuestionTechnologyId.DataBind(); + } + else + { + ddlQuestionTechnologyId.Items.Insert(0, new ListItem("==无数据==", "")); + } + } + else + { + var sysPipingData = from technology in Funs.DB.PreRun_TechnologySysPiping + join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId + join termitem in Funs.DB.PreRun_SubInspectTermItem on technology.TechnologyId equals termitem.PropertyTechnologyId + where termitem.InspectionResults == 0 && termitem.InspectedUser == this.CurrUser.UserId + group technology by new { technology.TechnologyId, technology.TagNumber } into t + select new + { + Id = t.Key.TechnologyId, + Code = $"设备：({t.Key.TagNumber})" + }; + ddlQuestionTechnologyId.Items.Clear(); + if (sysPipingData.Count() > 0) + { + ddlQuestionTechnologyId.DataTextField = "Code"; + ddlQuestionTechnologyId.DataValueField = "Id"; + ddlQuestionTechnologyId.DataSource = sysPipingData; + ddlQuestionTechnologyId.DataBind(); + } + else + { + ddlQuestionTechnologyId.Items.Insert(0, new ListItem("==无数据==", "")); + } + } + } + } + + /// + /// 管道/设备 + /// + protected void ddlQuestionTechnologyId_SelectedIndexChanged(object sender, EventArgs e) + { + if (string.IsNullOrWhiteSpace(ddlQuestionTechnologyId.SelectedValue)) return; + var TermItemIds = Funs.DB.PreRun_InspectTailTerm.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TailTermId != this.TailTermId).Select(a => a.TermItemId).ToList(); + var list = new List(); + if (TermItemIds.Count > 0) + { + list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.PropertyTechnologyId == ddlQuestionTechnologyId.SelectedValue && !TermItemIds.Contains(x.TermItemId)).ToList(); + } + else + { + list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.PropertyTechnologyId == ddlQuestionTechnologyId.SelectedValue).ToList(); + } + ddlTermItemId.Items.Clear(); + if (list.Count() > 0) + { + ddlTermItemId.DataTextField = "WorkInspectName"; + ddlTermItemId.DataValueField = "TermItemId"; + ddlTermItemId.DataSource = list; + ddlTermItemId.DataBind(); + } + else + { + ddlTermItemId.Items.Insert(0, new ListItem("==无数据==", "")); + } + } + + /// + /// + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + } + + #endregion +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.designer.cs new file mode 100644 index 00000000..925aa731 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.designer.cs @@ -0,0 +1,269 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + + + public partial class InspectTailTermEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// txtProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// txtTailTermCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTailTermCode; + + /// + /// ddlConstructionUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlConstructionUnit; + + /// + /// ddlProblemType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlProblemType; + + /// + /// ddlQuestionTechnologyId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlQuestionTechnologyId; + + /// + /// ddlTermItemId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlTermItemId; + + /// + /// txtQuestionDesc 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtQuestionDesc; + + /// + /// txtRectifyOpinion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRectifyOpinion; + + /// + /// txtRectifyTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtRectifyTime; + + /// + /// ddlInspectUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlInspectUser; + + /// + /// ddlApproveUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlApproveUser; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnQuestionFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnQuestionFile; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// lblAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// imgBtnRectifyFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnRectifyFile; + + /// + /// plApprove2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow plApprove2; + + /// + /// gvApprove 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvApprove; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnSubmit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSubmit; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx new file mode 100644 index 00000000..71295e4f --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx @@ -0,0 +1,163 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectTailTermList.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.InspectTailTermList" %> + + + + + + + + + 质量巡检 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs new file mode 100644 index 00000000..6b3a6ad1 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs @@ -0,0 +1,243 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + public partial class InspectTailTermList : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + //绑定数据 + BindGrid(); + } + } + + + #region 绑定数据 + + /// + /// 数据绑定 + /// + public void BindGrid() + { + string strSql = @"select * from (select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.ProblemType,'管道' as ProblemTypeName,a.QuestionTechnologyId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交' when 1 then '退回' when 2 then '待审核' when 3 then '审核通过' else '待提交' end) as ApproveStateName,a.AddTime from PreRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser where a.ProblemType=1 and a.ProjectId=@projectid and c.InspectedUser=@InspectedUser union all select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.ProblemType,'设备' as ProblemTypeName,a.QuestionTechnologyId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交' when 1 then '退回' when 2 then '待审核' when 3 then '审核通过' else '待提交' end) as ApproveStateName,a.AddTime from PreRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser where a.ProblemType=2 and a.ProjectId=@projectid and c.InspectedUser=@InspectedUser) as t where 1=1 "; + List listStr = new List(); + listStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@InspectedUser", this.CurrUser.UserId)); + //问题类别 + if (!string.IsNullOrWhiteSpace(ddlProblemType.SelectedValue)) + { + strSql += " and t.ProblemType=@ProblemType"; + listStr.Add(new SqlParameter("@ProblemType", ddlProblemType.SelectedValue)); + } + //审核状态 + if (!string.IsNullOrWhiteSpace(ddlApproveState.SelectedValue)) + { + strSql += " and t.ApproveState=@ApproveState"; + listStr.Add(new SqlParameter("@ApproveState", ddlApproveState.SelectedValue)); + } + //开始时间 + if (!string.IsNullOrWhiteSpace(txtStartTime.Text)) + { + strSql += $" and t.RectifyTime>='{DateTime.Parse(txtStartTime.Text.Trim()).ToString("yyyy-MM-dd")} 00:00:00'"; + } + //结束时间 + if (!string.IsNullOrWhiteSpace(txtEndTime.Text)) + { + strSql += $" and t.RectifyTime<='{DateTime.Parse(txtStartTime.Text.Trim()).ToString("yyyy-MM-dd")} 23:59:59'"; + } + strSql += " order by AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 双击事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuModify_Click(null, null); + } + + /// + /// 分页下拉框 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 按钮 + + /// + /// 修改 + /// + protected void btnMenuModify_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ApproveState > 1) + { + Alert.ShowInTop("只可编辑“待提交”和“退回”的记录！", MessageBoxIcon.Warning); + return; + } + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}", Grid1.SelectedRowID, "编辑 - "))); + } + + /// + /// 新增 + /// + protected void btnNew_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId=", "新增 - "))); + } + + /// + /// 查看 + /// + protected void btnMenuView_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?IsView=true&TailTermId={0}", Grid1.SelectedRowID, "查看 - "))); + } + + /// + /// 删除 + /// + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ApproveState != 0) + { + Alert.ShowInTop("只可删除待提交的记录！", MessageBoxIcon.Warning); + return; + } + + Funs.DB.PreRun_InspectTailTerm.DeleteOnSubmit(model); + Funs.DB.SubmitChanges(); + BindGrid(); + Alert.ShowInTop("删除成功！", MessageBoxIcon.Success); + } + } + + /// + /// 查询 + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 弹框关闭 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + /// + /// 提交审核 + /// + protected void btnSubmitReview_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ApproveState > 1) + { + Alert.ShowInTop("只可提交“待提交”和“退回”的记录！", MessageBoxIcon.Warning); + return; + } + model.ApproveState = 2; + Funs.DB.SubmitChanges(); + BindGrid(); + Alert.ShowInTop("提交成功！", MessageBoxIcon.Success); + } + } + + /// + /// 撤回提交 + /// + protected void btnwithdraw_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ApproveState != 2) + { + Alert.ShowInTop("只可撤回“待审核”的记录！", MessageBoxIcon.Warning); + return; + } + model.ApproveState = 0; + Funs.DB.SubmitChanges(); + BindGrid(); + Alert.ShowInTop("撤回成功！", MessageBoxIcon.Success); + } + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.designer.cs new file mode 100644 index 00000000..5094bc84 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.designer.cs @@ -0,0 +1,206 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + + + public partial class InspectTailTermList + { + + /// + /// 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; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ddlProblemType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlProblemType; + + /// + /// ddlApproveState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlApproveState; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// btnSubmitReview 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSubmitReview; + + /// + /// btnwithdraw 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnwithdraw; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuModify; + + /// + /// btnMenuView 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuView; + + /// + /// btnMenuDel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDel; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx index a6a50fad..c24d23d3 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx @@ -18,7 +18,7 @@ + + + + + + + - + @@ -61,6 +91,21 @@ + + + + + + + + + + + + + + +
@@ -76,8 +121,36 @@ //检查人 var ddlInspectedUser = '<%= ddlInspectedUser.ClientID %>'; function renderInspectedUser(value) { - return F(ddlInspectedUser).getTextByValue(value); + if (value == -1) { + return ''; + } else { + return F(ddlInspectedUser).getTextByValue(value); + } } + + var ddbSysPipingClientID = '<%= ddbSysPiping.ClientID %>'; + var cbSysPipingClientID = '<%= cbSysPiping.ClientID %>'; + function onSelectAllClick() { + var cbSysPiping = F(cbSysPipingClientID); + $.each(cbSysPiping.items, function (index, item) { + item.setValue(true); + }); + + // 将数据控件中的值同步到输入框 + F(ddbSysPipingClientID).syncToBox(); + } + + + function onClearAllClick() { + var cbSysPiping = F(cbSysPipingClientID); + $.each(cbSysPiping.items, function (index, item) { + item.setValue(false); + }); + + // 将数据控件中的值同步到输入框 + F(ddbSysPipingClientID).syncToBox(); + } + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs index 15a190f0..799456ec 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs @@ -19,6 +19,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun if (!IsPostBack) { this.InitTreeMenu();//加载树 + PageInit(); } } @@ -37,6 +38,12 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun rootNode.ToolTip = ""; rootNode.EnableClickEvent = true; this.tvControlItem.Nodes.Add(rootNode); + + //var userSubInspects = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).ToList(); + //if (userSubInspects.Count == 0) return; + //var subSystemIds = userSubInspects.ConvertAll(x => x.SubSystemId); + //var workPackIds = userSubInspects.ConvertAll(x => x.WorkPackId); + var list = from a in Funs.DB.PreRun_SysDevice join b in Funs.DB.PreRun_SubSysWorkPackage on a.PreRunId equals b.SubSystemId join c in Funs.DB.PreRun_WorkPackage on b.WorkPackId equals c.WorkPackId @@ -45,6 +52,40 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun if (list.Count() > 0) { + var subSystemIds = list.Select(x => x.PreRunId).ToList(); + var workPackIds = list.Select(x => x.WorkPackId).ToList(); + var selectlist = new List(); + var sysPipingData = from proper in Funs.DB.PreRun_PropertySysPiping + join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId + join inspectterm in Funs.DB.PreRun_SubInspectTerm on selectproper.PropertyId equals inspectterm.PropertyTechnologyId + where subSystemIds.Contains(selectproper.SubSystemId) + select new SelectPropertyTechnology() + { + Id = proper.PropertyId, + Code = $"管道：({proper.PipingCode})", + WorkPackId = inspectterm.WorkPackId, + SubSystemId = selectproper.SubSystemId + }; + if (sysPipingData.Count() > 0) + { + selectlist.AddRange(sysPipingData); + } + var technologylist = from technology in Funs.DB.PreRun_TechnologySysPiping + join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId + join inspectterm in Funs.DB.PreRun_SubInspectTerm on selecttechnology.TechnologyId equals inspectterm.PropertyTechnologyId + where subSystemIds.Contains(selecttechnology.SubSystemId) + select new SelectPropertyTechnology() + { + Id = technology.TechnologyId, + Code = $"设备：({technology.TagNumber})", + WorkPackId = inspectterm.WorkPackId, + SubSystemId = selecttechnology.SubSystemId + }; + if (technologylist.Count() > 0) + { + selectlist.AddRange(technologylist); + } + var subList = list.GroupBy(x => new { x.PreRunId, x.PreRunCode, x.PreRunName }); foreach (var item in subList) { @@ -53,8 +94,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun rootUnitNode.Text = item.Key.PreRunName; rootUnitNode.ToolTip = item.Key.PreRunName; rootUnitNode.CommandName = ""; - rootUnitNode.EnableClickEvent = true; - rootUnitNode.EnableExpandEvent = true; + rootUnitNode.EnableClickEvent = false; + rootUnitNode.EnableExpandEvent = false; rootNode.Nodes.Add(rootUnitNode); rootUnitNode.Expanded = true; var worklist = list.Where(a => a.PreRunId == item.Key.PreRunId).GroupBy(x => new { x.WorkPackId, x.WorkPackName }).ToList(); @@ -67,13 +108,66 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun newNode.NodeID = itemWork.Key.WorkPackId + "|" + item.Key.PreRunId; newNode.ToolTip = itemWork.Key.WorkPackName; newNode.CommandName = ""; - newNode.EnableClickEvent = true; - rootUnitNode.Nodes.Add(newNode); + newNode.Expanded = true; + var workselects = selectlist.Where(x => x.SubSystemId == item.Key.PreRunId && x.WorkPackId == itemWork.Key.WorkPackId); + if (workselects.Count() > 0) + { + newNode.EnableClickEvent = false; + newNode.EnableExpandEvent = false; + rootUnitNode.Nodes.Add(newNode); + foreach (var itemSelect in workselects) + { + TreeNode newNodeSelect = new TreeNode(); + newNodeSelect.Text = itemSelect.Code; + newNodeSelect.NodeID = itemWork.Key.WorkPackId + "|" + item.Key.PreRunId + "|" + itemSelect.Id; + newNodeSelect.ToolTip = itemSelect.Code; + newNodeSelect.CommandName = ""; + newNodeSelect.EnableClickEvent = true; + newNodeSelect.EnableExpandEvent = true; + newNode.Nodes.Add(newNodeSelect); + newNodeSelect.Expanded = true; + } + } + else + { + newNode.EnableClickEvent = true; + newNode.EnableExpandEvent = true; + rootUnitNode.Nodes.Add(newNode); + } } } } } + } + /// + /// 绑定下拉框 + /// + public void PageInit() + { + var userList = Funs.DB.Sys_User; + if (userList.Count() > 0) + { + ddlfbs.DataTextField = "UserName"; + ddlfbs.DataValueField = "UserId"; + ddlfbs.DataSource = userList; + ddlfbs.DataBind(); + + ddlcbs.DataTextField = "UserName"; + ddlcbs.DataValueField = "UserId"; + ddlcbs.DataSource = userList; + ddlcbs.DataBind(); + + ddljl.DataTextField = "UserName"; + ddljl.DataValueField = "UserId"; + ddljl.DataSource = userList; + ddljl.DataBind(); + + ddlyz.DataTextField = "UserName"; + ddlyz.DataValueField = "UserId"; + ddlyz.DataSource = userList; + ddlyz.DataBind(); + } } /// @@ -91,14 +185,125 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// /// 绑定数据 /// - public void BindGrid() + public void BindGrid(bool typechange = true) { var result = new List(); - var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First(); - var subSystemId = this.tvControlItem.SelectedNodeID.Split('|').Last(); + var sysPipingData = new List(); + var workPackId = this.tvControlItem.SelectedNodeID.Split('|')[0]; + var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1]; + var propertytechnologyid = string.Empty; + if (this.tvControlItem.SelectedNodeID.Split('|').Length > 2) + { + propertytechnologyid = this.tvControlItem.SelectedNodeID.Split('|').Last(); + } + if (typechange) + { + var workPage = Funs.DB.PreRun_WorkPackage.FirstOrDefault(x => x.WorkPackId == workPackId); + if (workPage != null) + { + //加载类型 + if (workPage.WorkPackType == 0) + { + ddlWorkPackType.Items.Clear(); + ddlWorkPackType.Items.Insert(0, new ListItem("管道", "1")); + ddlWorkPackType.Items.Insert(1, new ListItem("设备", "2")); + ddlWorkPackType.SelectedValue = "1"; + } + if (workPage.WorkPackType == 1) + { + ddlWorkPackType.Items.Clear(); + ddlWorkPackType.Items.Insert(0, new ListItem("管道", "1")); + ddlWorkPackType.SelectedValue = "1"; + } + if (workPage.WorkPackType == 2) + { + ddlWorkPackType.Items.Clear(); + ddlWorkPackType.Items.Insert(0, new ListItem("设备", "2")); + ddlWorkPackType.SelectedValue = "2"; + } + //加载数据 + if (ddlWorkPackType.SelectedValue == "1") + { + var sysData = from proper in Funs.DB.PreRun_PropertySysPiping + join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId + where selectproper.SubSystemId == subSystemId + select new SelectPropertyTechnology() + { + Id = proper.PropertyId, + Code = $"管道：({proper.PipingCode})" + }; + if (sysData.Count() > 0) + { + sysPipingData = sysData.ToList(); + cbSysPiping.DataTextField = "Code"; + cbSysPiping.DataValueField = "Id"; + cbSysPiping.DataSource = sysPipingData; + cbSysPiping.DataBind(); + } + else + { + cbSysPiping.Items.Clear(); + cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", "")); + } + } + else + { + var sysData = from technology in Funs.DB.PreRun_TechnologySysPiping + join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId + where selecttechnology.SubSystemId == subSystemId + select new SelectPropertyTechnology() + { + Id = technology.TechnologyId, + Code = $"设备：({technology.TagNumber})" + }; + if (sysData.Count() > 0) + { + sysPipingData = sysData.ToList(); + cbSysPiping.DataTextField = "Code"; + cbSysPiping.DataValueField = "Id"; + cbSysPiping.DataSource = sysPipingData; + cbSysPiping.DataBind(); + } + else + { + cbSysPiping.Items.Clear(); + cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", "")); + } + } + } + } + //获取子系统 var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId); - var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId).OrderBy(x => x.Sort).ToList(); + //获取主表数据 + var workPackType = int.Parse(ddlWorkPackType.SelectedValue); + var subModel = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId && x.WorkPackType == workPackType && x.PropertyTechnologyId == propertytechnologyid); + if (subModel != null) + { + if (subModel.WorkPackType != null) + { + ddlWorkPackType.SelectedValue = subModel.WorkPackType.ToString(); + ddlWorkPackType.Enabled = false; + } + var ddlsysModel = sysPipingData.FirstOrDefault(x => x.Id == subModel.PropertyTechnologyId); + if (ddlsysModel != null) + { + ddbSysPiping.Value = ddlsysModel.Id; + ddbSysPiping.Text = ddlsysModel.Code; + } + ddlfbs.SelectedValue = subModel.Subcontractor; + ddlcbs.SelectedValue = subModel.Contractor; + ddljl.SelectedValue = subModel.Supervision; + ddlyz.SelectedValue = subModel.Owner; + } + else + { + ddlfbs.SelectedValue = string.Empty; + ddlcbs.SelectedValue = string.Empty; + ddljl.SelectedValue = string.Empty; + ddlyz.SelectedValue = string.Empty; + } + var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId && x.WorkPackType == workPackType && x.PropertyTechnologyId == propertytechnologyid).OrderBy(x => x.Sort).ToList(); if (list.Count > 0) { foreach (var item in list) @@ -114,6 +319,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun model.SystemId = subSysModel.SystemId; model.SubSystemId = subSysModel.PreRunId; model.InspectedUser = item.InspectedUser; + model.InspectionResults = item.InspectionResults; + model.InspectionIllustrate = item.InspectionIllustrate; model.Sort = item.Sort; model.isChick = true; result.Add(model); @@ -147,7 +354,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun } Grid1.DataSource = result; Grid1.DataBind(); - if(result.Count(x => x.isChick)>0) + if (result.Count(x => x.isChick) > 0) { //默认选中行 var checkids = result.Where(x => x.isChick).Select(a => a.SubItemId); @@ -169,58 +376,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun ddlInspectedUser.DataValueField = "UserId"; ddlInspectedUser.DataSource = data; ddlInspectedUser.DataBind(); - - - #region 注释 - //var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First(); - //var subSystemId = this.tvControlItem.SelectedNodeID.Split('|').Last(); - ////获取子系统 - //var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId); - //var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId).OrderBy(x => x.Sort).ToList(); - //if (list.Count == 0) - //{ - // list = new List(); - // var defaultDatas = Funs.DB.PreRun_WorkInspectTemplate.Where(s => s.WorkPackId == workPackId).OrderBy(x=>x.Sort).ToList(); - // if (defaultDatas.Count > 0) - // { - // int index = 0; - // foreach (var item in defaultDatas) - // { - // var model = new PreRun_SubInspectTermItem(); - // model.SubItemId = Guid.NewGuid().ToString(); - // model.ProjectId = this.CurrUser.LoginProjectId; - // model.WorkPackId = item.WorkPackId; - // model.WorkInspectId = item.WorkInspectId; - // model.WorkInspectName = item.WorkInspectName; - // model.InstallationId = subSysModel.InstallationId; - // model.ProcessesId = subSysModel.ProcessesId; - // model.SystemId = subSysModel.SystemId; - // model.SubSystemId = subSysModel.PreRunId; - // model.Sort = index + 1; - // list.Add(model); - // index++; - // } - // } - //} - - //Grid1.DataSource = list; - //Grid1.DataBind(); - ////检查人绑定 - //var userList = from user in Funs.DB.Sys_User join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId where projectrole.ProjectId == this.CurrUser.LoginProjectId select user; - - //var userids = new List() { Const.sysglyId, Const.hfnbdId, Const.sedinId }; - //var addUserList = Funs.DB.Sys_User.Where(x => userids.Contains(x.UserId)); - //var data = userList.ToList(); - //if (addUserList.Count() > 0) - //{ - // data.AddRange(addUserList); - //} - //DropDownList ddlInspectedUser = Grid1.FindColumn("InspectedUser").FindControl("ddlInspectedUser") as DropDownList; - //ddlInspectedUser.DataTextField = "UserName"; - //ddlInspectedUser.DataValueField = "UserId"; - //ddlInspectedUser.DataSource = data; - //ddlInspectedUser.DataBind(); - #endregion } /// @@ -233,7 +388,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun BindGrid(); } - /// /// 行按钮事件 /// @@ -270,75 +424,129 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { try { + if (string.IsNullOrWhiteSpace(ddlfbs.SelectedValue)) + { + ShowNotify("请选择分包商!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlcbs.SelectedValue)) + { + ShowNotify("请选择承包商!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddljl.SelectedValue)) + { + ShowNotify("请选择监理!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlyz.SelectedValue)) + { + ShowNotify("请选择业主!", MessageBoxIcon.Warning); + return; + } + if (ddbSysPiping.Values.Length == 0) + { + ShowNotify("请选择设备!", MessageBoxIcon.Warning); + return; + } if (Grid1.SelectedRowIndexArray.Length == 0) { ShowNotify("请选择一条数据!", MessageBoxIcon.Warning); return; } - var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First(); - var subSystemId = this.tvControlItem.SelectedNodeID.Split('|').Last(); - var subTrem = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubSystemId == subSystemId && x.WorkPackId == workPackId); - JArray mergedData = Grid1.GetMergedData(); - foreach (JObject mergedRow in mergedData) + + var workPackId = this.tvControlItem.SelectedNodeID.Split('|')[0]; + var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1]; + var workPackType = int.Parse(ddlWorkPackType.SelectedValue); + + List subTrems = new List(); + List subTremItems = new List(); + + foreach (var item in ddbSysPiping.Values) { - string status = mergedRow.Value("status"); - JObject values = mergedRow.Value("values"); - int i = mergedRow.Value("index"); - var subItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); - var workInspectId = this.Grid1.Rows[i].DataKeys[1].ToString(); - if (!Grid1.SelectedRowIndexArray.Contains(i)) continue; - - //获取子系统信息 - var list = new List(); - var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId); - if (subSysModel != null) + var subTrem = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubSystemId == subSystemId && x.WorkPackId == workPackId && x.WorkPackType == workPackType && x.PropertyTechnologyId == item); + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) { - //获取子系统工作包检查表，如果不存在则添加 - if (subTrem == null) - { - subTrem = new PreRun_SubInspectTerm(); - subTrem.SubInspectId = Guid.NewGuid().ToString(); - subTrem.WorkPackId = workPackId; - subTrem.ProjectId = this.CurrUser.LoginProjectId; - subTrem.InstallationId = subSysModel.InstallationId; - subTrem.ProcessesId = subSysModel.ProcessesId; - subTrem.SystemId = subSysModel.SystemId; - subTrem.SubSystemId = subSysModel.PreRunId; - subTrem.AddUser = this.CurrUser.UserId; - subTrem.AddTime = DateTime.Now; - Funs.DB.PreRun_SubInspectTerm.InsertOnSubmit(subTrem); - } + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + var subItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); + var workInspectId = this.Grid1.Rows[i].DataKeys[1].ToString(); + if (!Grid1.SelectedRowIndexArray.Contains(i)) continue; - var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.SubItemId == subItemId); - if (model == null) + //获取子系统信息 + var list = new List(); + var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId); + if (subSysModel != null) { - model = new PreRun_SubInspectTermItem(); - model.SubItemId = subItemId; - model.SubInspectId = subTrem.SubInspectId; - model.WorkPackId = workPackId; - model.ProjectId = this.CurrUser.LoginProjectId; - model.WorkInspectId = workInspectId; - model.WorkInspectName = values.Value("WorkInspectName"); - model.InstallationId = subSysModel.InstallationId; - model.ProcessesId = subSysModel.ProcessesId; - model.SystemId = subSysModel.SystemId; - model.SubSystemId = subSysModel.PreRunId; - model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value("InspectedUser")) ? values.Value("InspectedUser") : string.Empty; - model.AddUser = this.CurrUser.UserId; - model.AddTime = DateTime.Now; - model.Sort = i + 1; - Funs.DB.PreRun_SubInspectTermItem.InsertOnSubmit(model); - } - else - { - model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value("InspectedUser")) ? values.Value("InspectedUser") : string.Empty; - model.WorkInspectName = values.Value("WorkInspectName"); - Funs.DB.SubmitChanges(); + //获取子系统工作包检查表，如果不存在则添加 + if (subTrem == null) + { + subTrem = new PreRun_SubInspectTerm(); + subTrem.SubInspectId = Guid.NewGuid().ToString(); + subTrem.WorkPackId = workPackId; + subTrem.ProjectId = this.CurrUser.LoginProjectId; + subTrem.InstallationId = subSysModel.InstallationId; + subTrem.ProcessesId = subSysModel.ProcessesId; + subTrem.SystemId = subSysModel.SystemId; + subTrem.SubSystemId = subSysModel.PreRunId; + subTrem.Subcontractor = ddlfbs.SelectedValue; + subTrem.Contractor = ddlcbs.SelectedValue; + subTrem.Supervision = ddljl.SelectedValue; + subTrem.Owner = ddlyz.SelectedValue; + subTrem.PropertyTechnologyId = item; + subTrem.WorkPackType = int.Parse(ddlWorkPackType.SelectedValue); + subTrem.AddUser = this.CurrUser.UserId; + subTrem.AddTime = DateTime.Now; + subTrems.Add(subTrem); + //Funs.DB.PreRun_SubInspectTerm.InsertOnSubmit(subTrem); + } + + var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.SubItemId == subItemId && x.PropertyTechnologyId == item); + if (model == null) + { + model = new PreRun_SubInspectTermItem(); + model.TermItemId = Guid.NewGuid().ToString(); + model.SubItemId = subItemId; + model.SubInspectId = subTrem.SubInspectId; + model.WorkPackId = workPackId; + model.ProjectId = this.CurrUser.LoginProjectId; + model.WorkInspectId = workInspectId; + model.WorkInspectName = values.Value("WorkInspectName"); + model.InstallationId = subSysModel.InstallationId; + model.ProcessesId = subSysModel.ProcessesId; + model.SystemId = subSysModel.SystemId; + model.SubSystemId = subSysModel.PreRunId; + model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value("InspectedUser")) ? values.Value("InspectedUser") : string.Empty; + model.Subcontractor = ddlfbs.SelectedValue; + model.Contractor = ddlcbs.SelectedValue; + model.Supervision = ddljl.SelectedValue; + model.Owner = ddlyz.SelectedValue; + model.PropertyTechnologyId = item; + model.WorkPackType = int.Parse(ddlWorkPackType.SelectedValue); + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + model.Sort = i + 1; + subTremItems.Add(model); + //Funs.DB.PreRun_SubInspectTermItem.InsertOnSubmit(model); + } + else + { + model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value("InspectedUser")) ? values.Value("InspectedUser") : string.Empty; + model.WorkInspectName = values.Value("WorkInspectName"); + Funs.DB.SubmitChanges(); + } } + //Funs.DB.SubmitChanges(); } - Funs.DB.SubmitChanges(); } - BindGrid(); + + Funs.DB.PreRun_SubInspectTerm.InsertAllOnSubmit(subTrems); + Funs.DB.PreRun_SubInspectTermItem.InsertAllOnSubmit(subTremItems); + Funs.DB.SubmitChanges(); + this.InitTreeMenu(); + //BindGrid(); ShowNotify("保存成功!"); } catch (Exception ex) @@ -353,8 +561,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun protected void btnAdd_Click(object sender, EventArgs e) { var list = gvList(); - var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First(); - var subSystemId = this.tvControlItem.SelectedNodeID.Split('|').Last(); + var workPackId = this.tvControlItem.SelectedNodeID.Split('|')[0]; + var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1]; //获取子系统 var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId); if (subSysModel != null) @@ -453,5 +661,91 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun public bool isChick { get; set; } } + /// + /// 类型 + /// + protected void ddlWorkPackType_SelectedIndexChanged(object sender, EventArgs e) + { + var workPackId = this.tvControlItem.SelectedNodeID.Split('|')[0]; + var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1]; + if (ddlWorkPackType.SelectedValue == "1") + { + var sysPipingData = from proper in Funs.DB.PreRun_PropertySysPiping + join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId + where selectproper.SubSystemId == subSystemId + select new + { + Id = proper.PropertyId, + Code = $"管道：({proper.PipingCode})" + }; + if (sysPipingData.Count() > 0) + { + cbSysPiping.DataTextField = "Code"; + cbSysPiping.DataValueField = "Id"; + cbSysPiping.DataSource = sysPipingData; + cbSysPiping.DataBind(); + } + else + { + cbSysPiping.Items.Clear(); + cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", "")); + } + } + else + { + var sysPipingData = from technology in Funs.DB.PreRun_TechnologySysPiping + join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId + where selecttechnology.SubSystemId == subSystemId + select new + { + Id = technology.TechnologyId, + Code = $"设备：({technology.TagNumber})" + }; + if (sysPipingData.Count() > 0) + { + cbSysPiping.DataTextField = "Code"; + cbSysPiping.DataValueField = "Id"; + cbSysPiping.DataSource = sysPipingData; + cbSysPiping.DataBind(); + } + else + { + cbSysPiping.Items.Clear(); + cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", "")); + } + } + + } + + /// + /// 设备选择 + /// + protected void ddlSysPiping_SelectedIndexChanged(object sender, EventArgs e) + { + BindGrid(false); + } + + /// + /// 子系统选择的管道/设备 + /// + public class SelectPropertyTechnology + { + /// + /// 主键 + /// + public string Id { get; set; } + /// + /// 编码 + /// + public string Code { get; set; } + /// + /// 工作包主键 + /// + public string WorkPackId { get; set; } + /// + /// 子系统主键 + /// + public string SubSystemId { get; set; } + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs index 3e1fd3a0..c3219fca 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs @@ -77,6 +77,69 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// protected global::FineUIPro.Toolbar Toolbar1; + /// + /// ddlWorkPackType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlWorkPackType; + + /// + /// ddbSysPiping 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownBox ddbSysPiping; + + /// + /// SimpleForm2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.SimpleForm SimpleForm2; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// cbSysPiping 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBoxList cbSysPiping; + + /// + /// btnSelectAll 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSelectAll; + + /// + /// btnClearAll 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClearAll; + /// /// ToolbarFill 控件。 /// @@ -130,5 +193,59 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblInspectionResults; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// ddlfbs 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlfbs; + + /// + /// ddlcbs 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlcbs; + + /// + /// ddljl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddljl; + + /// + /// ddlyz 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlyz; } } diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx index 78d19a08..79c7704c 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx @@ -18,7 +18,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs index 34e7fc5f..b2a82a63 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs @@ -28,8 +28,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// private void InitTreeMenu() { - - this.tvControlItem.Nodes.Clear(); TreeNode rootNode = new TreeNode(); rootNode.Text = "检查表"; @@ -48,9 +46,39 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun join c in Funs.DB.PreRun_WorkPackage on b.WorkPackId equals c.WorkPackId where a.ProjectId == this.CurrUser.LoginProjectId && subSystemIds.Contains(a.PreRunId) && workPackIds.Contains(c.WorkPackId) select new { a.PreRunId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackName }; - if (list.Count() > 0) { + var selectlist = new List(); + var sysPipingData = from proper in Funs.DB.PreRun_PropertySysPiping + join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId + join inspectterm in Funs.DB.PreRun_SubInspectTerm on selectproper.PropertyId equals inspectterm.PropertyTechnologyId + where subSystemIds.Contains(selectproper.SubSystemId) + select new SelectPropertyTechnology() + { + Id = proper.PropertyId, + Code = $"管道：({proper.PipingCode})", + WorkPackId = inspectterm.WorkPackId, + SubSystemId = selectproper.SubSystemId + }; + if (sysPipingData.Count() > 0) + { + selectlist.AddRange(sysPipingData); + } + var technologylist = from technology in Funs.DB.PreRun_TechnologySysPiping + join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId + join inspectterm in Funs.DB.PreRun_SubInspectTerm on selecttechnology.TechnologyId equals inspectterm.PropertyTechnologyId + where subSystemIds.Contains(selecttechnology.SubSystemId) + select new SelectPropertyTechnology() + { + Id = technology.TechnologyId, + Code = $"设备：({technology.TagNumber})", + WorkPackId = inspectterm.WorkPackId, + SubSystemId = selecttechnology.SubSystemId + }; + if (technologylist.Count() > 0) + { + selectlist.AddRange(technologylist); + } var subList = list.GroupBy(x => new { x.PreRunId, x.PreRunCode, x.PreRunName }); foreach (var item in subList) { @@ -59,8 +87,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun rootUnitNode.Text = item.Key.PreRunName; rootUnitNode.ToolTip = item.Key.PreRunName; rootUnitNode.CommandName = ""; - rootUnitNode.EnableClickEvent = true; - rootUnitNode.EnableExpandEvent = true; + rootUnitNode.EnableClickEvent = false; + rootUnitNode.EnableExpandEvent = false; rootNode.Nodes.Add(rootUnitNode); rootUnitNode.Expanded = true; var worklist = list.Where(a => a.PreRunId == item.Key.PreRunId).GroupBy(x => new { x.WorkPackId, x.WorkPackName }).ToList(); @@ -73,13 +101,31 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun newNode.NodeID = itemWork.Key.WorkPackId + "|" + item.Key.PreRunId; newNode.ToolTip = itemWork.Key.WorkPackName; newNode.CommandName = ""; - newNode.EnableClickEvent = true; + newNode.EnableClickEvent = false; + newNode.EnableExpandEvent = false; rootUnitNode.Nodes.Add(newNode); + newNode.Expanded = true; + if (selectlist.Count > 0) + { + var workselects = selectlist.Where(x => x.SubSystemId == item.Key.PreRunId && x.WorkPackId == itemWork.Key.WorkPackId); + foreach (var itemSelect in workselects) + { + TreeNode newNodeSelect = new TreeNode(); + newNodeSelect.Text = itemSelect.Code; + newNodeSelect.NodeID = itemWork.Key.WorkPackId + "|" + item.Key.PreRunId + "|" + itemSelect.Id; + newNodeSelect.ToolTip = itemSelect.Code; + newNodeSelect.CommandName = ""; + newNodeSelect.EnableClickEvent = true; + newNodeSelect.EnableExpandEvent = true; + newNode.Nodes.Add(newNodeSelect); + newNodeSelect.Expanded = true; + } + } + } } } } - } /// @@ -100,10 +146,11 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun public void BindGrid() { var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First(); - var subSystemId = this.tvControlItem.SelectedNodeID.Split('|').Last(); + var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1]; + var propertytechnologyid = this.tvControlItem.SelectedNodeID.Split('|').Last(); //获取子系统 var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId); - var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId && x.InspectedUser == this.CurrUser.UserId).ToList(); + var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId && x.PropertyTechnologyId == propertytechnologyid && x.InspectedUser == this.CurrUser.UserId).OrderBy(x => x.Sort).ToList(); Grid1.DataSource = list; Grid1.DataBind(); } @@ -120,6 +167,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun #endregion + #region 保存 + /// /// 保存 /// @@ -134,13 +183,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun JObject values = mergedRow.Value("values"); int i = mergedRow.Value("index"); var subItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); - //获取子系统信息 - var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.SubItemId == subItemId); + var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == subItemId); if (model != null) { model.InspectionIllustrate = !string.IsNullOrWhiteSpace(values.Value("InspectionIllustrate")) ? values.Value("InspectionIllustrate") : string.Empty; - model.InspectionResults = !string.IsNullOrWhiteSpace(values.Value("InspectionResults")) ? int.Parse(values.Value("InspectionResults")) : -1; + if (!string.IsNullOrWhiteSpace(values.Value("InspectionResults"))) + { + model.InspectionResults = int.Parse(values.Value("InspectionResults")); + } Funs.DB.SubmitChanges(); } } @@ -152,5 +203,31 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun ShowNotify(ex.Message, MessageBoxIcon.Error); } } + + #endregion + + /// + /// 子系统选择的管道/设备 + /// + public class SelectPropertyTechnology + { + /// + /// 主键 + /// + public string Id { get; set; } + /// + /// 编码 + /// + public string Code { get; set; } + /// + /// 工作包主键 + /// + public string WorkPackId { get; set; } + /// + /// 子系统主键 + /// + public string SubSystemId { get; set; } + } + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.designer.cs index 438b75b9..7c66f4c6 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.designer.cs @@ -102,7 +102,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtInspectionIllustrate; + protected global::FineUIPro.TextArea txtInspectionIllustrate; /// /// ddlInspectionResults 控件。 diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx new file mode 100644 index 00000000..3ece5bf3 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx @@ -0,0 +1,139 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TailTermApprove.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.TailTermApprove" %> + + + + + + 质量巡检 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.cs new file mode 100644 index 00000000..9d666bea --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.cs @@ -0,0 +1,221 @@ +using BLL; +using Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + public partial class TailTermApprove : PageBase + { + /// + /// 主键 + /// + public string TailTermId + { + get { return (string)ViewState["TailTermId"]; } + set { ViewState["TailTermId"] = value; } + } + + /// + /// 问题图片是否可编辑 + /// + public int QuestionEditImg + { + get { return (int)ViewState["QuestionEditImg"]; } + set { ViewState["QuestionEditImg"] = value; } + } + + /// + /// 整改图片是否可编辑 + /// + public int RectifyEditImg + { + get { return (int)ViewState["RectifyEditImg"]; } + set { ViewState["RectifyEditImg"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.TailTermId = Request["TailTermId"]; + this.QuestionEditImg = -1; + this.RectifyEditImg = -1; + //数据绑定 + PageInit(); + } + } + + /// + /// 绑定数据 + /// + public void PageInit() + { + //获取用户信息 + var users = from user in Funs.DB.Sys_User + join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId + where projectrole.ProjectId == this.CurrUser.LoginProjectId + select user; + //检查人和审核人 + if (users.Count() > 0) + { + //检查人 + ddlApproveUser.DataTextField = "UserName"; + ddlApproveUser.DataValueField = "UserId"; + ddlApproveUser.DataSource = users; + ddlApproveUser.DataBind(); + } + txtApproveTime.Text = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"); + ddlApproveUser.SelectedValue = this.CurrUser.UserId; + + var data = from tail in Funs.DB.PreRun_InspectTailTerm + join unit in Funs.DB.Base_Unit on tail.ConstructionUnit equals unit.UnitId + join inspuser in Funs.DB.Sys_User on tail.InspectUser equals inspuser.UserId + join approuser in Funs.DB.Sys_User on tail.ApproveUser equals approuser.UserId + join termitem in Funs.DB.PreRun_SubInspectTermItem on tail.TermItemId equals termitem.TermItemId + where tail.TailTermId == this.TailTermId + select new + { + tail.ProjectName, + tail.TailTermCode, + unit.UnitName, + TermItemName = termitem.WorkInspectName, + tail.QuestionTechnologyId, + tail.QuestionDesc, + tail.RectifyOpinion, + tail.RectifyTime, + tail.ProblemType, + InspectUserName = inspuser.UserName, + ApproveUserName = approuser.UserName, + + }; + if (data.Count() > 0) + { + var model = data.FirstOrDefault(); + //项目名称 + lblProjectName.Text = model.ProjectName; + //巡检编号 + lblTailTermCode.Text = model.TailTermCode; + //施工单位 + lblConstructionUnit.Text = model.UnitName; + //问题类别 + lblProblemType.Text = model.ProblemType == 1 ? "管道" : "设备"; + //管道/设备 + if (model.ProblemType == 1) + { + var piping = Funs.DB.PreRun_PropertySysPiping.FirstOrDefault(x => x.PropertyId == model.QuestionTechnologyId); + if (piping != null) + { + lblQuestionTechnologyId.Text = $"管道：{piping.PipingCode}"; + } + } + else + { + var piping = Funs.DB.PreRun_TechnologySysPiping.FirstOrDefault(x => x.TechnologyId == model.QuestionTechnologyId); + if (piping != null) + { + lblQuestionTechnologyId.Text = $"设备：{piping.TagNumber}"; + } + } + //检查项 + lblTermItemId.Text = model.TermItemName; + //问题描述 + lblQuestionDesc.Text = model.QuestionDesc; + //整改意见 + lblRectifyOpinion.Text = model.RectifyOpinion; + //整改时间 + lblRectifyTime.Text = model.RectifyTime != null ? model.RectifyTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty; + //检查人 + lblInspectUser.Text = model.InspectUserName; + } + } + + /// + /// 问题图片 + /// + protected void imgBtnQuestionFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", QuestionEditImg, this.TailTermId + "q", Const.InspectTailTerm))); + } + + /// + /// 整改图片 + /// + protected void imgBtnRectifyFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", RectifyEditImg, this.TailTermId + "h", Const.InspectTailTerm))); + } + + /// + /// 退回 + /// + protected void btnReturn_Click(object sender, EventArgs e) + { + var tailTerm = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (tailTerm != null) + { + tailTerm.ApproveState = 1; + var model = new PreRun_InspectTermApproveRecords(); + model.InspectTermId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.TermItemId = tailTerm.TermItemId; + model.TailTermId = this.TailTermId; + model.ApproveOpinion = txtApproveOpinion.Text; + model.ApproveTime = DateTime.Parse(txtApproveTime.Text); + model.ApproveUser = ddlApproveUser.SelectedValue; + model.ApproveState = 0; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.PreRun_InspectTermApproveRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("退回成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 通过 + /// + protected void btnPass_Click(object sender, EventArgs e) + { + var tailTerm = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (tailTerm != null) + { + //获取审核项 + var termItemModel = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == tailTerm.TermItemId); + if (termItemModel != null) + { + termItemModel.InspectionResults = 1; + } + tailTerm.ApproveState = 3; + var model = new PreRun_InspectTermApproveRecords(); + model.InspectTermId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.TermItemId = tailTerm.TermItemId; + model.TailTermId = this.TailTermId; + model.ApproveOpinion = txtApproveOpinion.Text; + model.ApproveTime = DateTime.Parse(txtApproveTime.Text); + model.ApproveUser = ddlApproveUser.SelectedValue; + model.ApproveState = 1; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.PreRun_InspectTermApproveRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("审核成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 关闭 + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.designer.cs new file mode 100644 index 00000000..39880e3c --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.designer.cs @@ -0,0 +1,269 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + + + public partial class TailTermApprove + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// lblProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblProjectName; + + /// + /// lblTailTermCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblTailTermCode; + + /// + /// lblConstructionUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblConstructionUnit; + + /// + /// lblProblemType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblProblemType; + + /// + /// lblQuestionTechnologyId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblQuestionTechnologyId; + + /// + /// lblTermItemId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblTermItemId; + + /// + /// lblQuestionDesc 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblQuestionDesc; + + /// + /// lblRectifyOpinion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblRectifyOpinion; + + /// + /// lblInspectUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblInspectUser; + + /// + /// lblRectifyTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblRectifyTime; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnQuestionFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnQuestionFile; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// lblAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// imgBtnRectifyFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnRectifyFile; + + /// + /// ddlApproveUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlApproveUser; + + /// + /// txtApproveTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtApproveTime; + + /// + /// txtApproveOpinion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtApproveOpinion; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnReturn 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnReturn; + + /// + /// btnPass 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPass; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx new file mode 100644 index 00000000..3b1fe59c --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx @@ -0,0 +1,145 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TailTermApproveList.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.TailTermApproveList" %> + + + + + + + + + 质量巡检审核 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.cs new file mode 100644 index 00000000..52a18145 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.cs @@ -0,0 +1,138 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + public partial class TailTermApproveList : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + //绑定数据 + BindGrid(); + } + } + + #region 绑定数据 + + /// + /// 数据绑定 + /// + public void BindGrid() + { + string strSql = @"select * from (select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.ProblemType,'管道' as ProblemTypeName,a.QuestionTechnologyId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交' when 1 then '退回' when 2 then '待审核' when 3 then '审核通过' else '待提交' end) as ApproveStateName,a.AddTime from PreRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser where a.ProblemType=1 and a.ApproveState>1 and a.ProjectId=@projectid and a.ApproveUser=@ApproveUser union all select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.ProblemType,'设备' as ProblemTypeName,a.QuestionTechnologyId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交' when 1 then '退回' when 2 then '待审核' when 3 then '审核通过' else '待提交' end) as ApproveStateName,a.AddTime from PreRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser where a.ProblemType=2 and a.ApproveState>1 and a.ProjectId=@projectid and a.ApproveUser=@ApproveUser) as t where 1=1 "; + List listStr = new List(); + listStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@ApproveUser", this.CurrUser.UserId)); + //问题类别 + if (!string.IsNullOrWhiteSpace(ddlProblemType.SelectedValue)) + { + strSql += " and t.ProblemType=@ProblemType"; + listStr.Add(new SqlParameter("@ProblemType", ddlProblemType.SelectedValue)); + } + //审核状态 + if (!string.IsNullOrWhiteSpace(ddlApproveState.SelectedValue)) + { + strSql += " and t.ApproveState=@ApproveState"; + listStr.Add(new SqlParameter("@ApproveState", ddlApproveState.SelectedValue)); + } + strSql += " order by AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 双击事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuApprove_Click(null, null); + } + + /// + /// 分页下拉框 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + /// + /// 关闭弹框 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + /// + /// 审核 + /// + protected void btnReview_Click(object sender, EventArgs e) + { + btnMenuApprove_Click(null, null); + } + + /// + /// 审核 + /// + protected void btnMenuApprove_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ApproveState != 2) + { + Alert.ShowInTop("只可审核“待审核”的记录！", MessageBoxIcon.Warning); + return; + } + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TailTermApprove.aspx?TailTermId={0}", Grid1.SelectedRowID, "审核 - "))); + } + + /// + /// 搜索 + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.designer.cs new file mode 100644 index 00000000..ad651684 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.designer.cs @@ -0,0 +1,152 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + + + public partial class TailTermApproveList + { + + /// + /// 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; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ddlProblemType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlProblemType; + + /// + /// ddlApproveState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlApproveState; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnReview 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnReview; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuApprove 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuApprove; + } +} diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index a3d83c74..e7ec2600 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1625,6 +1625,12 @@ namespace Model partial void InsertPersonTrain_TrainPlan(PersonTrain_TrainPlan instance); partial void UpdatePersonTrain_TrainPlan(PersonTrain_TrainPlan instance); partial void DeletePersonTrain_TrainPlan(PersonTrain_TrainPlan instance); + partial void InsertPreRun_InspectTailTerm(PreRun_InspectTailTerm instance); + partial void UpdatePreRun_InspectTailTerm(PreRun_InspectTailTerm instance); + partial void DeletePreRun_InspectTailTerm(PreRun_InspectTailTerm instance); + partial void InsertPreRun_InspectTermApproveRecords(PreRun_InspectTermApproveRecords instance); + partial void UpdatePreRun_InspectTermApproveRecords(PreRun_InspectTermApproveRecords instance); + partial void DeletePreRun_InspectTermApproveRecords(PreRun_InspectTermApproveRecords instance); partial void InsertPreRun_PropertySysPiping(PreRun_PropertySysPiping instance); partial void UpdatePreRun_PropertySysPiping(PreRun_PropertySysPiping instance); partial void DeletePreRun_PropertySysPiping(PreRun_PropertySysPiping instance); @@ -6686,6 +6692,22 @@ namespace Model } } + public System.Data.Linq.Table PreRun_InspectTailTerm + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table PreRun_InspectTermApproveRecords + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table PreRun_PropertySysPiping { get @@ -259168,6 +259190,730 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PreRun_InspectTailTerm")] + public partial class PreRun_InspectTailTerm : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _TailTermId; + + private string _ProjectId; + + private string _ProjectName; + + private string _TailTermCode; + + private string _ConstructionUnit; + + private System.Nullable _ProblemType; + + private string _QuestionTechnologyId; + + private string _TermItemId; + + private string _WorkPackId; + + private string _QuestionDesc; + + private string _RectifyOpinion; + + private System.Nullable _RectifyTime; + + private string _InspectUser; + + private string _ApproveUser; + + private System.Nullable _ApproveState; + + private string _AddUser; + + private System.Nullable _AddTime; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnTailTermIdChanging(string value); + partial void OnTailTermIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnProjectNameChanging(string value); + partial void OnProjectNameChanged(); + partial void OnTailTermCodeChanging(string value); + partial void OnTailTermCodeChanged(); + partial void OnConstructionUnitChanging(string value); + partial void OnConstructionUnitChanged(); + partial void OnProblemTypeChanging(System.Nullable value); + partial void OnProblemTypeChanged(); + partial void OnQuestionTechnologyIdChanging(string value); + partial void OnQuestionTechnologyIdChanged(); + partial void OnTermItemIdChanging(string value); + partial void OnTermItemIdChanged(); + partial void OnWorkPackIdChanging(string value); + partial void OnWorkPackIdChanged(); + partial void OnQuestionDescChanging(string value); + partial void OnQuestionDescChanged(); + partial void OnRectifyOpinionChanging(string value); + partial void OnRectifyOpinionChanged(); + partial void OnRectifyTimeChanging(System.Nullable value); + partial void OnRectifyTimeChanged(); + partial void OnInspectUserChanging(string value); + partial void OnInspectUserChanged(); + partial void OnApproveUserChanging(string value); + partial void OnApproveUserChanged(); + partial void OnApproveStateChanging(System.Nullable value); + partial void OnApproveStateChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + #endregion + + public PreRun_InspectTailTerm() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TailTermId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string TailTermId + { + get + { + return this._TailTermId; + } + set + { + if ((this._TailTermId != value)) + { + this.OnTailTermIdChanging(value); + this.SendPropertyChanging(); + this._TailTermId = value; + this.SendPropertyChanged("TailTermId"); + this.OnTailTermIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="VarChar(50)")] + public string ProjectName + { + get + { + return this._ProjectName; + } + set + { + if ((this._ProjectName != value)) + { + this.OnProjectNameChanging(value); + this.SendPropertyChanging(); + this._ProjectName = value; + this.SendPropertyChanged("ProjectName"); + this.OnProjectNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TailTermCode", DbType="VarChar(50)")] + public string TailTermCode + { + get + { + return this._TailTermCode; + } + set + { + if ((this._TailTermCode != value)) + { + this.OnTailTermCodeChanging(value); + this.SendPropertyChanging(); + this._TailTermCode = value; + this.SendPropertyChanged("TailTermCode"); + this.OnTailTermCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionUnit", DbType="VarChar(50)")] + public string ConstructionUnit + { + get + { + return this._ConstructionUnit; + } + set + { + if ((this._ConstructionUnit != value)) + { + this.OnConstructionUnitChanging(value); + this.SendPropertyChanging(); + this._ConstructionUnit = value; + this.SendPropertyChanged("ConstructionUnit"); + this.OnConstructionUnitChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemType", DbType="Int")] + public System.Nullable ProblemType + { + get + { + return this._ProblemType; + } + set + { + if ((this._ProblemType != value)) + { + this.OnProblemTypeChanging(value); + this.SendPropertyChanging(); + this._ProblemType = value; + this.SendPropertyChanged("ProblemType"); + this.OnProblemTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionTechnologyId", DbType="VarChar(50)")] + public string QuestionTechnologyId + { + get + { + return this._QuestionTechnologyId; + } + set + { + if ((this._QuestionTechnologyId != value)) + { + this.OnQuestionTechnologyIdChanging(value); + this.SendPropertyChanging(); + this._QuestionTechnologyId = value; + this.SendPropertyChanged("QuestionTechnologyId"); + this.OnQuestionTechnologyIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TermItemId", DbType="VarChar(50)")] + public string TermItemId + { + get + { + return this._TermItemId; + } + set + { + if ((this._TermItemId != value)) + { + this.OnTermItemIdChanging(value); + this.SendPropertyChanging(); + this._TermItemId = value; + this.SendPropertyChanged("TermItemId"); + this.OnTermItemIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackId", DbType="VarChar(50)")] + public string WorkPackId + { + get + { + return this._WorkPackId; + } + set + { + if ((this._WorkPackId != value)) + { + this.OnWorkPackIdChanging(value); + this.SendPropertyChanging(); + this._WorkPackId = value; + this.SendPropertyChanged("WorkPackId"); + this.OnWorkPackIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionDesc", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string QuestionDesc + { + get + { + return this._QuestionDesc; + } + set + { + if ((this._QuestionDesc != value)) + { + this.OnQuestionDescChanging(value); + this.SendPropertyChanging(); + this._QuestionDesc = value; + this.SendPropertyChanged("QuestionDesc"); + this.OnQuestionDescChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string RectifyOpinion + { + get + { + return this._RectifyOpinion; + } + set + { + if ((this._RectifyOpinion != value)) + { + this.OnRectifyOpinionChanging(value); + this.SendPropertyChanging(); + this._RectifyOpinion = value; + this.SendPropertyChanged("RectifyOpinion"); + this.OnRectifyOpinionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyTime", DbType="DateTime")] + public System.Nullable RectifyTime + { + get + { + return this._RectifyTime; + } + set + { + if ((this._RectifyTime != value)) + { + this.OnRectifyTimeChanging(value); + this.SendPropertyChanging(); + this._RectifyTime = value; + this.SendPropertyChanged("RectifyTime"); + this.OnRectifyTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectUser", DbType="VarChar(50)")] + public string InspectUser + { + get + { + return this._InspectUser; + } + set + { + if ((this._InspectUser != value)) + { + this.OnInspectUserChanging(value); + this.SendPropertyChanging(); + this._InspectUser = value; + this.SendPropertyChanged("InspectUser"); + this.OnInspectUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] + public string ApproveUser + { + get + { + return this._ApproveUser; + } + set + { + if ((this._ApproveUser != value)) + { + this.OnApproveUserChanging(value); + this.SendPropertyChanging(); + this._ApproveUser = value; + this.SendPropertyChanged("ApproveUser"); + this.OnApproveUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] + public System.Nullable ApproveState + { + get + { + return this._ApproveState; + } + set + { + if ((this._ApproveState != value)) + { + this.OnApproveStateChanging(value); + this.SendPropertyChanging(); + this._ApproveState = value; + this.SendPropertyChanged("ApproveState"); + this.OnApproveStateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PreRun_InspectTermApproveRecords")] + public partial class PreRun_InspectTermApproveRecords : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _InspectTermId; + + private string _ProjectId; + + private string _TermItemId; + + private string _TailTermId; + + private string _ApproveOpinion; + + private System.Nullable _ApproveTime; + + private string _ApproveUser; + + private System.Nullable _ApproveState; + + private string _AddUser; + + private System.Nullable _AddTime; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnInspectTermIdChanging(string value); + partial void OnInspectTermIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnTermItemIdChanging(string value); + partial void OnTermItemIdChanged(); + partial void OnTailTermIdChanging(string value); + partial void OnTailTermIdChanged(); + partial void OnApproveOpinionChanging(string value); + partial void OnApproveOpinionChanged(); + partial void OnApproveTimeChanging(System.Nullable value); + partial void OnApproveTimeChanged(); + partial void OnApproveUserChanging(string value); + partial void OnApproveUserChanged(); + partial void OnApproveStateChanging(System.Nullable value); + partial void OnApproveStateChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + #endregion + + public PreRun_InspectTermApproveRecords() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTermId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string InspectTermId + { + get + { + return this._InspectTermId; + } + set + { + if ((this._InspectTermId != value)) + { + this.OnInspectTermIdChanging(value); + this.SendPropertyChanging(); + this._InspectTermId = value; + this.SendPropertyChanged("InspectTermId"); + this.OnInspectTermIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TermItemId", DbType="VarChar(50)")] + public string TermItemId + { + get + { + return this._TermItemId; + } + set + { + if ((this._TermItemId != value)) + { + this.OnTermItemIdChanging(value); + this.SendPropertyChanging(); + this._TermItemId = value; + this.SendPropertyChanged("TermItemId"); + this.OnTermItemIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TailTermId", DbType="VarChar(50)")] + public string TailTermId + { + get + { + return this._TailTermId; + } + set + { + if ((this._TailTermId != value)) + { + this.OnTailTermIdChanging(value); + this.SendPropertyChanging(); + this._TailTermId = value; + this.SendPropertyChanged("TailTermId"); + this.OnTailTermIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string ApproveOpinion + { + get + { + return this._ApproveOpinion; + } + set + { + if ((this._ApproveOpinion != value)) + { + this.OnApproveOpinionChanging(value); + this.SendPropertyChanging(); + this._ApproveOpinion = value; + this.SendPropertyChanged("ApproveOpinion"); + this.OnApproveOpinionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveTime", DbType="DateTime")] + public System.Nullable ApproveTime + { + get + { + return this._ApproveTime; + } + set + { + if ((this._ApproveTime != value)) + { + this.OnApproveTimeChanging(value); + this.SendPropertyChanging(); + this._ApproveTime = value; + this.SendPropertyChanged("ApproveTime"); + this.OnApproveTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] + public string ApproveUser + { + get + { + return this._ApproveUser; + } + set + { + if ((this._ApproveUser != value)) + { + this.OnApproveUserChanging(value); + this.SendPropertyChanging(); + this._ApproveUser = value; + this.SendPropertyChanged("ApproveUser"); + this.OnApproveUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] + public System.Nullable ApproveState + { + get + { + return this._ApproveState; + } + set + { + if ((this._ApproveState != value)) + { + this.OnApproveStateChanging(value); + this.SendPropertyChanging(); + this._ApproveState = value; + this.SendPropertyChanged("ApproveState"); + this.OnApproveStateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PreRun_PropertySysPiping")] public partial class PreRun_PropertySysPiping : INotifyPropertyChanging, INotifyPropertyChanged { @@ -259762,6 +260508,18 @@ namespace Model private System.Nullable _AddTime; + private string _Subcontractor; + + private string _Contractor; + + private string _Supervision; + + private string _Owner; + + private System.Nullable _WorkPackType; + + private string _PropertyTechnologyId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -259788,6 +260546,18 @@ namespace Model partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnSubcontractorChanging(string value); + partial void OnSubcontractorChanged(); + partial void OnContractorChanging(string value); + partial void OnContractorChanged(); + partial void OnSupervisionChanging(string value); + partial void OnSupervisionChanged(); + partial void OnOwnerChanging(string value); + partial void OnOwnerChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); #endregion public PreRun_SubInspectTerm() @@ -260015,6 +260785,126 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")] + public string Subcontractor + { + get + { + return this._Subcontractor; + } + set + { + if ((this._Subcontractor != value)) + { + this.OnSubcontractorChanging(value); + this.SendPropertyChanging(); + this._Subcontractor = value; + this.SendPropertyChanged("Subcontractor"); + this.OnSubcontractorChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Contractor", DbType="VarChar(50)")] + public string Contractor + { + get + { + return this._Contractor; + } + set + { + if ((this._Contractor != value)) + { + this.OnContractorChanging(value); + this.SendPropertyChanging(); + this._Contractor = value; + this.SendPropertyChanged("Contractor"); + this.OnContractorChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Supervision", DbType="VarChar(50)")] + public string Supervision + { + get + { + return this._Supervision; + } + set + { + if ((this._Supervision != value)) + { + this.OnSupervisionChanging(value); + this.SendPropertyChanging(); + this._Supervision = value; + this.SendPropertyChanged("Supervision"); + this.OnSupervisionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Owner", DbType="VarChar(50)")] + public string Owner + { + get + { + return this._Owner; + } + set + { + if ((this._Owner != value)) + { + this.OnOwnerChanging(value); + this.SendPropertyChanging(); + this._Owner = value; + this.SendPropertyChanged("Owner"); + this.OnOwnerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")] + public string PropertyTechnologyId + { + get + { + return this._PropertyTechnologyId; + } + set + { + if ((this._PropertyTechnologyId != value)) + { + this.OnPropertyTechnologyIdChanging(value); + this.SendPropertyChanging(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -260042,6 +260932,8 @@ namespace Model private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + private string _TermItemId; + private string _SubItemId; private string _SubInspectId; @@ -260068,6 +260960,18 @@ namespace Model private string _InspectionIllustrate; + private string _Subcontractor; + + private string _Contractor; + + private string _Supervision; + + private string _Owner; + + private System.Nullable _WorkPackType; + + private string _PropertyTechnologyId; + private string _Remark; private string _AddUser; @@ -260080,6 +260984,8 @@ namespace Model partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnCreated(); + partial void OnTermItemIdChanging(string value); + partial void OnTermItemIdChanged(); partial void OnSubItemIdChanging(string value); partial void OnSubItemIdChanged(); partial void OnSubInspectIdChanging(string value); @@ -260106,6 +261012,18 @@ namespace Model partial void OnInspectionResultsChanged(); partial void OnInspectionIllustrateChanging(string value); partial void OnInspectionIllustrateChanged(); + partial void OnSubcontractorChanging(string value); + partial void OnSubcontractorChanged(); + partial void OnContractorChanging(string value); + partial void OnContractorChanged(); + partial void OnSupervisionChanging(string value); + partial void OnSupervisionChanged(); + partial void OnOwnerChanging(string value); + partial void OnOwnerChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); partial void OnAddUserChanging(string value); @@ -260121,7 +261039,27 @@ namespace Model OnCreated(); } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubItemId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TermItemId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string TermItemId + { + get + { + return this._TermItemId; + } + set + { + if ((this._TermItemId != value)) + { + this.OnTermItemIdChanging(value); + this.SendPropertyChanging(); + this._TermItemId = value; + this.SendPropertyChanged("TermItemId"); + this.OnTermItemIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubItemId", DbType="VarChar(50)")] public string SubItemId { get @@ -260381,6 +261319,126 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")] + public string Subcontractor + { + get + { + return this._Subcontractor; + } + set + { + if ((this._Subcontractor != value)) + { + this.OnSubcontractorChanging(value); + this.SendPropertyChanging(); + this._Subcontractor = value; + this.SendPropertyChanged("Subcontractor"); + this.OnSubcontractorChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Contractor", DbType="VarChar(50)")] + public string Contractor + { + get + { + return this._Contractor; + } + set + { + if ((this._Contractor != value)) + { + this.OnContractorChanging(value); + this.SendPropertyChanging(); + this._Contractor = value; + this.SendPropertyChanged("Contractor"); + this.OnContractorChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Supervision", DbType="VarChar(50)")] + public string Supervision + { + get + { + return this._Supervision; + } + set + { + if ((this._Supervision != value)) + { + this.OnSupervisionChanging(value); + this.SendPropertyChanging(); + this._Supervision = value; + this.SendPropertyChanged("Supervision"); + this.OnSupervisionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Owner", DbType="VarChar(50)")] + public string Owner + { + get + { + return this._Owner; + } + set + { + if ((this._Owner != value)) + { + this.OnOwnerChanging(value); + this.SendPropertyChanging(); + this._Owner = value; + this.SendPropertyChanged("Owner"); + this.OnOwnerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")] + public string PropertyTechnologyId + { + get + { + return this._PropertyTechnologyId; + } + set + { + if ((this._PropertyTechnologyId != value)) + { + this.OnPropertyTechnologyIdChanging(value); + this.SendPropertyChanging(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(200)")] public string Remark { @@ -262192,6 +263250,8 @@ namespace Model private System.Nullable _Sort; + private System.Nullable _WorkPackType; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -262208,6 +263268,8 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); #endregion public PreRun_WorkPackage() @@ -262335,6 +263397,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; From a274f30199f58a2e9fdf3b2c96ff1fb84ddebff1 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 19 Sep 2023 16:15:10 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 608607e3..2bc153c3 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -14975,12 +14975,14 @@ InspectTailTermEdit.aspx + ASPXCodeBehind InspectTailTermEdit.aspx InspectTailTermList.aspx + ASPXCodeBehind InspectTailTermList.aspx @@ -15050,12 +15052,14 @@ TailTermApprove.aspx + ASPXCodeBehind TailTermApprove.aspx TailTermApproveList.aspx + ASPXCodeBehind TailTermApproveList.aspx