From fe3341b8cc830a5e55500d32c3efcae23b8a4cdb Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 21 Sep 2023 15:54:21 +0800 Subject: [PATCH] =?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-20.sql | 474 +++++++++ SGGL/BLL/API/HSSE/APILicenseDataService.cs | 950 +++++++++++++++--- SGGL/BLL/Common/Const.cs | 4 + SGGL/BLL/HSSE/License/LicensePublicService.cs | 8 +- .../File/Word/HSSE/临时用电作业票.doc | Bin 29184 -> 27136 bytes .../File/Word/HSSE/动土作业票.doc | Bin 40960 -> 23552 bytes .../File/Word/HSSE/动火作业票.doc | Bin 31744 -> 29696 bytes .../File/Word/HSSE/受限空间作业票.doc | Bin 45056 -> 27136 bytes .../File/Word/HSSE/吊装作业票.doc | Bin 43008 -> 26624 bytes .../File/Word/HSSE/夜间施工作业票.doc | Bin 39936 -> 23040 bytes .../File/Word/HSSE/射线作业票.doc | Bin 41472 -> 24576 bytes .../File/Word/HSSE/断路（占道）作业票.doc | Bin 40960 -> 23552 bytes .../File/Word/HSSE/高处作业票.doc | Bin 44032 -> 27136 bytes .../HSSE/License/BreakGround.aspx | 2 +- .../HSSE/License/BreakGroundView.aspx | 108 +- .../HSSE/License/BreakGroundView.aspx.cs | 102 +- .../License/BreakGroundView.aspx.designer.cs | 175 +++- .../HSSE/License/Electricity.aspx | 2 +- .../HSSE/License/Electricity.aspx.cs | 2 +- .../HSSE/License/ElectricityView.aspx | 107 +- .../HSSE/License/ElectricityView.aspx.cs | 102 +- .../License/ElectricityView.aspx.designer.cs | 175 +++- SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx | 2 +- .../HSSE/License/FireWorkView.aspx | 106 +- .../HSSE/License/FireWorkView.aspx.cs | 102 +- .../License/FireWorkView.aspx.designer.cs | 175 +++- .../HSSE/License/HeightWork.aspx | 2 +- .../HSSE/License/HeightWorkView.aspx | 105 +- .../HSSE/License/HeightWorkView.aspx.cs | 102 +- .../License/HeightWorkView.aspx.designer.cs | 175 +++- .../HSSE/License/LiftingWork.aspx | 2 +- .../HSSE/License/LiftingWorkView.aspx | 109 +- .../HSSE/License/LiftingWorkView.aspx.cs | 102 +- .../License/LiftingWorkView.aspx.designer.cs | 175 +++- .../HSSE/License/LimitedSpace.aspx | 2 +- .../HSSE/License/LimitedSpaceView.aspx | 109 +- .../HSSE/License/LimitedSpaceView.aspx.cs | 102 +- .../License/LimitedSpaceView.aspx.designer.cs | 175 +++- .../FineUIPro.Web/HSSE/License/NightWork.aspx | 2 +- .../HSSE/License/NightWorkView.aspx | 150 ++- .../HSSE/License/NightWorkView.aspx.cs | 90 +- .../License/NightWorkView.aspx.designer.cs | 226 ++--- .../HSSE/License/OpenCircuit.aspx | 2 +- .../HSSE/License/OpenCircuitView.aspx | 109 +- .../HSSE/License/OpenCircuitView.aspx.cs | 102 +- .../License/OpenCircuitView.aspx.designer.cs | 175 +++- .../HSSE/License/RadialWork.aspx | 2 +- .../HSSE/License/RadialWorkView.aspx | 107 +- .../HSSE/License/RadialWorkView.aspx.cs | 102 +- .../License/RadialWorkView.aspx.designer.cs | 175 +++- SGGL/Model/APIItem/HSSE/LicenseDataItem.cs | 5 + 51 files changed, 4488 insertions(+), 515 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-09-20.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-20.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-20.sql new file mode 100644 index 00000000..20e24b23 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-20.sql @@ -0,0 +1,474 @@ +delete from Sys_MenuFlowOperate; + +--ҵƱ +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('0c1a6c13-1cb8-45e8-a415-d93c4f2dd4c0','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B',1,1,1,'ְʩ',0) +GO +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('211e7843-7986-4fd3-80ef-a0d01c0d1261','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B',2,1,1,'ְHSE',0) +GO +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('ac7d5fec-6bfe-4fbe-b385-1617691fa13f','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B',3,1,1,'廷ʩ',0) +GO +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('d8477641-40ef-485e-92b7-3c5ddce7b9ce','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B',4,1,1,'廷HSE',0) +GO +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('dc0fc1b6-f9bf-4810-94fb-473e8f9721d5','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B',5,1,1,'',1) +GO +--ߴҵƱ +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('817F4373-5A30-4197-9793-5ACB0152E80F','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9',1,1,1,'ְʩ',0) +GO +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('BF3A7FAD-6265-4228-ACB4-03DCA3581270','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9',2,1,1,'ְHSE',0) +GO +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('A71C71E1-9BAB-4AF6-A0DC-BFF18299FFEA','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9',3,1,1,'廷ʩ',0) +GO +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('6630FC39-44FB-4B50-BA0D-7DEDB628F5EE','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9',4,1,1,'廷HSE',0) +GO +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('45CAC29E-986E-4FCE-BE6F-C1FE085A0AD6','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9',5,1,1,'',1) +GO +--޿ռҵƱ +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('034452AD-92AB-4956-ACF6-BE89FE01BECE','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7',1,1,1,'ְʩ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('A0F4DE31-59C6-4DF9-B6AB-B559BC70FCAB','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7',2,1,1,'ְHSE',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('A41B5815-8D40-4EB7-89EC-2A5E18D8EE8A','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7',3,1,1,'廷ʩ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('B72FAA80-D647-41EB-89B7-0A4A48DC53ED','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7',4,1,1,'廷HSE',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('B34C3254-91A5-45B9-8592-CBE7BCA2AF60','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7',5,1,1,'',1) +GO +--ҵƱ +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('FD0271ED-6CAB-4FC2-8645-E530F0724A79','F72FF20B-D3EB-46A5-97F7-C99B2473A140',1,1,1,'ְʩ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('98448443-8BB2-4D29-B174-FF0EADD4711D','F72FF20B-D3EB-46A5-97F7-C99B2473A140',2,1,1,'ְHSE',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('EAC9F894-0ED7-49D3-A397-88B53E5C1D74','F72FF20B-D3EB-46A5-97F7-C99B2473A140',3,1,1,'廷ʩ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('E5CE0A69-CF76-4685-A164-7F665DA26627','F72FF20B-D3EB-46A5-97F7-C99B2473A140',4,1,1,'廷HSE',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('1D75313C-8C94-416B-84CE-37A41E376A76','F72FF20B-D3EB-46A5-97F7-C99B2473A140',5,1,1,'',1) +GO +--·(ռ)ҵƱ +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('FE783A32-17ED-4BFC-917B-413C8DB246CC','4E607E83-41FC-4F49-B26F-A21CFE38328F',1,1,1,'ְʩ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('EEA2A984-C229-48A5-972B-1D99D2C18475','4E607E83-41FC-4F49-B26F-A21CFE38328F',2,1,1,'ְHSE',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('D0C91634-29A7-43E2-98A3-62FA148AA517','4E607E83-41FC-4F49-B26F-A21CFE38328F',3,1,1,'廷ʩ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('13FE0C64-AE97-47E9-8637-6904A87ECCE9','4E607E83-41FC-4F49-B26F-A21CFE38328F',4,1,1,'廷HSE',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('6BA6D160-3D1C-4333-92E1-996A3F13AECC','4E607E83-41FC-4F49-B26F-A21CFE38328F',5,1,1,'',1) +GO +--ҵƱ +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('755C6AC9-2E38-4D4F-AF33-33CB1744A9071','755C6AC9-2E38-4D4F-AF33-33CB1744A907',1,1,1,'ְʩ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('755C6AC9-2E38-4D4F-AF33-33CB1744A9072','755C6AC9-2E38-4D4F-AF33-33CB1744A907',2,1,1,'ְHSE',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('755C6AC9-2E38-4D4F-AF33-33CB1744A9073','755C6AC9-2E38-4D4F-AF33-33CB1744A907',3,1,1,'廷ʩ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('755C6AC9-2E38-4D4F-AF33-33CB1744A9074','755C6AC9-2E38-4D4F-AF33-33CB1744A907',4,1,1,'廷HSE',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('755C6AC9-2E38-4D4F-AF33-33CB1744A9077','755C6AC9-2E38-4D4F-AF33-33CB1744A907',5,1,1,'',1) +GO +--ҹʩҵƱ +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('7BBAE649-7B00-4475-A911-BFE3A37AC55B1','7BBAE649-7B00-4475-A911-BFE3A37AC55B',1,1,1,'ְʩ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('7BBAE649-7B00-4475-A911-BFE3A37AC55B2','7BBAE649-7B00-4475-A911-BFE3A37AC55B',2,1,1,'ְHSE',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('7BBAE649-7B00-4475-A911-BFE3A37AC55B3','7BBAE649-7B00-4475-A911-BFE3A37AC55B',3,1,1,'廷ʩ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('7BBAE649-7B00-4475-A911-BFE3A37AC55B4','7BBAE649-7B00-4475-A911-BFE3A37AC55B',4,1,1,'廷HSE',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('7BBAE649-7B00-4475-A911-BFE3A37AC55B7','7BBAE649-7B00-4475-A911-BFE3A37AC55B',5,1,1,'',1) +GO +--װҵƱ +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('A1BE3AB6-9D4A-41E7-8870-E734231654511','A1BE3AB6-9D4A-41E7-8870-E73423165451',1,1,1,'ְʩ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('A1BE3AB6-9D4A-41E7-8870-E734231654512','A1BE3AB6-9D4A-41E7-8870-E73423165451',2,1,1,'ְHSE',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('A1BE3AB6-9D4A-41E7-8870-E734231654513','A1BE3AB6-9D4A-41E7-8870-E73423165451',3,1,1,'廷ʩ',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('A1BE3AB6-9D4A-41E7-8870-E734231654514','A1BE3AB6-9D4A-41E7-8870-E73423165451',4,1,1,'廷HSE',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('A1BE3AB6-9D4A-41E7-8870-E734231654517','A1BE3AB6-9D4A-41E7-8870-E73423165451',5,1,1,'',1) +GO + +--ʱҵƱ +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,'ְHSE',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',4,1,1,'廷HSE',0) +INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd) +VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF57','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',5,1,1,'',1); +GO + + +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' OR States= '6') + 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' OR States= '6') + 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' OR States= '6') + 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' OR States= '6') + 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' OR States= '6') + 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' OR States= '6') + 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' OR States= '6') + 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' OR States= '6') + AND License.NextManId LIKE '%'+ @userId+'%' + +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' OR States= '6') + 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)) + +ORDER BY DataTime DESC +END + + + + + + diff --git a/SGGL/BLL/API/HSSE/APILicenseDataService.cs b/SGGL/BLL/API/HSSE/APILicenseDataService.cs index 431a9686..6c1cb375 100644 --- a/SGGL/BLL/API/HSSE/APILicenseDataService.cs +++ b/SGGL/BLL/API/HSSE/APILicenseDataService.cs @@ -1443,6 +1443,50 @@ namespace BLL updateFireWork.CancelTime = newFireWork.ValidityEndTime; } } + //增加关闭提交 + else if (newItem.States==Const.State_6) + { + updateFireWork.CloseManId = newFireWork.CloseManId; + updateFireWork.CloseReasons = newFireWork.CloseReasons; + updateFireWork.CloseTime = DateTime.Now; + updateFireWork.NextManId = newItem.NextManId; + if (newFireWork.ValidityEndTime.HasValue && newFireWork.ValidityEndTime < DateTime.Now) + { + updateFireWork.CloseTime = newFireWork.ValidityEndTime; + } + //增加到审核表 关闭只需要最后一个人审批 + var sysMenuFlowOperate = from x in db.Sys_MenuFlowOperate + where x.MenuId == newItem.MenuId + && x.FlowStep!=1 && x.FlowStep != 2 && x.FlowStep != 3 + select x; + foreach (var item in sysMenuFlowOperate) + { + if (item.FlowStep == 4) + { + item.AuditFlowName = "关闭意见"; + } + Model.License_FlowOperate newFlowOperate = new Model.License_FlowOperate + { + FlowOperateId = SQLHelper.GetNewID(), + ProjectId = projectId, + DataId = strLicenseId, + MenuId = item.MenuId, + AuditFlowName = item.AuditFlowName, + SortIndex = item.FlowStep, + GroupNum = item.GroupNum, + OrderNum = item.OrderNum, + RoleIds = item.RoleId, + IsFlowEnd = item.IsFlowEnd, + IsAgree = null, + Opinion = null, + OperaterTime = null, + OperaterId = string.IsNullOrEmpty(newItem.NextManId) ? null : newItem.NextManId + }; + db.License_FlowOperate.InsertOnSubmit(newFlowOperate); + db.SubmitChanges(); + } + + } else { updateFireWork.WorkPalce = newFireWork.WorkPalce; @@ -1537,6 +1581,50 @@ namespace BLL updateHeightWork.CancelTime = newHeightWork.ValidityEndTime; } } + //增加关闭提交 + else if (newItem.States == Const.State_6) + { + updateHeightWork.CloseManId = newHeightWork.CloseManId; + updateHeightWork.CloseReasons = newHeightWork.CloseReasons; + updateHeightWork.CloseTime = DateTime.Now; + updateHeightWork.NextManId = newItem.NextManId; + if (newHeightWork.ValidityEndTime.HasValue && newHeightWork.ValidityEndTime < DateTime.Now) + { + updateHeightWork.CloseTime = newHeightWork.ValidityEndTime; + } + //增加到审核表 关闭只需要最后一个人审批 + var sysMenuFlowOperate = from x in db.Sys_MenuFlowOperate + where x.MenuId == newItem.MenuId + && x.FlowStep != 1 && x.FlowStep != 2 && x.FlowStep != 3 + select x; + foreach (var item in sysMenuFlowOperate) + { + if (item.FlowStep == 4) + { + item.AuditFlowName = "关闭意见"; + } + Model.License_FlowOperate newFlowOperate = new Model.License_FlowOperate + { + FlowOperateId = SQLHelper.GetNewID(), + ProjectId = projectId, + DataId = strLicenseId, + MenuId = item.MenuId, + AuditFlowName = item.AuditFlowName, + SortIndex = item.FlowStep, + GroupNum = item.GroupNum, + OrderNum = item.OrderNum, + RoleIds = item.RoleId, + IsFlowEnd = item.IsFlowEnd, + IsAgree = null, + Opinion = null, + OperaterTime = null, + OperaterId = string.IsNullOrEmpty(newItem.NextManId) ? null : newItem.NextManId + }; + db.License_FlowOperate.InsertOnSubmit(newFlowOperate); + db.SubmitChanges(); + } + + } else { updateHeightWork.WorkPalce = newHeightWork.WorkPalce; @@ -1633,6 +1721,50 @@ namespace BLL updateLimitedSpace.CancelTime = newLimitedSpace.ValidityEndTime; } } + //增加关闭提交 + else if (newItem.States == Const.State_6) + { + updateLimitedSpace.CloseManId = newLimitedSpace.CloseManId; + updateLimitedSpace.CloseReasons = newLimitedSpace.CloseReasons; + updateLimitedSpace.CloseTime = DateTime.Now; + updateLimitedSpace.NextManId = newItem.NextManId; + if (newLimitedSpace.ValidityEndTime.HasValue && newLimitedSpace.ValidityEndTime < DateTime.Now) + { + updateLimitedSpace.CloseTime = newLimitedSpace.ValidityEndTime; + } + //增加到审核表 关闭只需要最后一个人审批 + var sysMenuFlowOperate = from x in db.Sys_MenuFlowOperate + where x.MenuId == newItem.MenuId + && x.FlowStep != 1 && x.FlowStep != 2 && x.FlowStep != 3 + select x; + foreach (var item in sysMenuFlowOperate) + { + if (item.FlowStep == 4) + { + item.AuditFlowName = "关闭意见"; + } + Model.License_FlowOperate newFlowOperate = new Model.License_FlowOperate + { + FlowOperateId = SQLHelper.GetNewID(), + ProjectId = projectId, + DataId = strLicenseId, + MenuId = item.MenuId, + AuditFlowName = item.AuditFlowName, + SortIndex = item.FlowStep, + GroupNum = item.GroupNum, + OrderNum = item.OrderNum, + RoleIds = item.RoleId, + IsFlowEnd = item.IsFlowEnd, + IsAgree = null, + Opinion = null, + OperaterTime = null, + OperaterId = string.IsNullOrEmpty(newItem.NextManId) ? null : newItem.NextManId + }; + db.License_FlowOperate.InsertOnSubmit(newFlowOperate); + db.SubmitChanges(); + } + + } else { updateLimitedSpace.WorkPalce = newLimitedSpace.WorkPalce; @@ -1730,6 +1862,50 @@ namespace BLL updateRadialWork.CancelTime = newRadialWork.ValidityEndTime; } } + //增加关闭提交 + else if (newItem.States == Const.State_6) + { + updateRadialWork.CloseManId = newRadialWork.CloseManId; + updateRadialWork.CloseReasons = newRadialWork.CloseReasons; + updateRadialWork.CloseTime = DateTime.Now; + updateRadialWork.NextManId = newItem.NextManId; + if (newRadialWork.ValidityEndTime.HasValue && newRadialWork.ValidityEndTime < DateTime.Now) + { + updateRadialWork.CloseTime = newRadialWork.ValidityEndTime; + } + //增加到审核表 关闭只需要最后一个人审批 + var sysMenuFlowOperate = from x in db.Sys_MenuFlowOperate + where x.MenuId == newItem.MenuId + && x.FlowStep != 1 && x.FlowStep != 2 && x.FlowStep != 3 + select x; + foreach (var item in sysMenuFlowOperate) + { + if (item.FlowStep == 4) + { + item.AuditFlowName = "关闭意见"; + } + Model.License_FlowOperate newFlowOperate = new Model.License_FlowOperate + { + FlowOperateId = SQLHelper.GetNewID(), + ProjectId = projectId, + DataId = strLicenseId, + MenuId = item.MenuId, + AuditFlowName = item.AuditFlowName, + SortIndex = item.FlowStep, + GroupNum = item.GroupNum, + OrderNum = item.OrderNum, + RoleIds = item.RoleId, + IsFlowEnd = item.IsFlowEnd, + IsAgree = null, + Opinion = null, + OperaterTime = null, + OperaterId = string.IsNullOrEmpty(newItem.NextManId) ? null : newItem.NextManId + }; + db.License_FlowOperate.InsertOnSubmit(newFlowOperate); + db.SubmitChanges(); + } + + } else { updateRadialWork.RadialType = newRadialWork.RadialType; @@ -1822,6 +1998,50 @@ namespace BLL updateOpenCircuit.CancelTime = newOpenCircuit.ValidityEndTime; } } + //增加关闭提交 + else if (newItem.States == Const.State_6) + { + updateOpenCircuit.CloseManId = newOpenCircuit.CloseManId; + updateOpenCircuit.CloseReasons = newOpenCircuit.CloseReasons; + updateOpenCircuit.CloseTime = DateTime.Now; + updateOpenCircuit.NextManId = newItem.NextManId; + if (newOpenCircuit.ValidityEndTime.HasValue && newOpenCircuit.ValidityEndTime < DateTime.Now) + { + updateOpenCircuit.CloseTime = newOpenCircuit.ValidityEndTime; + } + //增加到审核表 关闭只需要最后一个人审批 + var sysMenuFlowOperate = from x in db.Sys_MenuFlowOperate + where x.MenuId == newItem.MenuId + && x.FlowStep != 1 && x.FlowStep != 2 && x.FlowStep != 3 + select x; + foreach (var item in sysMenuFlowOperate) + { + if (item.FlowStep == 4) + { + item.AuditFlowName = "关闭意见"; + } + Model.License_FlowOperate newFlowOperate = new Model.License_FlowOperate + { + FlowOperateId = SQLHelper.GetNewID(), + ProjectId = projectId, + DataId = strLicenseId, + MenuId = item.MenuId, + AuditFlowName = item.AuditFlowName, + SortIndex = item.FlowStep, + GroupNum = item.GroupNum, + OrderNum = item.OrderNum, + RoleIds = item.RoleId, + IsFlowEnd = item.IsFlowEnd, + IsAgree = null, + Opinion = null, + OperaterTime = null, + OperaterId = string.IsNullOrEmpty(newItem.NextManId) ? null : newItem.NextManId + }; + db.License_FlowOperate.InsertOnSubmit(newFlowOperate); + db.SubmitChanges(); + } + + } else { updateOpenCircuit.WorkPalce = newOpenCircuit.WorkPalce; @@ -1910,6 +2130,50 @@ namespace BLL updateBreakGround.CancelTime = newBreakGround.ValidityEndTime; } } + //增加关闭提交 + else if (newItem.States == Const.State_6) + { + updateBreakGround.CloseManId = newBreakGround.CloseManId; + updateBreakGround.CloseReasons = newBreakGround.CloseReasons; + updateBreakGround.CloseTime = DateTime.Now; + updateBreakGround.NextManId = newItem.NextManId; + if (newBreakGround.ValidityEndTime.HasValue && newBreakGround.ValidityEndTime < DateTime.Now) + { + updateBreakGround.CloseTime = newBreakGround.ValidityEndTime; + } + //增加到审核表 关闭只需要最后一个人审批 + var sysMenuFlowOperate = from x in db.Sys_MenuFlowOperate + where x.MenuId == newItem.MenuId + && x.FlowStep != 1 && x.FlowStep != 2 && x.FlowStep != 3 + select x; + foreach (var item in sysMenuFlowOperate) + { + if (item.FlowStep == 4) + { + item.AuditFlowName = "关闭意见"; + } + Model.License_FlowOperate newFlowOperate = new Model.License_FlowOperate + { + FlowOperateId = SQLHelper.GetNewID(), + ProjectId = projectId, + DataId = strLicenseId, + MenuId = item.MenuId, + AuditFlowName = item.AuditFlowName, + SortIndex = item.FlowStep, + GroupNum = item.GroupNum, + OrderNum = item.OrderNum, + RoleIds = item.RoleId, + IsFlowEnd = item.IsFlowEnd, + IsAgree = null, + Opinion = null, + OperaterTime = null, + OperaterId = string.IsNullOrEmpty(newItem.NextManId) ? null : newItem.NextManId + }; + db.License_FlowOperate.InsertOnSubmit(newFlowOperate); + db.SubmitChanges(); + } + + } else { updateBreakGround.WorkPalce = newBreakGround.WorkPalce; @@ -1996,6 +2260,50 @@ namespace BLL updateNightWork.CancelTime = newNightWork.ValidityEndTime; } } + //增加关闭提交 + else if (newItem.States == Const.State_6) + { + updateNightWork.CloseManId = newNightWork.CloseManId; + updateNightWork.CloseReasons = newNightWork.CloseReasons; + updateNightWork.CloseTime = DateTime.Now; + updateNightWork.NextManId = newItem.NextManId; + if (newNightWork.ValidityEndTime.HasValue && newNightWork.ValidityEndTime < DateTime.Now) + { + updateNightWork.CloseTime = newNightWork.ValidityEndTime; + } + //增加到审核表 关闭只需要最后一个人审批 + var sysMenuFlowOperate = from x in db.Sys_MenuFlowOperate + where x.MenuId == newItem.MenuId + && x.FlowStep != 1 && x.FlowStep != 2 && x.FlowStep != 3 + select x; + foreach (var item in sysMenuFlowOperate) + { + if (item.FlowStep == 4) + { + item.AuditFlowName = "关闭意见"; + } + Model.License_FlowOperate newFlowOperate = new Model.License_FlowOperate + { + FlowOperateId = SQLHelper.GetNewID(), + ProjectId = projectId, + DataId = strLicenseId, + MenuId = item.MenuId, + AuditFlowName = item.AuditFlowName, + SortIndex = item.FlowStep, + GroupNum = item.GroupNum, + OrderNum = item.OrderNum, + RoleIds = item.RoleId, + IsFlowEnd = item.IsFlowEnd, + IsAgree = null, + Opinion = null, + OperaterTime = null, + OperaterId = string.IsNullOrEmpty(newItem.NextManId) ? null : newItem.NextManId + }; + db.License_FlowOperate.InsertOnSubmit(newFlowOperate); + db.SubmitChanges(); + } + + } else { updateNightWork.WorkPalce = newNightWork.WorkPalce; @@ -2090,6 +2398,50 @@ namespace BLL updateLiftingWork.CancelTime = newLiftingWork.ValidityEndTime; } } + //增加关闭提交 + else if (newItem.States == Const.State_6) + { + updateLiftingWork.CloseManId = newLiftingWork.CloseManId; + updateLiftingWork.CloseReasons = newLiftingWork.CloseReasons; + updateLiftingWork.CloseTime = DateTime.Now; + updateLiftingWork.NextManId = newItem.NextManId; + if (newLiftingWork.ValidityEndTime.HasValue && newLiftingWork.ValidityEndTime < DateTime.Now) + { + updateLiftingWork.CloseTime = newLiftingWork.ValidityEndTime; + } + //增加到审核表 关闭只需要最后一个人审批 + var sysMenuFlowOperate = from x in db.Sys_MenuFlowOperate + where x.MenuId == newItem.MenuId + && x.FlowStep != 1 && x.FlowStep != 2 && x.FlowStep != 3 + select x; + foreach (var item in sysMenuFlowOperate) + { + if (item.FlowStep == 4) + { + item.AuditFlowName = "关闭意见"; + } + Model.License_FlowOperate newFlowOperate = new Model.License_FlowOperate + { + FlowOperateId = SQLHelper.GetNewID(), + ProjectId = projectId, + DataId = strLicenseId, + MenuId = item.MenuId, + AuditFlowName = item.AuditFlowName, + SortIndex = item.FlowStep, + GroupNum = item.GroupNum, + OrderNum = item.OrderNum, + RoleIds = item.RoleId, + IsFlowEnd = item.IsFlowEnd, + IsAgree = null, + Opinion = null, + OperaterTime = null, + OperaterId = string.IsNullOrEmpty(newItem.NextManId) ? null : newItem.NextManId + }; + db.License_FlowOperate.InsertOnSubmit(newFlowOperate); + db.SubmitChanges(); + } + + } else { updateLiftingWork.WorkPalce = newLiftingWork.WorkPalce; @@ -2187,6 +2539,50 @@ namespace BLL updateElectricity.CancelTime = newElectricity.ValidityEndTime; } } + //增加关闭提交 + else if (newItem.States == Const.State_6) + { + updateElectricity.CloseManId = newElectricity.CloseManId; + updateElectricity.CloseReasons = newElectricity.CloseReasons; + updateElectricity.CloseTime = DateTime.Now; + updateElectricity.NextManId = newItem.NextManId; + if (newElectricity.ValidityEndTime.HasValue && newElectricity.ValidityEndTime < DateTime.Now) + { + updateElectricity.CloseTime = newElectricity.ValidityEndTime; + } + //增加到审核表 关闭只需要最后一个人审批 + var sysMenuFlowOperate = from x in db.Sys_MenuFlowOperate + where x.MenuId == newItem.MenuId + && x.FlowStep != 1 && x.FlowStep != 2 && x.FlowStep != 3 + select x; + foreach (var item in sysMenuFlowOperate) + { + if (item.FlowStep == 4) + { + item.AuditFlowName = "关闭意见"; + } + Model.License_FlowOperate newFlowOperate = new Model.License_FlowOperate + { + FlowOperateId = SQLHelper.GetNewID(), + ProjectId = projectId, + DataId = strLicenseId, + MenuId = item.MenuId, + AuditFlowName = item.AuditFlowName, + SortIndex = item.FlowStep, + GroupNum = item.GroupNum, + OrderNum = item.OrderNum, + RoleIds = item.RoleId, + IsFlowEnd = item.IsFlowEnd, + IsAgree = null, + Opinion = null, + OperaterTime = null, + OperaterId = string.IsNullOrEmpty(newItem.NextManId) ? null : newItem.NextManId + }; + db.License_FlowOperate.InsertOnSubmit(newFlowOperate); + db.SubmitChanges(); + } + + } else { updateElectricity.WorkPalce = newElectricity.WorkPalce; @@ -2320,6 +2716,14 @@ namespace BLL APICommonService.SendSubscribeMessage(item, "作业票待审核", newItem.ApplyManName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); } } + if (!string.IsNullOrEmpty(newItem.NextManId) && (newItem.States == Const.State_6)) + { + List getUserIds = Funs.GetStrListByStr(newItem.NextManId, ','); + foreach (var item in getUserIds) + { + APICommonService.SendSubscribeMessage(item, "关闭作业票待审核", newItem.ApplyManName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); + } + } return strLicenseId; } @@ -2366,57 +2770,77 @@ 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); - var getNextFlowOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId); - // ////判断审核步骤是否结束 - // 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(); - // } - //} - + db.SubmitChanges(); + } + } + #region 动火作业票 if (strMenuId == Const.ProjectFireWorkMenuId) { var getFireWork = db.License_FireWork.FirstOrDefault(x => x.FireWorkId == updateFlowOperate.DataId); if (getFireWork != null) { - getFireWork.NextManId = newItem.NextOperaterId; - if (newItem.IsAgree == true) + //如果是待关闭 + if (getFireWork.States== Const.State_6) { - if (boolIsFlowEnd == true) + getFireWork.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) { - getFireWork.NextManId = null; - getFireWork.States = Const.State_2; - if (getFireWork.ValidityStartTime.HasValue && getFireWork.ValidityStartTime < DateTime.Now) + if (boolIsFlowEnd == true) { - int days = 7; - if (getFireWork.ValidityEndTime.HasValue) - { - days = Convert.ToInt32((getFireWork.ValidityEndTime - getFireWork.ValidityStartTime).Value.TotalDays); - } - getFireWork.ValidityStartTime = DateTime.Now; - getFireWork.ValidityEndTime = DateTime.Now.AddDays(days); + //同意的话就把状态改成关闭 + getFireWork.NextManId = null; + getFireWork.States = Const.State_3; } } + else + { + getFireWork.States = Const.State_2; + } + db.SubmitChanges(); } - else - { - getFireWork.States = Const.State_0; + else { + getFireWork.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) + { + if (boolIsFlowEnd == true) + { + getFireWork.NextManId = null; + getFireWork.States = Const.State_2; + if (getFireWork.ValidityStartTime.HasValue && getFireWork.ValidityStartTime < DateTime.Now) + { + int days = 7; + if (getFireWork.ValidityEndTime.HasValue) + { + days = Convert.ToInt32((getFireWork.ValidityEndTime - getFireWork.ValidityStartTime).Value.TotalDays); + } + getFireWork.ValidityStartTime = DateTime.Now; + getFireWork.ValidityEndTime = DateTime.Now.AddDays(days); + } + } + } + else + { + getFireWork.States = Const.State_0; + } + db.SubmitChanges(); } - db.SubmitChanges(); + } } #endregion @@ -2426,30 +2850,51 @@ namespace BLL var getHeightWork = db.License_HeightWork.FirstOrDefault(x => x.HeightWorkId == updateFlowOperate.DataId); if (getHeightWork != null) { - getHeightWork.NextManId = newItem.NextOperaterId; - if (newItem.IsAgree == true) + //如果是待关闭 + if (getHeightWork.States == Const.State_6) { - if (boolIsFlowEnd == true) + getHeightWork.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) { - getHeightWork.NextManId = null; - getHeightWork.States = Const.State_2; - if (getHeightWork.ValidityStartTime.HasValue && getHeightWork.ValidityStartTime < DateTime.Now) + if (boolIsFlowEnd == true) { - int days = 7; - if (getHeightWork.ValidityEndTime.HasValue) - { - days = Convert.ToInt32((getHeightWork.ValidityEndTime - getHeightWork.ValidityStartTime).Value.TotalDays); - } - getHeightWork.ValidityStartTime = DateTime.Now; - getHeightWork.ValidityEndTime = DateTime.Now.AddDays(days); + //同意的话就把状态改成关闭 + getHeightWork.NextManId = null; + getHeightWork.States = Const.State_3; } } + else + { + getHeightWork.States = Const.State_2; + } + db.SubmitChanges(); } - else - { - getHeightWork.States = Const.State_0; + else { + getHeightWork.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) + { + if (boolIsFlowEnd == true) + { + getHeightWork.NextManId = null; + getHeightWork.States = Const.State_2; + if (getHeightWork.ValidityStartTime.HasValue && getHeightWork.ValidityStartTime < DateTime.Now) + { + int days = 7; + if (getHeightWork.ValidityEndTime.HasValue) + { + days = Convert.ToInt32((getHeightWork.ValidityEndTime - getHeightWork.ValidityStartTime).Value.TotalDays); + } + getHeightWork.ValidityStartTime = DateTime.Now; + getHeightWork.ValidityEndTime = DateTime.Now.AddDays(days); + } + } + } + else + { + getHeightWork.States = Const.State_0; + } + db.SubmitChanges(); } - db.SubmitChanges(); } } #endregion @@ -2459,30 +2904,52 @@ namespace BLL var getLimitedSpace = db.License_LimitedSpace.FirstOrDefault(x => x.LimitedSpaceId == updateFlowOperate.DataId); if (getLimitedSpace != null) { - getLimitedSpace.NextManId = newItem.NextOperaterId; - if (newItem.IsAgree == true) + //如果是待关闭 + if (getLimitedSpace.States == Const.State_6) { - if (boolIsFlowEnd == true) + getLimitedSpace.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) { - getLimitedSpace.NextManId = null; - getLimitedSpace.States = Const.State_2; - if (getLimitedSpace.ValidityStartTime.HasValue && getLimitedSpace.ValidityStartTime < DateTime.Now) + if (boolIsFlowEnd == true) { - int days = 1; - if (getLimitedSpace.ValidityEndTime.HasValue) - { - days = Convert.ToInt32((getLimitedSpace.ValidityEndTime - getLimitedSpace.ValidityStartTime).Value.TotalDays); - } - getLimitedSpace.ValidityStartTime = DateTime.Now; - getLimitedSpace.ValidityEndTime = DateTime.Now.AddDays(days); + //同意的话就把状态改成关闭 + getLimitedSpace.NextManId = null; + getLimitedSpace.States = Const.State_3; } } + else + { + getLimitedSpace.States = Const.State_2; + } + db.SubmitChanges(); } else { - getLimitedSpace.States = Const.State_0; + getLimitedSpace.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) + { + if (boolIsFlowEnd == true) + { + getLimitedSpace.NextManId = null; + getLimitedSpace.States = Const.State_2; + if (getLimitedSpace.ValidityStartTime.HasValue && getLimitedSpace.ValidityStartTime < DateTime.Now) + { + int days = 1; + if (getLimitedSpace.ValidityEndTime.HasValue) + { + days = Convert.ToInt32((getLimitedSpace.ValidityEndTime - getLimitedSpace.ValidityStartTime).Value.TotalDays); + } + getLimitedSpace.ValidityStartTime = DateTime.Now; + getLimitedSpace.ValidityEndTime = DateTime.Now.AddDays(days); + } + } + } + else + { + getLimitedSpace.States = Const.State_0; + } + db.SubmitChanges(); } - db.SubmitChanges(); } } #endregion @@ -2492,30 +2959,51 @@ namespace BLL var getRadialWork = db.License_RadialWork.FirstOrDefault(x => x.RadialWorkId == updateFlowOperate.DataId); if (getRadialWork != null) { - getRadialWork.NextManId = newItem.NextOperaterId; - if (newItem.IsAgree == true) + //如果是待关闭 + if (getRadialWork.States == Const.State_6) { - if (boolIsFlowEnd == true) + getRadialWork.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) { - getRadialWork.NextManId = null; - getRadialWork.States = Const.State_2; - if (getRadialWork.ValidityStartTime.HasValue && getRadialWork.ValidityStartTime < DateTime.Now) + if (boolIsFlowEnd == true) { - int hours = 24; - if (getRadialWork.ValidityEndTime.HasValue) - { - hours = Convert.ToInt32((getRadialWork.ValidityEndTime - getRadialWork.ValidityStartTime).Value.TotalHours); - } - getRadialWork.ValidityStartTime = DateTime.Now; - getRadialWork.ValidityEndTime = DateTime.Now.AddHours(hours); + //同意的话就把状态改成关闭 + getRadialWork.NextManId = null; + getRadialWork.States = Const.State_3; } } + else + { + getRadialWork.States = Const.State_2; + } + db.SubmitChanges(); } - else - { - getRadialWork.States = Const.State_0; + else{ + getRadialWork.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) + { + if (boolIsFlowEnd == true) + { + getRadialWork.NextManId = null; + getRadialWork.States = Const.State_2; + if (getRadialWork.ValidityStartTime.HasValue && getRadialWork.ValidityStartTime < DateTime.Now) + { + int hours = 24; + if (getRadialWork.ValidityEndTime.HasValue) + { + hours = Convert.ToInt32((getRadialWork.ValidityEndTime - getRadialWork.ValidityStartTime).Value.TotalHours); + } + getRadialWork.ValidityStartTime = DateTime.Now; + getRadialWork.ValidityEndTime = DateTime.Now.AddHours(hours); + } + } + } + else + { + getRadialWork.States = Const.State_0; + } + db.SubmitChanges(); } - db.SubmitChanges(); } } #endregion @@ -2525,30 +3013,52 @@ namespace BLL var getOpenCircuit = db.License_OpenCircuit.FirstOrDefault(x => x.OpenCircuitId == updateFlowOperate.DataId); if (getOpenCircuit != null) { - getOpenCircuit.NextManId = newItem.NextOperaterId; - if (newItem.IsAgree == true) + //如果是待关闭 + if (getOpenCircuit.States == Const.State_6) { - if (boolIsFlowEnd == true) + getOpenCircuit.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) { - getOpenCircuit.NextManId = null; - getOpenCircuit.States = Const.State_2; - if (getOpenCircuit.ValidityStartTime.HasValue && getOpenCircuit.ValidityStartTime < DateTime.Now) + if (boolIsFlowEnd == true) { - int days = 7; - if (getOpenCircuit.ValidityEndTime.HasValue) - { - days = Convert.ToInt32((getOpenCircuit.ValidityEndTime - getOpenCircuit.ValidityStartTime).Value.TotalDays); - } - getOpenCircuit.ValidityStartTime = DateTime.Now; - getOpenCircuit.ValidityEndTime = DateTime.Now.AddDays(days); + //同意的话就把状态改成关闭 + getOpenCircuit.NextManId = null; + getOpenCircuit.States = Const.State_3; } } + else + { + getOpenCircuit.States = Const.State_2; + } + db.SubmitChanges(); } else { - getOpenCircuit.States = Const.State_0; + getOpenCircuit.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) + { + if (boolIsFlowEnd == true) + { + getOpenCircuit.NextManId = null; + getOpenCircuit.States = Const.State_2; + if (getOpenCircuit.ValidityStartTime.HasValue && getOpenCircuit.ValidityStartTime < DateTime.Now) + { + int days = 7; + if (getOpenCircuit.ValidityEndTime.HasValue) + { + days = Convert.ToInt32((getOpenCircuit.ValidityEndTime - getOpenCircuit.ValidityStartTime).Value.TotalDays); + } + getOpenCircuit.ValidityStartTime = DateTime.Now; + getOpenCircuit.ValidityEndTime = DateTime.Now.AddDays(days); + } + } + } + else + { + getOpenCircuit.States = Const.State_0; + } + db.SubmitChanges(); } - db.SubmitChanges(); } } #endregion @@ -2558,30 +3068,52 @@ namespace BLL var getBreakGround = db.License_BreakGround.FirstOrDefault(x => x.BreakGroundId == updateFlowOperate.DataId); if (getBreakGround != null) { - getBreakGround.NextManId = newItem.NextOperaterId; - if (newItem.IsAgree == true) + //如果是待关闭 + if (getBreakGround.States == Const.State_6) { - if (boolIsFlowEnd == true) + getBreakGround.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) { - getBreakGround.NextManId = null; - getBreakGround.States = Const.State_2; - if (getBreakGround.ValidityStartTime.HasValue && getBreakGround.ValidityStartTime < DateTime.Now) + if (boolIsFlowEnd == true) { - int days = 7; - if (getBreakGround.ValidityEndTime.HasValue) - { - days = Convert.ToInt32((getBreakGround.ValidityEndTime - getBreakGround.ValidityStartTime).Value.TotalDays); - } - getBreakGround.ValidityStartTime = DateTime.Now; - getBreakGround.ValidityEndTime = DateTime.Now.AddDays(days); + //同意的话就把状态改成关闭 + getBreakGround.NextManId = null; + getBreakGround.States = Const.State_3; } } + else + { + getBreakGround.States = Const.State_2; + } + db.SubmitChanges(); } else { - getBreakGround.States = Const.State_0; + getBreakGround.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) + { + if (boolIsFlowEnd == true) + { + getBreakGround.NextManId = null; + getBreakGround.States = Const.State_2; + if (getBreakGround.ValidityStartTime.HasValue && getBreakGround.ValidityStartTime < DateTime.Now) + { + int days = 7; + if (getBreakGround.ValidityEndTime.HasValue) + { + days = Convert.ToInt32((getBreakGround.ValidityEndTime - getBreakGround.ValidityStartTime).Value.TotalDays); + } + getBreakGround.ValidityStartTime = DateTime.Now; + getBreakGround.ValidityEndTime = DateTime.Now.AddDays(days); + } + } + } + else + { + getBreakGround.States = Const.State_0; + } + db.SubmitChanges(); } - db.SubmitChanges(); } } #endregion @@ -2591,30 +3123,52 @@ namespace BLL var getNightWork = db.License_NightWork.FirstOrDefault(x => x.NightWorkId == updateFlowOperate.DataId); if (getNightWork != null) { - getNightWork.NextManId = newItem.NextOperaterId; - if (newItem.IsAgree == true) + //如果是待关闭 + if (getNightWork.States == Const.State_6) { - if (boolIsFlowEnd == true) + getNightWork.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) { - getNightWork.NextManId = null; - getNightWork.States = Const.State_2; - if (getNightWork.ValidityStartTime.HasValue && getNightWork.ValidityStartTime < DateTime.Now) + if (boolIsFlowEnd == true) { - int days = 7; - if (getNightWork.ValidityEndTime.HasValue) - { - days = Convert.ToInt32((getNightWork.ValidityEndTime - getNightWork.ValidityStartTime).Value.TotalDays); - } - getNightWork.ValidityStartTime = DateTime.Now; - getNightWork.ValidityEndTime = DateTime.Now.AddDays(days); + //同意的话就把状态改成关闭 + getNightWork.NextManId = null; + getNightWork.States = Const.State_3; } } + else + { + getNightWork.States = Const.State_2; + } + db.SubmitChanges(); } else { - getNightWork.States = Const.State_0; + getNightWork.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) + { + if (boolIsFlowEnd == true) + { + getNightWork.NextManId = null; + getNightWork.States = Const.State_2; + if (getNightWork.ValidityStartTime.HasValue && getNightWork.ValidityStartTime < DateTime.Now) + { + int days = 7; + if (getNightWork.ValidityEndTime.HasValue) + { + days = Convert.ToInt32((getNightWork.ValidityEndTime - getNightWork.ValidityStartTime).Value.TotalDays); + } + getNightWork.ValidityStartTime = DateTime.Now; + getNightWork.ValidityEndTime = DateTime.Now.AddDays(days); + } + } + } + else + { + getNightWork.States = Const.State_0; + } + db.SubmitChanges(); } - db.SubmitChanges(); } } #endregion @@ -2624,30 +3178,52 @@ namespace BLL var getLiftingWork = db.License_LiftingWork.FirstOrDefault(x => x.LiftingWorkId == updateFlowOperate.DataId); if (getLiftingWork != null) { - getLiftingWork.NextManId = newItem.NextOperaterId; - if (newItem.IsAgree == true) + //如果是待关闭 + if (getLiftingWork.States == Const.State_6) { - if (boolIsFlowEnd == true) + getLiftingWork.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) { - getLiftingWork.NextManId = null; - getLiftingWork.States = Const.State_2; - if (getLiftingWork.ValidityStartTime.HasValue && getLiftingWork.ValidityStartTime < DateTime.Now) + if (boolIsFlowEnd == true) { - int days = 7; - if (getLiftingWork.ValidityEndTime.HasValue) - { - days = Convert.ToInt32((getLiftingWork.ValidityEndTime - getLiftingWork.ValidityStartTime).Value.TotalDays); - } - getLiftingWork.ValidityStartTime = DateTime.Now; - getLiftingWork.ValidityEndTime = DateTime.Now.AddDays(days); + //同意的话就把状态改成关闭 + getLiftingWork.NextManId = null; + getLiftingWork.States = Const.State_3; } } + else + { + getLiftingWork.States = Const.State_2; + } + db.SubmitChanges(); } else { - getLiftingWork.States = Const.State_0; + getLiftingWork.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) + { + if (boolIsFlowEnd == true) + { + getLiftingWork.NextManId = null; + getLiftingWork.States = Const.State_2; + if (getLiftingWork.ValidityStartTime.HasValue && getLiftingWork.ValidityStartTime < DateTime.Now) + { + int days = 7; + if (getLiftingWork.ValidityEndTime.HasValue) + { + days = Convert.ToInt32((getLiftingWork.ValidityEndTime - getLiftingWork.ValidityStartTime).Value.TotalDays); + } + getLiftingWork.ValidityStartTime = DateTime.Now; + getLiftingWork.ValidityEndTime = DateTime.Now.AddDays(days); + } + } + } + else + { + getLiftingWork.States = Const.State_0; + } + db.SubmitChanges(); } - db.SubmitChanges(); } } #endregion @@ -2658,30 +3234,52 @@ namespace BLL var getElectricity = db.License_Electricity.FirstOrDefault(x => x.ElectricityId == updateFlowOperate.DataId); if (getElectricity != null) { - getElectricity.NextManId = newItem.NextOperaterId; - if (newItem.IsAgree == true) + //如果是待关闭 + if (getElectricity.States == Const.State_6) { - if (boolIsFlowEnd == true) + getElectricity.NextManId = newItem.NextOperaterId; + if (newItem.IsAgree == true) { - getElectricity.NextManId = null; - getElectricity.States = Const.State_2; - if (getElectricity.ValidityStartTime.HasValue && getElectricity.ValidityStartTime < DateTime.Now) + if (boolIsFlowEnd == true) { - 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); + //同意的话就把状态改成关闭 + getElectricity.NextManId = null; + getElectricity.States = Const.State_3; } } + else + { + getElectricity.States = Const.State_2; + } + db.SubmitChanges(); } else { - getElectricity.States = Const.State_0; + 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(); } - db.SubmitChanges(); } } #endregion @@ -2720,6 +3318,44 @@ namespace BLL var sysMenuFlowOperate = from x in db.Sys_MenuFlowOperate where x.MenuId == menuId select x; + + //修改时间2023-9-20 15:47:39 + //修改内容：如果是动火、高处、起重，级别是对应的，只用2级审批 + //动火 + if (menuId== "2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B") + { + var Level = db.License_FireWork.FirstOrDefault(x => x.FireWorkId == dataId).FireLevel; + if (Level=="三级") + { + //只需要2级 + sysMenuFlowOperate = sysMenuFlowOperate.Where(x => (x.FlowStep !=3 && x.FlowStep!=4)); + + } + } + //高处 + else if (menuId == "DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9") + { + var HeightLevel = db.License_HeightWork.FirstOrDefault(x => x.HeightWorkId == dataId).HeightLevel; + //存在一级 + if (HeightLevel== "一级(2≤h＜5m)") + { + //只需要2级 + sysMenuFlowOperate = sysMenuFlowOperate.Where(x => (x.FlowStep != 3 && x.FlowStep != 4)); + + } + } + //起重 + else if (menuId== "A1BE3AB6-9D4A-41E7-8870-E73423165451") + { + var Level = db.License_LiftingWork.FirstOrDefault(x => x.LiftingWorkId == dataId).WorkLevel; + if (Level=="小型") + { + //只需要2级 + sysMenuFlowOperate = sysMenuFlowOperate.Where(x => (x.FlowStep != 3 && x.FlowStep != 4)); + + } + } + if (sysMenuFlowOperate.Count() > 0) { foreach (var item in sysMenuFlowOperate) diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 6537a285..3b1c4bb8 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3299,6 +3299,10 @@ namespace BLL /// 作废 /// public const string State_C = "-2"; + /// + /// 关闭提交 + /// + public const string State_6 = "6"; #endregion #region 文档流程定义 diff --git a/SGGL/BLL/HSSE/License/LicensePublicService.cs b/SGGL/BLL/HSSE/License/LicensePublicService.cs index 658271d8..369a2563 100644 --- a/SGGL/BLL/HSSE/License/LicensePublicService.cs +++ b/SGGL/BLL/HSSE/License/LicensePublicService.cs @@ -16,13 +16,15 @@ namespace BLL /// public static ListItem[] drpStatesItem() { - ListItem[] list = new ListItem[6]; + //修改日期，增加关闭审核中 + ListItem[] list = new ListItem[7]; list[0] = new ListItem("全部", Const._Null); list[1] = new ListItem("待提交", Const.State_0); list[2] = new ListItem("审核中", Const.State_1); list[3] = new ListItem("作业中", Const.State_2); - list[4] = new ListItem("已关闭", Const.State_3); - list[5] = new ListItem("已取消", Const.State_R); + list[4] = new ListItem("关闭审核中", Const.State_6); + list[5] = new ListItem("已关闭", Const.State_3); + list[6] = new ListItem("已取消", Const.State_R); return list; } diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/临时用电作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/临时用电作业票.doc index 10c82e65a4017e553a689a8bf477d93c6e2fb468..274aefe4f38b8f8d1ee17420be5fcfb9c0d4bbe0 100644 GIT binary patch delta 1090 zcmb7?TS!zv7{_PM?pfFMxbALl<|VHYnquCPUIL5VSgg#|uI8>085NtU`4na=Q9Xnf zej-v3r3GP;=7^~n6!nr(y+l4FB4HOwqN0mgY5!SS%E#vLJO6WLzM1d;&5VDN`=9Zi z0mYuf7|R0LV0Lb9E?4R;cP?+y`wYeDt3y3gRI5M5vpRq1Id_N|HD6Jg!kCp-8B3iS z!X2EkaA+~q3@wL7K=(o|P#@F=t%ELtPD2+oY7C2_36qhgj7`?~fiDe}&v^kN{GX#rU4J<~I zRZCwwW?*cY91UTt?{6r3i2rMWh!T`BhT1Y=TUJ$TW$X$fdyrHKL?ngHuQ6z3Y(FAv zpe{u8VGTRgXeZQ@$oCju8`Q;^bza=FcXERh(=xbdw6$-PDgiF*DYqEsEaBETbk$(m{%(7#_^ldaAS0eMTUtkuvaJ+@!BIp2J;3nt;17HaJ zoc{Xx!@D;mQlphKr?C;`G@PDEPtpwZG0jZHY27@fH$zJf51Nyv@6urkm$Fw!%&0ivJ?s0Rj_7=x+9!YE6DOBLD=XuoV zzAyYGKD|{s#F4R3U;<&JZr@;&dF9$SFxn4rpH?VkVT!!HvUzl3bi0i!FRs)39qV)> zY@f*58LlL)#|@Ck#_nbde3Yk( zO3wu)W(zyO4zWs>$27K?RR`?I?d>-U)BbPVB(2SFvoIa}rlZ;_8)~~;bvDxl6IGxU qTm_H7C-55-BGV?Y6_f$5j%L*5)PA_0hO6rSbE+7xPUhs-M*aX>9r!%} delta 1408 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 a$whV>X~2IE49>$0wuCeJ=IlLZ zt+n@Fd!O}B|6S34OMGloL>|W|10tWr!PJQLL^L}$H^-kTiPoZpPO-d?)})FdwaYa5 zXWg!6ZX2(t$AqXdW;AbD3hf?FDcK=PVMdqFILh09oNxD?YKGIaE}^(|UZrP5RrwzIzI1lKn#x^zi}rIAQ7p$q<)%!Sh%)8VaH5I-OlcbZ z4}2DvtVGpeMCKTxK0$QUPILv9lNeO-SyWo)WBeLH)Ts~+<6Z%a3B-tFw|zkS1LJ+i zqtRQn&G0&7j5*#Hrf#@(3ABfVamkUTnM}1>-R1_~=4@tLQWj4o*W<40;WYoCg6ilg z;%euGh;U5zWYtK|f~^_0jb{17qRnM~DdmJwYR3R#l~+yr+e~y9%z%4fuN)kBjN$YS z;q{>TCHM-Ag9&gAOoBC-d=}^hhru8i0w=*~a1-1Dzk?Da>v5SdPz&loBRC7r0n&+7 z5Cv=?9wh4&M%b+jnW@UD6UdjBzkWE6s~;K>X&19%m8|XXTfE8^TWAypcCvZ38qbHb zD;zY6$eAJ`Q&jH3j!{XYg~yr>aZc_(&d~mA;qT(AwYm0??mzI&M{=C61&;b+VCOl^ z{#{I=z(E7Srtk*8lYhK$3ID)gI|Dmg*=^gx-fT0E6cm6&zMiMsLk;47`$3cT7-CvO zC+^Xu66a5R#*#5+if;34VSyfW&n!#18Z$*@Lda1PLTn8zRKabvNyglUxCcHk|FiZd zR%q=Tm$&xP`(OK}6<>S#3a!0zd28Qt|7+hal#4AcA!50#HG@lA`@}kaz4fZm-`1(d z$@1nxsX<|;NPq%J7S`IIj+gbY4~0t>D;*Yz0JSJb@t76c!V9Pyv+WL{{_@eM$2hK| zH0)d2V>ESGmDS}a_7ZsseEey8{7#WJ-g!@(-jr;bj{G8eT~l}0n~tj<>7qkb za8>d2-k(Ii@y!eC6&~DY(%fXF9mZU@P==~wSNKJ)xl!Pkfjhp@7rsK5MgQB4niiri z;>~uFDl;h+MM{WYKBR2)8AGaJS~HP6FC9_n1TQ#I>-}D z0DAcR%gxEs4XWoml0$*+#|^h#2$xD^-`y!7U0uO~95O!X*{1Nb`{Ox%-#GW~KUX6E zn4AaK!4z=dR2G9u&;#BBAA;|}9bm%Ivw-L@p3&0ztpjJd_~4NZ%MQbly`TRJ^&Q#D delta 3214 zcmcJR3s6*57{|YJ*!y}DTQvJh!%leWk!xH#eb$H`8S0yp}6lX=YSqb;_5+c)ss;B!ndM5Ahl zMLH07^N-;yZFlucznMZQ3*ZoAU%xbWmHSf7aju6r*O;lT^CPnGVZ(snS{>0q)at#7 z&fRn+A3eglJ!<@k4tf#2(T(UmK{U)vbOfH;(W&D0$Tkp#;muXF$x(=Q;XW46mk_fD zmzY**ucE*2VNKBbq17g}%KWa-m7-aeP)khZLfvPM)S4=1*JVtdlImPNBWKb+$5UzC z5O~CtoTZ&|+snzk*_Kvr*L3&PnH^R~U4~(~J`+u5%37m0c`9X8J{0r;n}SSeq(8h= zw?qc?xcYjN)sgIIeI;X$FSoB(MM#k*sL_|G30wm=KrV*t0(t7j(7B>04`wx}0kz;5 zI1WyNNc`m}umTi=H^C;b8N3C~g9h*?coZpq9HfJpAQNPP?O+G+H4+(t9fW}1Ak;|d zv>3(`uoTpQ1K=q575olrL1+MG2V85sbn*Pz)2B}S@!QWo9{lb=byelwPj^>*xMSPa zEgLtKzxHZbX-UEIW%+pvFm?PxsEsFv>$o;l&kf;5E(=fR`QhsaM#)h9KrYAw&w~|U zC3p#xfqxn=HJm$h3RAm9a7{?0Ns~Rk2a)%}NZ~g0yZc#`NV!DXiu@AVN^F}2BaE-j z595l6IQt%=o?)U_m>4$)>yVPB87S~?tju1xa8*tLNA+x7itcFWH$Ol=3XggZQ|z zPsV!m<*%E|y5(Td_I%sdBDX^<=`MY3HquD#lA0w&$|F!xm+2H6^kL{5-bj zK3R1=JzZEX`g{>kYW~V4-Krt4C}~`m{)-r*R?bLJ-pN#~awt;t<#5)xJz6hC$kC~m z9OZW`jrqL&xpb=x;5jv{Z6Bx%fv&J^fv7*Z*lTogzCV55wAIq;) JUpFO*e*y68kbnRH diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/受限空间作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/受限空间作业票.doc index 3b294b67f9cc5dbdb613554ba80724eefaf11ba3..c8a9e96b72b789ca0ff8340f4d3603e32d29e6ae 100644 GIT binary patch literal 27136 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 diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/吊装作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/吊装作业票.doc index 7cb27531182311a7dea99a25f16e1ded26183a9c..3de5e510d3e92ae6cc89a396d9a109ceb3da103f 100644 GIT binary patch literal 26624 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 literal 43008 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 literal 39936 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 VzBsgZV^5oJqXTVP^N;1g{{d@Db`byo diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/射线作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/射线作业票.doc index 58269b51d220eff9b96f49b5576d9323fa1424c8..0f0fb2cadb4c545f7d719e7999c40e7bdb904a11 100644 GIT binary patch literal 24576 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 TqXmd{1Ab}}$mCU55C#4ph1)O1 literal 41472 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 q9NM~-n-}!(BlivopC``#1OEqh9`i;3 diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/高处作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/高处作业票.doc index 83ecede621f449dd08b19c3d6b1441d6fc6d15d2..ab2fe7dd7bed53349534e2b87ae16894b2f5c305 100644 GIT binary patch literal 27136 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 R)%McGom_j<=>IGU{2w)uRTKaK diff --git a/SGGL/FineUIPro.Web/HSSE/License/BreakGround.aspx b/SGGL/FineUIPro.Web/HSSE/License/BreakGround.aspx index 1896ac80..af3ecfbf 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/BreakGround.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/BreakGround.aspx @@ -25,7 +25,7 @@ EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"> - diff --git a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx index 230a668b..03b9d85b 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx @@ -90,29 +90,111 @@ - + - + - + - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -150,3 +232,15 @@ + diff --git a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs index 1c90879e..410b21cc 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs @@ -89,6 +89,10 @@ #endregion #region 获取审核记录信息 + public string FlowOperateId1; + public string FlowOperateId2; + public string FlowOperateId3; + public string FlowOperateId4; /// /// /// @@ -100,6 +104,7 @@ var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1); if (getF1 != null) { + FlowOperateId1 = getF1.FlowOperateId; this.txtForm1.Title = getF1.AuditFlowName + "："; if (getF1.OperaterTime.HasValue) { @@ -111,10 +116,105 @@ { this.txtOpinion1.Text = getF1.Opinion; } - this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId); + if (!string.IsNullOrEmpty(getF1.SignatureUrl)) + { + this.Image1.ImageUrl = "~/" + getF1.SignatureUrl; + } + var signUser1 = UserService.GetUserByUserId(getF1.OperaterId); + if (signUser1 != null) + { + this.txtName1.Text = signUser1.UserName; + } this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } + var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + if (getF2 != null) + { + FlowOperateId2 = getF2.FlowOperateId; + + this.txtForm2.Title = getF2.AuditFlowName + "："; + if (getF2.OperaterTime.HasValue) + { + if (getF2.IsAgree == true) + { + this.txtOpinion2.Text = "同意。"; + } + else + { + this.txtOpinion2.Text = getF2.Opinion; + } + if (!string.IsNullOrEmpty(getF2.SignatureUrl)) + { + this.Image2.ImageUrl = "~/" + getF2.SignatureUrl; + } + var signUser2 = UserService.GetUserByUserId(getF2.OperaterId); + if (signUser2 != null) + { + this.txtName2.Text = signUser2.UserName; + + } + this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + } + } + var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + if (getF3 != null) + { + FlowOperateId3 = getF3.FlowOperateId; + + this.txtForm3.Title = getF3.AuditFlowName + "："; + if (getF3.OperaterTime.HasValue) + { + if (getF3.IsAgree == true) + { + this.txtOpinion3.Text = "同意。"; + } + else + { + this.txtOpinion3.Text = getF3.Opinion; + } + if (!string.IsNullOrEmpty(getF3.SignatureUrl)) + { + this.Image3.ImageUrl = "~/" + getF3.SignatureUrl; + } + + var signUser3 = UserService.GetUserByUserId(getF3.OperaterId); + if (signUser3 != null) + { + this.txtName3.Text = signUser3.UserName; + } + this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + } + } + var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + if (getF4 != null) + { + FlowOperateId4 = getF4.FlowOperateId; + + this.txtForm4.Title = getF4.AuditFlowName + "："; + if (getF4.OperaterTime.HasValue) + { + if (getF4.IsAgree == true) + { + this.txtOpinion4.Text = "同意。"; + } + else + { + this.txtOpinion4.Text = getF4.Opinion; + } + if (!string.IsNullOrEmpty(getF4.SignatureUrl)) + { + this.Image4.ImageUrl = "~/" + getF4.SignatureUrl; + } + + var signUser4 = UserService.GetUserByUserId(getF4.OperaterId); + if (signUser4 != null) + { + this.txtName4.Text = signUser4.UserName; + } + this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + } + } //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); //if (getF2 != null) //{ diff --git a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.designer.cs index 274e3fa4..10b4f513 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.designer.cs @@ -150,13 +150,13 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextArea txtOpinion1; /// - /// Label6 控件。 + /// HyperLink2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label6; + protected global::FineUIPro.HyperLink HyperLink2; /// /// txtName1 控件。 @@ -167,6 +167,15 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtName1; + /// + /// Image1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image1; + /// /// txtTime1 控件。 /// @@ -176,6 +185,168 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtTime1; + /// + /// txtForm2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm2; + + /// + /// txtOpinion2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion2; + + /// + /// HyperLink1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink1; + + /// + /// txtName2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName2; + + /// + /// Image2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image2; + + /// + /// txtTime2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime2; + + /// + /// txtForm3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm3; + + /// + /// txtOpinion3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion3; + + /// + /// HyperLink3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink3; + + /// + /// txtName3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName3; + + /// + /// Image3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image3; + + /// + /// txtTime3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime3; + + /// + /// txtForm4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm4; + + /// + /// txtOpinion4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion4; + + /// + /// HyperLink4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink4; + + /// + /// txtName4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName4; + + /// + /// Image4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image4; + + /// + /// txtTime4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime4; + /// /// txtCance 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx index 11b0ccba..afca6fb6 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx @@ -26,7 +26,7 @@ EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"> - diff --git a/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs index a6cb41e6..79e6cca7 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs @@ -343,7 +343,7 @@ namespace FineUIPro.Web.HSSE.License Bookmark bookmarkWorkDepth = doc.Range.Bookmarks["WorkDepth"];//作业原因 if (bookmarkWorkDepth != null) { - if (getElectricity != null) + if (getElectricity.Reason != null) { bookmarkWorkDepth.Text = getElectricity.Reason; diff --git a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx index f560f791..35560d40 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx @@ -92,32 +92,113 @@ - + - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -155,3 +236,15 @@ + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.cs index 74bdf22b..c7a95cda 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.cs @@ -90,6 +90,10 @@ namespace FineUIPro.Web.HSSE.License #endregion #region 获取审核记录信息 + public string FlowOperateId1; + public string FlowOperateId2; + public string FlowOperateId3; + public string FlowOperateId4; /// /// /// @@ -101,6 +105,7 @@ namespace FineUIPro.Web.HSSE.License var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1); if (getF1 != null) { + FlowOperateId1 = getF1.FlowOperateId; this.txtForm1.Title = getF1.AuditFlowName + "："; if (getF1.OperaterTime.HasValue) { @@ -112,10 +117,105 @@ namespace FineUIPro.Web.HSSE.License { this.txtOpinion1.Text = getF1.Opinion; } - this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId); + if (!string.IsNullOrEmpty(getF1.SignatureUrl)) + { + this.Image1.ImageUrl = "~/" + getF1.SignatureUrl; + } + var signUser1 = UserService.GetUserByUserId(getF1.OperaterId); + if (signUser1 != null) + { + this.txtName1.Text = signUser1.UserName; + } this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } + var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + if (getF2 != null) + { + FlowOperateId2 = getF2.FlowOperateId; + + this.txtForm2.Title = getF2.AuditFlowName + "："; + if (getF2.OperaterTime.HasValue) + { + if (getF2.IsAgree == true) + { + this.txtOpinion2.Text = "同意。"; + } + else + { + this.txtOpinion2.Text = getF2.Opinion; + } + if (!string.IsNullOrEmpty(getF2.SignatureUrl)) + { + this.Image2.ImageUrl = "~/" + getF2.SignatureUrl; + } + var signUser2 = UserService.GetUserByUserId(getF2.OperaterId); + if (signUser2 != null) + { + this.txtName2.Text = signUser2.UserName; + + } + this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + } + } + var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + if (getF3 != null) + { + FlowOperateId3 = getF3.FlowOperateId; + + this.txtForm3.Title = getF3.AuditFlowName + "："; + if (getF3.OperaterTime.HasValue) + { + if (getF3.IsAgree == true) + { + this.txtOpinion3.Text = "同意。"; + } + else + { + this.txtOpinion3.Text = getF3.Opinion; + } + if (!string.IsNullOrEmpty(getF3.SignatureUrl)) + { + this.Image3.ImageUrl = "~/" + getF3.SignatureUrl; + } + + var signUser3 = UserService.GetUserByUserId(getF3.OperaterId); + if (signUser3 != null) + { + this.txtName3.Text = signUser3.UserName; + } + this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + } + } + var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + if (getF4 != null) + { + FlowOperateId4 = getF4.FlowOperateId; + + this.txtForm4.Title = getF4.AuditFlowName + "："; + if (getF4.OperaterTime.HasValue) + { + if (getF4.IsAgree == true) + { + this.txtOpinion4.Text = "同意。"; + } + else + { + this.txtOpinion4.Text = getF4.Opinion; + } + if (!string.IsNullOrEmpty(getF4.SignatureUrl)) + { + this.Image4.ImageUrl = "~/" + getF4.SignatureUrl; + } + + var signUser4 = UserService.GetUserByUserId(getF4.OperaterId); + if (signUser4 != null) + { + this.txtName4.Text = signUser4.UserName; + } + this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + } + } //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); //if (getF2 != null) //{ diff --git a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.designer.cs index e663d772..b24b6620 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/ElectricityView.aspx.designer.cs @@ -150,13 +150,13 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextArea txtOpinion1; /// - /// Label6 控件。 + /// HyperLink2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label6; + protected global::FineUIPro.HyperLink HyperLink2; /// /// txtName1 控件。 @@ -167,6 +167,15 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtName1; + /// + /// Image1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image1; + /// /// txtTime1 控件。 /// @@ -176,6 +185,168 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtTime1; + /// + /// txtForm2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm2; + + /// + /// txtOpinion2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion2; + + /// + /// HyperLink1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink1; + + /// + /// txtName2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName2; + + /// + /// Image2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image2; + + /// + /// txtTime2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime2; + + /// + /// txtForm3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm3; + + /// + /// txtOpinion3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion3; + + /// + /// HyperLink3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink3; + + /// + /// txtName3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName3; + + /// + /// Image3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image3; + + /// + /// txtTime3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime3; + + /// + /// txtForm4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm4; + + /// + /// txtOpinion4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion4; + + /// + /// HyperLink4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink4; + + /// + /// txtName4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName4; + + /// + /// Image4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image4; + + /// + /// txtTime4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime4; + /// /// txtCance 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx b/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx index 6f07887e..7e20f08a 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx @@ -25,7 +25,7 @@ EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"> - diff --git a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx index c5cc62e5..08b7534e 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx @@ -86,31 +86,111 @@ - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -139,3 +219,15 @@ + diff --git a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs index 00d96290..160199f2 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs @@ -94,6 +94,10 @@ #endregion #region 获取审核记录信息 + public string FlowOperateId1; + public string FlowOperateId2; + public string FlowOperateId3; + public string FlowOperateId4; /// /// /// @@ -105,6 +109,7 @@ var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1); if (getF1 != null) { + FlowOperateId1 = getF1.FlowOperateId; this.txtForm1.Title = getF1.AuditFlowName + "："; if (getF1.OperaterTime.HasValue) { @@ -116,10 +121,105 @@ { this.txtOpinion1.Text = getF1.Opinion; } - this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId); + if (!string.IsNullOrEmpty(getF1.SignatureUrl)) + { + this.Image1.ImageUrl = "~/" + getF1.SignatureUrl; + } + var signUser1 = UserService.GetUserByUserId(getF1.OperaterId); + if (signUser1 != null) + { + this.txtName1.Text = signUser1.UserName; + } this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } + var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + if (getF2 != null) + { + FlowOperateId2 = getF2.FlowOperateId; + + this.txtForm2.Title = getF2.AuditFlowName + "："; + if (getF2.OperaterTime.HasValue) + { + if (getF2.IsAgree == true) + { + this.txtOpinion2.Text = "同意。"; + } + else + { + this.txtOpinion2.Text = getF2.Opinion; + } + if (!string.IsNullOrEmpty(getF2.SignatureUrl)) + { + this.Image2.ImageUrl = "~/" + getF2.SignatureUrl; + } + var signUser2 = UserService.GetUserByUserId(getF2.OperaterId); + if (signUser2 != null) + { + this.txtName2.Text = signUser2.UserName; + + } + this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + } + } + var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + if (getF3 != null) + { + FlowOperateId3 = getF3.FlowOperateId; + + this.txtForm3.Title = getF3.AuditFlowName + "："; + if (getF3.OperaterTime.HasValue) + { + if (getF3.IsAgree == true) + { + this.txtOpinion3.Text = "同意。"; + } + else + { + this.txtOpinion3.Text = getF3.Opinion; + } + if (!string.IsNullOrEmpty(getF3.SignatureUrl)) + { + this.Image3.ImageUrl = "~/" + getF3.SignatureUrl; + } + + var signUser3 = UserService.GetUserByUserId(getF3.OperaterId); + if (signUser3 != null) + { + this.txtName3.Text = signUser3.UserName; + } + this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + } + } + var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + if (getF4 != null) + { + FlowOperateId4 = getF4.FlowOperateId; + + this.txtForm4.Title = getF4.AuditFlowName + "："; + if (getF4.OperaterTime.HasValue) + { + if (getF4.IsAgree == true) + { + this.txtOpinion4.Text = "同意。"; + } + else + { + this.txtOpinion4.Text = getF4.Opinion; + } + if (!string.IsNullOrEmpty(getF4.SignatureUrl)) + { + this.Image4.ImageUrl = "~/" + getF4.SignatureUrl; + } + + var signUser4 = UserService.GetUserByUserId(getF4.OperaterId); + if (signUser4 != null) + { + this.txtName4.Text = signUser4.UserName; + } + this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + } + } //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); //if (getF2 != null) //{ diff --git a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs index 0eaeabc6..03f02f00 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs @@ -141,13 +141,13 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextArea txtOpinion1; /// - /// Label6 控件。 + /// HyperLink2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label6; + protected global::FineUIPro.HyperLink HyperLink2; /// /// txtName1 控件。 @@ -158,6 +158,15 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtName1; + /// + /// Image1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image1; + /// /// txtTime1 控件。 /// @@ -167,6 +176,168 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtTime1; + /// + /// txtForm2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm2; + + /// + /// txtOpinion2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion2; + + /// + /// HyperLink1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink1; + + /// + /// txtName2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName2; + + /// + /// Image2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image2; + + /// + /// txtTime2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime2; + + /// + /// txtForm3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm3; + + /// + /// txtOpinion3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion3; + + /// + /// HyperLink3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink3; + + /// + /// txtName3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName3; + + /// + /// Image3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image3; + + /// + /// txtTime3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime3; + + /// + /// txtForm4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm4; + + /// + /// txtOpinion4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion4; + + /// + /// HyperLink4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink4; + + /// + /// txtName4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName4; + + /// + /// Image4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image4; + + /// + /// txtTime4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime4; + /// /// txtCance 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/HeightWork.aspx b/SGGL/FineUIPro.Web/HSSE/License/HeightWork.aspx index 16fa88fa..9e76c9b7 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HeightWork.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/HeightWork.aspx @@ -25,7 +25,7 @@ EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"> - diff --git a/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx b/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx index a8597032..059fdd5b 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx @@ -100,30 +100,111 @@ - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -152,3 +233,15 @@ + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs index 3f521841..40c84561 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs @@ -91,6 +91,10 @@ #endregion #region 获取审核记录信息 + public string FlowOperateId1; + public string FlowOperateId2; + public string FlowOperateId3; + public string FlowOperateId4; /// /// /// @@ -102,6 +106,7 @@ var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1); if (getF1 != null) { + FlowOperateId1 = getF1.FlowOperateId; this.txtForm1.Title = getF1.AuditFlowName + "："; if (getF1.OperaterTime.HasValue) { @@ -113,10 +118,105 @@ { this.txtOpinion1.Text = getF1.Opinion; } - this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId); + if (!string.IsNullOrEmpty(getF1.SignatureUrl)) + { + this.Image1.ImageUrl = "~/" + getF1.SignatureUrl; + } + var signUser1 = UserService.GetUserByUserId(getF1.OperaterId); + if (signUser1 != null) + { + this.txtName1.Text = signUser1.UserName; + } this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } + var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + if (getF2 != null) + { + FlowOperateId2 = getF2.FlowOperateId; + + this.txtForm2.Title = getF2.AuditFlowName + "："; + if (getF2.OperaterTime.HasValue) + { + if (getF2.IsAgree == true) + { + this.txtOpinion2.Text = "同意。"; + } + else + { + this.txtOpinion2.Text = getF2.Opinion; + } + if (!string.IsNullOrEmpty(getF2.SignatureUrl)) + { + this.Image2.ImageUrl = "~/" + getF2.SignatureUrl; + } + var signUser2 = UserService.GetUserByUserId(getF2.OperaterId); + if (signUser2 != null) + { + this.txtName2.Text = signUser2.UserName; + + } + this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + } + } + var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + if (getF3 != null) + { + FlowOperateId3 = getF3.FlowOperateId; + + this.txtForm3.Title = getF3.AuditFlowName + "："; + if (getF3.OperaterTime.HasValue) + { + if (getF3.IsAgree == true) + { + this.txtOpinion3.Text = "同意。"; + } + else + { + this.txtOpinion3.Text = getF3.Opinion; + } + if (!string.IsNullOrEmpty(getF3.SignatureUrl)) + { + this.Image3.ImageUrl = "~/" + getF3.SignatureUrl; + } + + var signUser3 = UserService.GetUserByUserId(getF3.OperaterId); + if (signUser3 != null) + { + this.txtName3.Text = signUser3.UserName; + } + this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + } + } + var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + if (getF4 != null) + { + FlowOperateId4 = getF4.FlowOperateId; + + this.txtForm4.Title = getF4.AuditFlowName + "："; + if (getF4.OperaterTime.HasValue) + { + if (getF4.IsAgree == true) + { + this.txtOpinion4.Text = "同意。"; + } + else + { + this.txtOpinion4.Text = getF4.Opinion; + } + if (!string.IsNullOrEmpty(getF4.SignatureUrl)) + { + this.Image4.ImageUrl = "~/" + getF4.SignatureUrl; + } + + var signUser4 = UserService.GetUserByUserId(getF4.OperaterId); + if (signUser4 != null) + { + this.txtName4.Text = signUser4.UserName; + } + this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + } + } //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); //if (getF2 != null) //{ diff --git a/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.designer.cs index 9e34a8c0..610df6cf 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.designer.cs @@ -168,13 +168,13 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextArea txtOpinion1; /// - /// Label6 控件。 + /// HyperLink2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label6; + protected global::FineUIPro.HyperLink HyperLink2; /// /// txtName1 控件。 @@ -185,6 +185,15 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtName1; + /// + /// Image1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image1; + /// /// txtTime1 控件。 /// @@ -194,6 +203,168 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtTime1; + /// + /// txtForm2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm2; + + /// + /// txtOpinion2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion2; + + /// + /// HyperLink1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink1; + + /// + /// txtName2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName2; + + /// + /// Image2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image2; + + /// + /// txtTime2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime2; + + /// + /// txtForm3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm3; + + /// + /// txtOpinion3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion3; + + /// + /// HyperLink3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink3; + + /// + /// txtName3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName3; + + /// + /// Image3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image3; + + /// + /// txtTime3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime3; + + /// + /// txtForm4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm4; + + /// + /// txtOpinion4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion4; + + /// + /// HyperLink4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink4; + + /// + /// txtName4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName4; + + /// + /// Image4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image4; + + /// + /// txtTime4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime4; + /// /// txtCance 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/LiftingWork.aspx b/SGGL/FineUIPro.Web/HSSE/License/LiftingWork.aspx index f9081f25..91e549fe 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LiftingWork.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/LiftingWork.aspx @@ -25,7 +25,7 @@ EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"> - diff --git a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx index 2a140728..4edb9dd0 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx @@ -94,32 +94,113 @@ - + - + - + - + - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -149,3 +230,15 @@ + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs index b4a0f1b3..61df11fb 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs @@ -93,6 +93,10 @@ #endregion #region 获取审核记录信息 + public string FlowOperateId1; + public string FlowOperateId2; + public string FlowOperateId3; + public string FlowOperateId4; /// /// /// @@ -104,6 +108,7 @@ var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1); if (getF1 != null) { + FlowOperateId1 = getF1.FlowOperateId; this.txtForm1.Title = getF1.AuditFlowName + "："; if (getF1.OperaterTime.HasValue) { @@ -115,10 +120,105 @@ { this.txtOpinion1.Text = getF1.Opinion; } - this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId); + if (!string.IsNullOrEmpty(getF1.SignatureUrl)) + { + this.Image1.ImageUrl = "~/" + getF1.SignatureUrl; + } + var signUser1 = UserService.GetUserByUserId(getF1.OperaterId); + if (signUser1 != null) + { + this.txtName1.Text = signUser1.UserName; + } this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } + var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + if (getF2 != null) + { + FlowOperateId2 = getF2.FlowOperateId; + + this.txtForm2.Title = getF2.AuditFlowName + "："; + if (getF2.OperaterTime.HasValue) + { + if (getF2.IsAgree == true) + { + this.txtOpinion2.Text = "同意。"; + } + else + { + this.txtOpinion2.Text = getF2.Opinion; + } + if (!string.IsNullOrEmpty(getF2.SignatureUrl)) + { + this.Image2.ImageUrl = "~/" + getF2.SignatureUrl; + } + var signUser2 = UserService.GetUserByUserId(getF2.OperaterId); + if (signUser2 != null) + { + this.txtName2.Text = signUser2.UserName; + + } + this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + } + } + var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + if (getF3 != null) + { + FlowOperateId3 = getF3.FlowOperateId; + + this.txtForm3.Title = getF3.AuditFlowName + "："; + if (getF3.OperaterTime.HasValue) + { + if (getF3.IsAgree == true) + { + this.txtOpinion3.Text = "同意。"; + } + else + { + this.txtOpinion3.Text = getF3.Opinion; + } + if (!string.IsNullOrEmpty(getF3.SignatureUrl)) + { + this.Image3.ImageUrl = "~/" + getF3.SignatureUrl; + } + + var signUser3 = UserService.GetUserByUserId(getF3.OperaterId); + if (signUser3 != null) + { + this.txtName3.Text = signUser3.UserName; + } + this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + } + } + var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + if (getF4 != null) + { + FlowOperateId4 = getF4.FlowOperateId; + + this.txtForm4.Title = getF4.AuditFlowName + "："; + if (getF4.OperaterTime.HasValue) + { + if (getF4.IsAgree == true) + { + this.txtOpinion4.Text = "同意。"; + } + else + { + this.txtOpinion4.Text = getF4.Opinion; + } + if (!string.IsNullOrEmpty(getF4.SignatureUrl)) + { + this.Image4.ImageUrl = "~/" + getF4.SignatureUrl; + } + + var signUser4 = UserService.GetUserByUserId(getF4.OperaterId); + if (signUser4 != null) + { + this.txtName4.Text = signUser4.UserName; + } + this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + } + } //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); //if (getF2 != null) //{ diff --git a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.designer.cs index 7c590340..9ac1d3b2 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.designer.cs @@ -168,13 +168,13 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextArea txtOpinion1; /// - /// Label6 控件。 + /// HyperLink2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label6; + protected global::FineUIPro.HyperLink HyperLink2; /// /// txtName1 控件。 @@ -185,6 +185,15 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtName1; + /// + /// Image1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image1; + /// /// txtTime1 控件。 /// @@ -194,6 +203,168 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtTime1; + /// + /// txtForm2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm2; + + /// + /// txtOpinion2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion2; + + /// + /// HyperLink1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink1; + + /// + /// txtName2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName2; + + /// + /// Image2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image2; + + /// + /// txtTime2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime2; + + /// + /// txtForm3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm3; + + /// + /// txtOpinion3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion3; + + /// + /// HyperLink3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink3; + + /// + /// txtName3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName3; + + /// + /// Image3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image3; + + /// + /// txtTime3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime3; + + /// + /// txtForm4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm4; + + /// + /// txtOpinion4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion4; + + /// + /// HyperLink4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink4; + + /// + /// txtName4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName4; + + /// + /// Image4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image4; + + /// + /// txtTime4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime4; + /// /// txtCance 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpace.aspx b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpace.aspx index 78ecefd3..6d9ecb7b 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpace.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpace.aspx @@ -25,7 +25,7 @@ EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"> - diff --git a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx index 00ecf1a3..17cb09e5 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx @@ -114,32 +114,113 @@ - + - + - + - + - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -178,3 +259,15 @@ + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.cs index 72989e02..13c2c02a 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.cs @@ -117,6 +117,10 @@ #endregion #region 获取审核记录信息 + public string FlowOperateId1; + public string FlowOperateId2; + public string FlowOperateId3; + public string FlowOperateId4; /// /// /// @@ -128,6 +132,7 @@ var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1); if (getF1 != null) { + FlowOperateId1 = getF1.FlowOperateId; this.txtForm1.Title = getF1.AuditFlowName + "："; if (getF1.OperaterTime.HasValue) { @@ -139,10 +144,105 @@ { this.txtOpinion1.Text = getF1.Opinion; } - this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId); + if (!string.IsNullOrEmpty(getF1.SignatureUrl)) + { + this.Image1.ImageUrl = "~/" + getF1.SignatureUrl; + } + var signUser1 = UserService.GetUserByUserId(getF1.OperaterId); + if (signUser1 != null) + { + this.txtName1.Text = signUser1.UserName; + } this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } + var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + if (getF2 != null) + { + FlowOperateId2 = getF2.FlowOperateId; + + this.txtForm2.Title = getF2.AuditFlowName + "："; + if (getF2.OperaterTime.HasValue) + { + if (getF2.IsAgree == true) + { + this.txtOpinion2.Text = "同意。"; + } + else + { + this.txtOpinion2.Text = getF2.Opinion; + } + if (!string.IsNullOrEmpty(getF2.SignatureUrl)) + { + this.Image2.ImageUrl = "~/" + getF2.SignatureUrl; + } + var signUser2 = UserService.GetUserByUserId(getF2.OperaterId); + if (signUser2 != null) + { + this.txtName2.Text = signUser2.UserName; + + } + this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + } + } + var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + if (getF3 != null) + { + FlowOperateId3 = getF3.FlowOperateId; + + this.txtForm3.Title = getF3.AuditFlowName + "："; + if (getF3.OperaterTime.HasValue) + { + if (getF3.IsAgree == true) + { + this.txtOpinion3.Text = "同意。"; + } + else + { + this.txtOpinion3.Text = getF3.Opinion; + } + if (!string.IsNullOrEmpty(getF3.SignatureUrl)) + { + this.Image3.ImageUrl = "~/" + getF3.SignatureUrl; + } + + var signUser3 = UserService.GetUserByUserId(getF3.OperaterId); + if (signUser3 != null) + { + this.txtName3.Text = signUser3.UserName; + } + this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + } + } + var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + if (getF4 != null) + { + FlowOperateId4 = getF4.FlowOperateId; + + this.txtForm4.Title = getF4.AuditFlowName + "："; + if (getF4.OperaterTime.HasValue) + { + if (getF4.IsAgree == true) + { + this.txtOpinion4.Text = "同意。"; + } + else + { + this.txtOpinion4.Text = getF4.Opinion; + } + if (!string.IsNullOrEmpty(getF4.SignatureUrl)) + { + this.Image4.ImageUrl = "~/" + getF4.SignatureUrl; + } + + var signUser4 = UserService.GetUserByUserId(getF4.OperaterId); + if (signUser4 != null) + { + this.txtName4.Text = signUser4.UserName; + } + this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + } + } //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); //if (getF2 != null) //{ diff --git a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.designer.cs index 2f4615e6..d5ef4e3f 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.designer.cs @@ -195,13 +195,13 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextArea txtOpinion1; /// - /// Label6 控件。 + /// HyperLink2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label6; + protected global::FineUIPro.HyperLink HyperLink2; /// /// txtName1 控件。 @@ -212,6 +212,15 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtName1; + /// + /// Image1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image1; + /// /// txtTime1 控件。 /// @@ -221,6 +230,168 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtTime1; + /// + /// txtForm2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm2; + + /// + /// txtOpinion2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion2; + + /// + /// HyperLink1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink1; + + /// + /// txtName2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName2; + + /// + /// Image2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image2; + + /// + /// txtTime2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime2; + + /// + /// txtForm3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm3; + + /// + /// txtOpinion3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion3; + + /// + /// HyperLink3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink3; + + /// + /// txtName3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName3; + + /// + /// Image3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image3; + + /// + /// txtTime3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime3; + + /// + /// txtForm4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm4; + + /// + /// txtOpinion4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion4; + + /// + /// HyperLink4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink4; + + /// + /// txtName4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName4; + + /// + /// Image4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image4; + + /// + /// txtTime4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime4; + /// /// txtCance 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/NightWork.aspx b/SGGL/FineUIPro.Web/HSSE/License/NightWork.aspx index b7aa11fe..4c02eaec 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/NightWork.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/NightWork.aspx @@ -25,7 +25,7 @@ EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"> - diff --git a/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx b/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx index c8c03521..7ede8495 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx @@ -82,23 +82,26 @@ - + - + - + - + - - + + + + @@ -106,7 +109,7 @@ + BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="分包商HSE经理意见："> @@ -114,24 +117,28 @@ - + - - + + + + + - + + BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="五环施工经理意见："> @@ -139,87 +146,50 @@ - - - - + + + + + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -247,3 +217,15 @@ + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx.cs index 6ac4599a..ed751bed 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx.cs @@ -87,6 +87,10 @@ #endregion #region 获取审核记录信息 + public string FlowOperateId1; + public string FlowOperateId2; + public string FlowOperateId3; + public string FlowOperateId4; /// /// /// @@ -98,6 +102,7 @@ var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1); if (getF1 != null) { + FlowOperateId1 = getF1.FlowOperateId; this.txtForm1.Title = getF1.AuditFlowName + "："; if (getF1.OperaterTime.HasValue) { @@ -109,13 +114,23 @@ { this.txtOpinion1.Text = getF1.Opinion; } - this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId); + if (!string.IsNullOrEmpty(getF1.SignatureUrl)) + { + this.Image1.ImageUrl = "~/" + getF1.SignatureUrl; + } + var signUser1 = UserService.GetUserByUserId(getF1.OperaterId); + if (signUser1 != null) + { + this.txtName1.Text = signUser1.UserName; + } this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); if (getF2 != null) { + FlowOperateId2 = getF2.FlowOperateId; + this.txtForm2.Title = getF2.AuditFlowName + "："; if (getF2.OperaterTime.HasValue) { @@ -127,13 +142,24 @@ { this.txtOpinion2.Text = getF2.Opinion; } - this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId); + if (!string.IsNullOrEmpty(getF2.SignatureUrl)) + { + this.Image2.ImageUrl = "~/" + getF2.SignatureUrl; + } + var signUser2 = UserService.GetUserByUserId(getF2.OperaterId); + if (signUser2 != null) + { + this.txtName2.Text = signUser2.UserName; + + } this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); } } var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); if (getF3 != null) { + FlowOperateId3 = getF3.FlowOperateId; + this.txtForm3.Title = getF3.AuditFlowName + "："; if (getF3.OperaterTime.HasValue) { @@ -145,13 +171,24 @@ { this.txtOpinion3.Text = getF3.Opinion; } - this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId); + if (!string.IsNullOrEmpty(getF3.SignatureUrl)) + { + this.Image3.ImageUrl = "~/" + getF3.SignatureUrl; + } + + var signUser3 = UserService.GetUserByUserId(getF3.OperaterId); + if (signUser3 != null) + { + this.txtName3.Text = signUser3.UserName; + } this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); } } var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); if (getF4 != null) { + FlowOperateId4 = getF4.FlowOperateId; + this.txtForm4.Title = getF4.AuditFlowName + "："; if (getF4.OperaterTime.HasValue) { @@ -163,46 +200,19 @@ { this.txtOpinion4.Text = getF4.Opinion; } - this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); + if (!string.IsNullOrEmpty(getF4.SignatureUrl)) + { + this.Image4.ImageUrl = "~/" + getF4.SignatureUrl; + } + + var signUser4 = UserService.GetUserByUserId(getF4.OperaterId); + if (signUser4 != null) + { + this.txtName4.Text = signUser4.UserName; + } 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/NightWorkView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx.designer.cs index f3286821..19d55ba4 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.License { - - - public partial class NightWorkView { - +namespace FineUIPro.Web.HSSE.License +{ + + + public partial class NightWorkView + { + /// /// 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,7 +58,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtApplyUnit; - + /// /// txtApplyManName 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtApplyManName; - + /// /// txtWorkPalce 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkPalce; - + /// /// txtWorkMeasures 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkMeasures; - + /// /// txtWorkDate 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkDate; - + /// /// txtWorkLeader 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkLeader; - + /// /// txtSafeLeader 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSafeLeader; - + /// /// Grid1 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// txtForm1 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form txtForm1; - + /// /// txtOpinion1 控件。 /// @@ -137,16 +139,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtOpinion1; - + /// - /// Label6 控件。 + /// HyperLink2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label6; - + protected global::FineUIPro.HyperLink HyperLink2; + /// /// txtName1 控件。 /// @@ -155,7 +157,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtName1; - + + /// + /// Image1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image1; + /// /// txtTime1 控件。 /// @@ -164,7 +175,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtTime1; - + /// /// txtForm2 控件。 /// @@ -173,7 +184,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form txtForm2; - + /// /// txtOpinion2 控件。 /// @@ -182,16 +193,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtOpinion2; - + /// - /// Label1 控件。 + /// HyperLink1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label1; - + protected global::FineUIPro.HyperLink HyperLink1; + /// /// txtName2 控件。 /// @@ -200,7 +211,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtName2; - + + /// + /// Image2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image2; + /// /// txtTime2 控件。 /// @@ -209,7 +229,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtTime2; - + /// /// txtForm3 控件。 /// @@ -218,7 +238,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form txtForm3; - + /// /// txtOpinion3 控件。 /// @@ -227,16 +247,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtOpinion3; - + /// - /// Label2 控件。 + /// HyperLink3 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label2; - + protected global::FineUIPro.HyperLink HyperLink3; + /// /// txtName3 控件。 /// @@ -245,7 +265,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtName3; - + + /// + /// Image3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image3; + /// /// txtTime3 控件。 /// @@ -254,7 +283,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtTime3; - + /// /// txtForm4 控件。 /// @@ -263,7 +292,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form txtForm4; - + /// /// txtOpinion4 控件。 /// @@ -272,16 +301,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtOpinion4; - + /// - /// Label5 控件。 + /// HyperLink4 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label5; - + protected global::FineUIPro.HyperLink HyperLink4; + /// /// txtName4 控件。 /// @@ -290,7 +319,16 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtName4; - + + /// + /// Image4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image4; + /// /// txtTime4 控件。 /// @@ -299,97 +337,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 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 +346,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCance; - + /// /// txtClose 控件。 /// @@ -407,7 +355,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtClose; - + /// /// Toolbar1 控件。 /// @@ -416,7 +364,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// ToolbarFill1 控件。 /// @@ -425,7 +373,7 @@ namespace FineUIPro.Web.HSSE.License { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnClose 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuit.aspx b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuit.aspx index 966074e6..a1aaf97c 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuit.aspx @@ -25,7 +25,7 @@ EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"> - diff --git a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx index e35febcc..583ba674 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx @@ -83,32 +83,113 @@ - + - + - + - + - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -137,3 +218,15 @@ + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.cs index 7cdc55f1..db69bd7a 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.cs @@ -93,6 +93,10 @@ #endregion #region 获取审核记录信息 + public string FlowOperateId1; + public string FlowOperateId2; + public string FlowOperateId3; + public string FlowOperateId4; /// /// /// @@ -104,6 +108,7 @@ var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1); if (getF1 != null) { + FlowOperateId1 = getF1.FlowOperateId; this.txtForm1.Title = getF1.AuditFlowName + "："; if (getF1.OperaterTime.HasValue) { @@ -115,10 +120,105 @@ { this.txtOpinion1.Text = getF1.Opinion; } - this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId); + if (!string.IsNullOrEmpty(getF1.SignatureUrl)) + { + this.Image1.ImageUrl = "~/" + getF1.SignatureUrl; + } + var signUser1 = UserService.GetUserByUserId(getF1.OperaterId); + if (signUser1 != null) + { + this.txtName1.Text = signUser1.UserName; + } this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } + var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + if (getF2 != null) + { + FlowOperateId2 = getF2.FlowOperateId; + + this.txtForm2.Title = getF2.AuditFlowName + "："; + if (getF2.OperaterTime.HasValue) + { + if (getF2.IsAgree == true) + { + this.txtOpinion2.Text = "同意。"; + } + else + { + this.txtOpinion2.Text = getF2.Opinion; + } + if (!string.IsNullOrEmpty(getF2.SignatureUrl)) + { + this.Image2.ImageUrl = "~/" + getF2.SignatureUrl; + } + var signUser2 = UserService.GetUserByUserId(getF2.OperaterId); + if (signUser2 != null) + { + this.txtName2.Text = signUser2.UserName; + + } + this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + } + } + var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + if (getF3 != null) + { + FlowOperateId3 = getF3.FlowOperateId; + + this.txtForm3.Title = getF3.AuditFlowName + "："; + if (getF3.OperaterTime.HasValue) + { + if (getF3.IsAgree == true) + { + this.txtOpinion3.Text = "同意。"; + } + else + { + this.txtOpinion3.Text = getF3.Opinion; + } + if (!string.IsNullOrEmpty(getF3.SignatureUrl)) + { + this.Image3.ImageUrl = "~/" + getF3.SignatureUrl; + } + + var signUser3 = UserService.GetUserByUserId(getF3.OperaterId); + if (signUser3 != null) + { + this.txtName3.Text = signUser3.UserName; + } + this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + } + } + var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + if (getF4 != null) + { + FlowOperateId4 = getF4.FlowOperateId; + + this.txtForm4.Title = getF4.AuditFlowName + "："; + if (getF4.OperaterTime.HasValue) + { + if (getF4.IsAgree == true) + { + this.txtOpinion4.Text = "同意。"; + } + else + { + this.txtOpinion4.Text = getF4.Opinion; + } + if (!string.IsNullOrEmpty(getF4.SignatureUrl)) + { + this.Image4.ImageUrl = "~/" + getF4.SignatureUrl; + } + + var signUser4 = UserService.GetUserByUserId(getF4.OperaterId); + if (signUser4 != null) + { + this.txtName4.Text = signUser4.UserName; + } + this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + } + } //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); //if (getF2 != null) //{ diff --git a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.designer.cs index 4b4810f0..873a3ac4 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.designer.cs @@ -132,13 +132,13 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextArea txtOpinion1; /// - /// Label6 控件。 + /// HyperLink2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label6; + protected global::FineUIPro.HyperLink HyperLink2; /// /// txtName1 控件。 @@ -149,6 +149,15 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtName1; + /// + /// Image1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image1; + /// /// txtTime1 控件。 /// @@ -158,6 +167,168 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtTime1; + /// + /// txtForm2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm2; + + /// + /// txtOpinion2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion2; + + /// + /// HyperLink1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink1; + + /// + /// txtName2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName2; + + /// + /// Image2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image2; + + /// + /// txtTime2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime2; + + /// + /// txtForm3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm3; + + /// + /// txtOpinion3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion3; + + /// + /// HyperLink3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink3; + + /// + /// txtName3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName3; + + /// + /// Image3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image3; + + /// + /// txtTime3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime3; + + /// + /// txtForm4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm4; + + /// + /// txtOpinion4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion4; + + /// + /// HyperLink4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink4; + + /// + /// txtName4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName4; + + /// + /// Image4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image4; + + /// + /// txtTime4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime4; + /// /// txtCance 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/RadialWork.aspx b/SGGL/FineUIPro.Web/HSSE/License/RadialWork.aspx index 6acdb419..e767479a 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/RadialWork.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/RadialWork.aspx @@ -25,7 +25,7 @@ EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"> - diff --git a/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx b/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx index adbdf6ca..9f95a60b 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx @@ -96,32 +96,113 @@ - + - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -159,3 +240,15 @@ + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.cs index 23e26957..40b00482 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.cs @@ -90,6 +90,10 @@ #endregion #region 获取审核记录信息 + public string FlowOperateId1; + public string FlowOperateId2; + public string FlowOperateId3; + public string FlowOperateId4; /// /// /// @@ -101,6 +105,7 @@ var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1); if (getF1 != null) { + FlowOperateId1 = getF1.FlowOperateId; this.txtForm1.Title = getF1.AuditFlowName + "："; if (getF1.OperaterTime.HasValue) { @@ -112,10 +117,105 @@ { this.txtOpinion1.Text = getF1.Opinion; } - this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId); + if (!string.IsNullOrEmpty(getF1.SignatureUrl)) + { + this.Image1.ImageUrl = "~/" + getF1.SignatureUrl; + } + var signUser1 = UserService.GetUserByUserId(getF1.OperaterId); + if (signUser1 != null) + { + this.txtName1.Text = signUser1.UserName; + } this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } } + var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); + if (getF2 != null) + { + FlowOperateId2 = getF2.FlowOperateId; + + this.txtForm2.Title = getF2.AuditFlowName + "："; + if (getF2.OperaterTime.HasValue) + { + if (getF2.IsAgree == true) + { + this.txtOpinion2.Text = "同意。"; + } + else + { + this.txtOpinion2.Text = getF2.Opinion; + } + if (!string.IsNullOrEmpty(getF2.SignatureUrl)) + { + this.Image2.ImageUrl = "~/" + getF2.SignatureUrl; + } + var signUser2 = UserService.GetUserByUserId(getF2.OperaterId); + if (signUser2 != null) + { + this.txtName2.Text = signUser2.UserName; + + } + this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); + } + } + var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3); + if (getF3 != null) + { + FlowOperateId3 = getF3.FlowOperateId; + + this.txtForm3.Title = getF3.AuditFlowName + "："; + if (getF3.OperaterTime.HasValue) + { + if (getF3.IsAgree == true) + { + this.txtOpinion3.Text = "同意。"; + } + else + { + this.txtOpinion3.Text = getF3.Opinion; + } + if (!string.IsNullOrEmpty(getF3.SignatureUrl)) + { + this.Image3.ImageUrl = "~/" + getF3.SignatureUrl; + } + + var signUser3 = UserService.GetUserByUserId(getF3.OperaterId); + if (signUser3 != null) + { + this.txtName3.Text = signUser3.UserName; + } + this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); + } + } + var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + if (getF4 != null) + { + FlowOperateId4 = getF4.FlowOperateId; + + this.txtForm4.Title = getF4.AuditFlowName + "："; + if (getF4.OperaterTime.HasValue) + { + if (getF4.IsAgree == true) + { + this.txtOpinion4.Text = "同意。"; + } + else + { + this.txtOpinion4.Text = getF4.Opinion; + } + if (!string.IsNullOrEmpty(getF4.SignatureUrl)) + { + this.Image4.ImageUrl = "~/" + getF4.SignatureUrl; + } + + var signUser4 = UserService.GetUserByUserId(getF4.OperaterId); + if (signUser4 != null) + { + this.txtName4.Text = signUser4.UserName; + } + this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); + } + } //var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2); //if (getF2 != null) //{ diff --git a/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.designer.cs index bad502ca..aa0d0730 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.designer.cs @@ -159,13 +159,13 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextArea txtOpinion1; /// - /// Label6 控件。 + /// HyperLink2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label6; + protected global::FineUIPro.HyperLink HyperLink2; /// /// txtName1 控件。 @@ -176,6 +176,15 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtName1; + /// + /// Image1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image1; + /// /// txtTime1 控件。 /// @@ -185,6 +194,168 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtTime1; + /// + /// txtForm2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm2; + + /// + /// txtOpinion2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion2; + + /// + /// HyperLink1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink1; + + /// + /// txtName2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName2; + + /// + /// Image2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image2; + + /// + /// txtTime2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime2; + + /// + /// txtForm3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm3; + + /// + /// txtOpinion3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion3; + + /// + /// HyperLink3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink3; + + /// + /// txtName3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName3; + + /// + /// Image3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image3; + + /// + /// txtTime3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime3; + + /// + /// txtForm4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form txtForm4; + + /// + /// txtOpinion4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtOpinion4; + + /// + /// HyperLink4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink4; + + /// + /// txtName4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtName4; + + /// + /// Image4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image4; + + /// + /// txtTime4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtTime4; + /// /// txtCance 控件。 /// diff --git a/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs b/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs index f36217bc..114c1952 100644 --- a/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs +++ b/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs @@ -517,5 +517,10 @@ namespace Model get; set; } + + /// + /// 审核人id + /// + public string OperaterId { get; set; } } }