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 10c82e65..274aefe4 100644 Binary files a/SGGL/FineUIPro.Web/File/Word/HSSE/临时用电作业票.doc and b/SGGL/FineUIPro.Web/File/Word/HSSE/临时用电作业票.doc differ diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/动土作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/动土作业票.doc index 55f12de9..bdfc416f 100644 Binary files a/SGGL/FineUIPro.Web/File/Word/HSSE/动土作业票.doc and b/SGGL/FineUIPro.Web/File/Word/HSSE/动土作业票.doc differ diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc index d010ded1..e1bf8716 100644 Binary files a/SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc and b/SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc differ diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/受限空间作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/受限空间作业票.doc index 3b294b67..c8a9e96b 100644 Binary files a/SGGL/FineUIPro.Web/File/Word/HSSE/受限空间作业票.doc and b/SGGL/FineUIPro.Web/File/Word/HSSE/受限空间作业票.doc differ diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/吊装作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/吊装作业票.doc index 7cb27531..3de5e510 100644 Binary files a/SGGL/FineUIPro.Web/File/Word/HSSE/吊装作业票.doc and b/SGGL/FineUIPro.Web/File/Word/HSSE/吊装作业票.doc differ diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/夜间施工作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/夜间施工作业票.doc index 9dbff910..ea29f1d6 100644 Binary files a/SGGL/FineUIPro.Web/File/Word/HSSE/夜间施工作业票.doc and b/SGGL/FineUIPro.Web/File/Word/HSSE/夜间施工作业票.doc differ diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/射线作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/射线作业票.doc index 58269b51..0f0fb2ca 100644 Binary files a/SGGL/FineUIPro.Web/File/Word/HSSE/射线作业票.doc and b/SGGL/FineUIPro.Web/File/Word/HSSE/射线作业票.doc differ diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/断路（占道）作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/断路（占道）作业票.doc index d5b6ec54..0fa9d53b 100644 Binary files a/SGGL/FineUIPro.Web/File/Word/HSSE/断路（占道）作业票.doc and b/SGGL/FineUIPro.Web/File/Word/HSSE/断路（占道）作业票.doc differ diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/高处作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/高处作业票.doc index 83ecede6..ab2fe7dd 100644 Binary files a/SGGL/FineUIPro.Web/File/Word/HSSE/高处作业票.doc and b/SGGL/FineUIPro.Web/File/Word/HSSE/高处作业票.doc differ 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; } } }