diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-14.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-14.sql new file mode 100644 index 00000000..dd9d259d --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-14.sql @@ -0,0 +1,357 @@ + +--ȡǰ˴ +ALTER PROCEDURE [dbo].[Sp_APP_GetToDoItems] + @projectId NVARCHAR(50)=NULL, + @userId NVARCHAR(200)=NULL +AS +/*ȡǰ˴*/ +BEGIN +SELECT HazardRegisterId AS DataId + ,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId + ,'ȫѲ' AS MenuName + ,register.RegisterDef AS Content + ,UserId + ,users.UserName + ,register.RegisterDate AS DataTime + ,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr + ,'/pagesHSSE/safe/inspecitonconfirm' AS UrlStr +FROM HSSE_Hazard_HazardRegister AS register +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE register.ProjectId=@projectId AND +((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') )) +OR (register.states = '2' AND register.CheckManId =@userId)) + +UNION ALL +SELECT PlanId AS DataId + ,'B782A26B-D85C-4F84-8B45-F7AA47B3159E' AS MenuId + ,'ѵƻ' AS MenuName + ,PlanName AS Content + ,UserId + ,users.UserName + ,DesignerDate AS DataTime + ,CONVERT(varchar(100),DesignerDate, 23) AS DataTimeStr + ,'/pagesTest/test/trainindex' AS UrlStr +FROM Training_Plan AS ePlan +LEFT JOIN Sys_User AS users ON ePlan.DesignerId= users.UserId +WHERE (ePlan.ProjectId=@projectId or (@projectId is null and ePlan.ProjectId is null)) + AND (States = '0' OR States = '1' ) AND ePlan.DesignerId =@userId + +UNION ALL +SELECT TestPlanId AS DataId + ,'FAF7F4A4-A4BC-4D94-9E88-0CF5A380DB34' AS MenuId + ,'Լƻ' AS MenuName + ,PlanName AS Content + ,UserId + ,users.UserName + ,PlanDate AS DataTime + ,CONVERT(varchar(100),PlanDate, 23) AS DataTimeStr + ,'/pagesTest/test/testplan' AS UrlStr +FROM Training_TestPlan AS TPlan +LEFT JOIN Sys_User AS users ON users.UserId =TPlan.PlanManId +WHERE (TPlan.ProjectId=@projectId or (@projectId is null and TPlan.ProjectId is null)) + AND (States = '0' OR States = '1' ) AND PlanManId =@userId + +UNION ALL +SELECT TaskId AS DataId + ,'E108F75D-89D0-4DCA-8356-A156C328805C' AS MenuId + ,'ѵ' AS MenuName + ,Plans.PlanName AS Content + ,users.UserId + ,users.UserName + ,TaskDate AS DataTime + ,CONVERT(varchar(100),TaskDate, 23) AS DataTimeStr + ,('/pagesTest/test/taskindex') AS UrlStr +FROM Training_Task AS Task + LEFT JOIN Sys_User AS users ON users.UserId =@userId + LEFT JOIN Training_Plan AS Plans ON Plans.PlanId =Task.PlanId +WHERE (Task.ProjectId=@projectId or (@projectId is null and Task.ProjectId is null)) + AND (Task.States IS NULL OR Task.States != 2) + AND Task.UserId = @userId + +UNION ALL +SELECT TestRecordId AS DataId + ,'0EEB138D-84F9-4686-8CBB-CAEAA6CF1B2A' AS MenuId + ,'ɨ뿼' AS MenuName + ,TestPlan.PlanName AS Content + ,TestRecord.TestManId + ,Person.PersonName + ,TestPlan.TestStartTime AS DataTime + ,CONVERT(varchar(100),TestPlan.TestStartTime, 23) AS DataTimeStr + ,('/pages/temp_index/index') AS UrlStr +FROM Training_TestRecord AS TestRecord +left join Training_TestPlan as TestPlan on TestRecord.TestPlanId = TestPlan.TestPlanId +left join SitePerson_Person as Person on Person.PersonId = TestRecord.TestManId +left join Sys_User as uses on Person.IdentityCard = uses.IdentityCard +WHERE (TestRecord.ProjectId=@projectId or (@projectId is null and TestRecord.ProjectId is null)) +AND TestPlan.States ='1' +AND TestRecord.TestEndTime IS NULL +AND (TestRecord.TestManId = @userId or uses.UserId = @userId) + +UNION ALL +SELECT FireWorkId AS DataId + ,'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' AS MenuId + ,'ҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/dhuo/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_FireWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT HeightWorkId AS DataId + ,'DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9' AS MenuId + ,'ߴҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/gchu/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_HeightWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT LimitedSpaceId AS DataId + ,'AEC9166D-1C91-45F0-8BFE-D3D0479A28C7' AS MenuId + ,'޿ռ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/sxkj/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_LimitedSpace AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT RadialWorkId AS DataId + ,'F72FF20B-D3EB-46A5-97F7-C99B2473A140' AS MenuId + ,'ҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/sx/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_RadialWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT OpenCircuitId AS DataId + ,'4E607E83-41FC-4F49-B26F-A21CFE38328F' AS MenuId + ,'·(ռ)' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/dlu/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_OpenCircuit AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT BreakGroundId AS DataId + ,'755C6AC9-2E38-4D4F-AF33-33CB1744A907' AS MenuId + ,'ҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/dtu/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_BreakGround AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT NightWorkId AS DataId + ,'7BBAE649-7B00-4475-A911-BFE3A37AC55B' AS MenuId + ,'ҹʩ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/yjsg/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_NightWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT LiftingWorkId AS DataId + ,'A1BE3AB6-9D4A-41E7-8870-E73423165451' AS MenuId + ,'װҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/dzhuang/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_LiftingWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT RectifyNoticesId AS DataId + ,'0038D764-D628-46F0-94FF-D0A22C3C45A3' AS MenuId + ,'' AS MenuName + ,(CASE WHEN Rectify.States =1 THEN 'ǩ' + WHEN Rectify.States =2 THEN 'ģ' + WHEN Rectify.States =3 THEN 'ˣ' + WHEN Rectify.States =4 THEN '飺' + WHEN Rectify.States =5 THEN 'ɣ' + ELSE 'ύ' END + RectifyNoticesCode) AS Content + ,users.UserId + ,users.UserName + ,CheckedDate AS DataTime + ,CONVERT(varchar(100),CheckedDate, 23) AS DataTimeStr + ,(CASE WHEN ISNULL(Rectify.States,0) =0 THEN '/pagesHSSE/rn/rn_add' --ύ + WHEN Rectify.States =1 THEN '/pagesHSSE/rn/rn_approval' --ǩ + WHEN Rectify.States =2 THEN '/pagesHSSE/rn/rn_rectify' -- + WHEN Rectify.States =3 THEN '/pagesHSSE/rn/rn_rectifycf' -- + WHEN Rectify.States =4 THEN '/pagesHSSE/rn/rn_confirm' -- + ELSE '/pagesHSSE/rn/rn_add' END) AS UrlStr +FROM Check_RectifyNotices AS Rectify + LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Rectify.Projectid=@projectId AND Rectify.States <> 5 + AND ((ISNULL(Rectify.States,0) =0 AND Rectify.CompleteManId LIKE '%'+ @userId+'%') + OR (Rectify.States =1 AND Rectify.SignPerson LIKE '%'+ @userId+'%') + OR (Rectify.States =2 AND Rectify.DutyPersonId LIKE '%'+ @userId+'%') + OR (Rectify.States =3 AND Rectify.UnitHeadManId LIKE '%'+ @userId+'%') + OR (Rectify.States =4 AND Rectify.CheckPerson LIKE '%'+ @userId+'%') + OR (Rectify.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND (ProfessionalEngineerTime1 IS NULL OR ProfessionalEngineerTime2 IS NULL)) + OR (Rectify.ConstructionManagerId LIKE '%'+ @userId+'%' AND (ConstructionManagerTime1 IS NULL OR ConstructionManagerTime2 IS NULL)) + OR (Rectify.ProjectManagerId LIKE '%'+ @userId+'%' AND (ProjectManagerTime1 IS NULL OR ProjectManagerTime2 IS NULL))) + +UNION ALL +SELECT PersonId AS DataId + ,'EE260447-028F-46AF-8864-9A5DC9DAA5BD' AS MenuId + ,'ֳԱ' AS MenuName + ,Person.PersonName AS Content + ,users.UserId + ,users.UserName + ,Person.InTime AS DataTime + ,CONVERT(varchar(100),Person.InTime, 23) AS DataTimeStr + ,('/pagesHSSE/info/peopledetail') AS UrlStr +FROM SitePerson_Person AS Person + LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Person.ProjectId=@projectId AND (Person.IsUsed IS NULL OR Person.IsUsed= 0) + AND Person.AuditorId = @userId AND Person.AuditorDate IS NULL + + +UNION ALL +SELECT PauseNoticeId AS DataId + ,'C81DB7ED-165E-4C69-86B0-A3AAE37059FE' AS MenuId + ,'ͣ' AS MenuName + ,(CASE WHEN PauseNotice.PauseStates =1 THEN 'ǩ' + WHEN PauseNotice.PauseStates =2 THEN '׼' + WHEN PauseNotice.PauseStates =3 THEN 'գ' + ELSE 'ύ' END + PauseNoticeCode) AS Content + ,users.UserId + ,users.UserName + ,PauseTime AS DataTime + ,CONVERT(varchar(100),PauseTime, 23) AS DataTimeStr + ,(CASE WHEN ISNULL(PauseNotice.PauseStates,0) =0 THEN '/pagesHSSE/info/stop_add ' --ύ + WHEN PauseNotice.PauseStates =1 AND PauseNotice.SignManId=@userId THEN '/pagesHSSE/info/stop_approval' --ǩ + WHEN PauseNotice.PauseStates =2 AND PauseNotice.ApproveManId=@userId THEN '/pagesHSSE/info/stop_confirm' --׼ + WHEN PauseNotice.PauseStates =3 AND PauseNotice.DutyPersonId=@userId THEN '/pagesHSSE/info/stop_feedback' -- + ELSE '/pagesHSSE/info/stop_detail' END) AS UrlStr +FROM Check_PauseNotice AS PauseNotice + LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE PauseNotice.ProjectId=@projectId AND PauseNotice.PauseStates <> 4 + AND ((ISNULL(PauseNotice.PauseStates,0) =0 AND PauseNotice.CompileManId LIKE '%'+ @userId+'%') + OR (PauseNotice.PauseStates =1 AND PauseNotice.SignManId LIKE '%'+ @userId+'%') + OR (PauseNotice.PauseStates =2 AND PauseNotice.ApproveManId LIKE '%'+ @userId+'%') + OR (PauseNotice.PauseStates =3 AND PauseNotice.DutyPersonId LIKE '%'+ @userId+'%') + OR (PauseNotice.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND ProfessionalEngineerTime IS NULL) + OR (PauseNotice.ConstructionManagerId LIKE '%'+ @userId+'%' AND ConstructionManagerTime IS NULL) + OR (PauseNotice.UnitHeadManId LIKE '%'+ @userId+'%' AND UnitHeadManTime IS NULL) + OR (PauseNotice.SupervisorManId LIKE '%'+ @userId+'%' AND SupervisorManTime IS NULL) + OR (PauseNotice.OwnerId LIKE '%'+ @userId+'%' AND OwnerTime IS NULL)) +UNION ALL +SELECT PunishNoticeId AS DataId + ,'755F1C1D-2178-47D8-9F82-A501B53A2436' AS MenuId + ,'' AS MenuName + ,(CASE WHEN PunishNotice.PunishStates =1 THEN 'ǩ' + WHEN PunishNotice.PunishStates =2 THEN '׼' + WHEN PunishNotice.PunishStates =3 THEN 'ִ' + ELSE 'ύ' END + PunishNoticeCode) AS Content + ,users.UserId + ,users.UserName + ,PunishNoticeDate AS DataTime + ,CONVERT(varchar(100),PunishNoticeDate, 23) AS DataTimeStr + ,(CASE WHEN ISNULL(PunishNotice.PunishStates,0) =0 THEN '/pagesTest/punish/add' --ύ + WHEN PunishNotice.PunishStates =1 AND PunishNotice.SignMan=@userId THEN '/pagesTest/punish/approval' --ǩ + WHEN PunishNotice.PunishStates =2 AND PunishNotice.ApproveMan=@userId THEN '/pagesTest/punish/rectify' --׼ + WHEN PunishNotice.PunishStates =3 AND PunishNotice.DutyPersonId=@userId THEN '/pagesTest/punish/rectifycf' --ִ + ELSE '/pagesTest/punish/detail' END) AS UrlStr +FROM Check_PunishNotice AS PunishNotice + LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE PunishNotice.ProjectId=@projectId AND PunishNotice.PunishStates <> 4 + AND ((ISNULL(PunishNotice.PunishStates,0) =0 AND PunishNotice.CompileMan LIKE '%'+ @userId+'%') + OR (PunishNotice.PunishStates =1 AND PunishNotice.SignMan LIKE '%'+ @userId+'%') + OR (PunishNotice.PunishStates =2 AND PunishNotice.ApproveMan LIKE '%'+ @userId+'%') + OR (PunishNotice.PunishStates =3 AND PunishNotice.DutyPersonId LIKE '%'+ @userId+'%') + OR (PunishNotice.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND ProfessionalEngineerTime IS NULL) + OR (PunishNotice.ConstructionManagerId LIKE '%'+ @userId+'%' AND ConstructionManagerTime IS NULL) + OR (PunishNotice.UnitHeadManId LIKE '%'+ @userId+'%' AND UnitHeadManTime IS NULL)) +UNION ALL +SELECT ElectricityId AS DataId + ,'48F64E0F-38B2-4BDC-9B61-6200BD02CBF5' AS MenuId + ,'ʱõ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/ldian/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_Electricity AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +ORDER BY DataTime DESC +END + + + + + + +GO + + diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-18.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-18.sql new file mode 100644 index 00000000..7d7c6905 Binary files /dev/null and b/DataBase/版本日志/SGGLDB_WH_2023-09-18.sql differ diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-19.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-19.sql new file mode 100644 index 00000000..0c0a1213 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-19.sql @@ -0,0 +1,322 @@ +--==ģ +--WP01 Գ +delete PreRun_WorkInspectTemplate where WorkInspectId='4A52BDAB-2143-4C61-8C7D-F91BE24A2B71' +delete PreRun_WorkInspectTemplate where WorkInspectId='4FCA00CE-391B-43D3-8B6D-D47052CE6565' +delete PreRun_WorkInspectTemplate where WorkInspectId='777B8494-09EC-480D-97C9-702C9FCCC0EB' +delete PreRun_WorkInspectTemplate where WorkInspectId='BC51D8E6-2689-4F04-90C5-79F1C84C41FB' +delete PreRun_WorkInspectTemplate where WorkInspectId='4560A417-F1B9-4121-B058-AFD983BEC194' +delete PreRun_WorkInspectTemplate where WorkInspectId='F504A7E2-ADB9-4BCE-8A7E-F3E971EB9DDD' +delete PreRun_WorkInspectTemplate where WorkInspectId='4FD78960-91ED-4A23-B8D5-E7189152E452' +delete PreRun_WorkInspectTemplate where WorkInspectId='72EAEDF3-DFB1-4B5F-A601-B80BBB718760' +delete PreRun_WorkInspectTemplate where WorkInspectId='A1929105-319D-4637-9251-B4300FDE4C0D' +delete PreRun_WorkInspectTemplate where WorkInspectId='6E1A98B5-7B1E-404D-847C-8E9B7889B13F' +delete PreRun_WorkInspectTemplate where WorkInspectId='78F1C600-EA2E-4CD4-B67A-B9C3432F981B' +delete PreRun_WorkInspectTemplate where WorkInspectId='0AFFD4A5-6853-4875-97AE-9C6B925C9334' +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('4A52BDAB-2143-4C61-8C7D-F91BE24A2B71','1C01150C-977E-499A-9173-95F319BEEF87','ðװȫƺ͹淶Ĺ涨װ¼ȫ','','',GETDATE(),1) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('4FCA00CE-391B-43D3-8B6D-D47052CE6565','1C01150C-977E-499A-9173-95F319BEEF87','ιཬѴﵽǿȣĨѾɡ','','',GETDATE(),2) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('777B8494-09EC-480D-97C9-702C9FCCC0EB','1C01150C-977E-499A-9173-95F319BEEF87','ܵϵͳѹϴɨϸϸ','','',GETDATE(),3) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('BC51D8E6-2689-4F04-90C5-79F1C84C41FB','1C01150C-977E-499A-9173-95F319BEEF87','ȫҪ','','',GETDATE(),4) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('4560A417-F1B9-4121-B058-AFD983BEC194','1C01150C-977E-499A-9173-95F319BEEF87','ܷ͹ܵ豸ϴϸ񣬲תϸ','','',GETDATE(),5) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('F504A7E2-ADB9-4BCE-8A7E-F3E971EB9DDD','1C01150C-977E-499A-9173-95F319BEEF87','ʴʩѻɡ','','',GETDATE(),6) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('4FD78960-91ED-4A23-B8D5-E7189152E452','1C01150C-977E-499A-9173-95F319BEEF87','ڴ涨','','',GETDATE(),7) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('72EAEDF3-DFB1-4B5F-A601-B80BBB718760','1C01150C-977E-499A-9173-95F319BEEF87','DZװ꣬ơĵԷҪ','','',GETDATE(),8) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('A1929105-319D-4637-9251-B4300FDE4C0D','1C01150C-977E-499A-9173-95F319BEEF87','߱ȴˮܷˮDZȷӦ','','',GETDATE(),9) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('6E1A98B5-7B1E-404D-847C-8E9B7889B13F','1C01150C-977E-499A-9173-95F319BEEF87','ֳȫʩͶƷ׼','','',GETDATE(),10) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('78F1C600-EA2E-4CD4-B67A-B9C3432F981B','1C01150C-977E-499A-9173-95F319BEEF87','DZߡ¼뱸Աλ','','',GETDATE(),11) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('0AFFD4A5-6853-4875-97AE-9C6B925C9334','1C01150C-977E-499A-9173-95F319BEEF87','','','',GETDATE(),12) +--WP02 ܵϴ +delete PreRun_WorkInspectTemplate where WorkInspectId='D114152C-AB8F-4A27-BB99-047EFC6A659B' +delete PreRun_WorkInspectTemplate where WorkInspectId='A9EE383E-9073-4C6A-9BF9-6A55D13DED78' +delete PreRun_WorkInspectTemplate where WorkInspectId='ECEAF45C-43E1-4DBD-9ECF-EB509B30C727' +delete PreRun_WorkInspectTemplate where WorkInspectId='123E15BA-8885-445A-8C88-FFEE69E6AAC3' +delete PreRun_WorkInspectTemplate where WorkInspectId='98E970F7-58E2-4EFC-B74F-0D724B968ED2' +delete PreRun_WorkInspectTemplate where WorkInspectId='2340CB66-6CB4-47A6-A80C-F7C523E7F19D' +delete PreRun_WorkInspectTemplate where WorkInspectId='FE74C3B5-33D7-4DB2-A234-CF61248AE508' +delete PreRun_WorkInspectTemplate where WorkInspectId='C57CBFFD-B11F-4F8F-A637-B7EF6344B818' +delete PreRun_WorkInspectTemplate where WorkInspectId='BDD6D5B1-C82C-46A1-BCC5-5F66BFCE4C72' +delete PreRun_WorkInspectTemplate where WorkInspectId='C6171D1B-9B3C-47A5-A5BE-BB21525C67A9' +delete PreRun_WorkInspectTemplate where WorkInspectId='2DA39968-C16D-4723-9932-80804B0F88E6' +delete PreRun_WorkInspectTemplate where WorkInspectId='11F562CB-9867-46E3-A42A-3DCF6C9B80A6' +delete PreRun_WorkInspectTemplate where WorkInspectId='435AF81B-23CD-4EE8-8023-7F26BF8672AA' +delete PreRun_WorkInspectTemplate where WorkInspectId='948611DC-519D-465A-BBA2-5BD26C70C62A' +delete PreRun_WorkInspectTemplate where WorkInspectId='2F77D05B-837C-4A74-AAAD-2BCDAF7444D7' +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('D114152C-AB8F-4A27-BB99-047EFC6A659B','641DA0F4-42A7-4DE3-9A57-95A606016655','ϴɨ·ڵĹܵѹϸ','','',GETDATE(),1) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('A9EE383E-9073-4C6A-9BF9-6A55D13DED78','641DA0F4-42A7-4DE3-9A57-95A606016655','װƵĿװȡ','','',GETDATE(),2) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('ECEAF45C-43E1-4DBD-9ECF-EB509B30C727','641DA0F4-42A7-4DE3-9A57-95A606016655','ҪѲȡЧʩ','','',GETDATE(),3) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('123E15BA-8885-445A-8C88-FFEE69E6AAC3','641DA0F4-42A7-4DE3-9A57-95A606016655','ڷѲѲȡʩ','','',GETDATE(),4) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('98E970F7-58E2-4EFC-B74F-0D724B968ED2','641DA0F4-42A7-4DE3-9A57-95A606016655','Ҫ¶ȼƲԪʱͷס','','',GETDATE(),5) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('2340CB66-6CB4-47A6-A80C-F7C523E7F19D','641DA0F4-42A7-4DE3-9A57-95A606016655','ҪDZѲȡЧʩ','','',GETDATE(),6) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('FE74C3B5-33D7-4DB2-A234-CF61248AE508','641DA0F4-42A7-4DE3-9A57-95A606016655','ͽλ״̬ϳϴɨҪ','','',GETDATE(),7) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('C57CBFFD-B11F-4F8F-A637-B7EF6344B818','641DA0F4-42A7-4DE3-9A57-95A606016655','֧״̬ϳϴɨҪ','','',GETDATE(),8) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('BDD6D5B1-C82C-46A1-BCC5-5F66BFCE4C72','641DA0F4-42A7-4DE3-9A57-95A606016655','ưѲä塣','','',GETDATE(),9) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('C6171D1B-9B3C-47A5-A5BE-BB21525C67A9','641DA0F4-42A7-4DE3-9A57-95A606016655','豸ڼĭ̵ѲȡЧʩ','','',GETDATE(),10) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('2DA39968-C16D-4723-9932-80804B0F88E6','641DA0F4-42A7-4DE3-9A57-95A606016655','ϴܵ޹ϵͳäʩƱʾ','','',GETDATE(),11) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('11F562CB-9867-46E3-A42A-3DCF6C9B80A6','641DA0F4-42A7-4DE3-9A57-95A606016655','ųѼӹ̣ʱ̶ʩϳϴɨҪ','','',GETDATE(),12) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('435AF81B-23CD-4EE8-8023-7F26BF8672AA','641DA0F4-42A7-4DE3-9A57-95A606016655','ȫʩϳϴɨҪ','','',GETDATE(),13) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('948611DC-519D-465A-BBA2-5BD26C70C62A','641DA0F4-42A7-4DE3-9A57-95A606016655','ʩϳϴɨҪ','','',GETDATE(),14) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('2F77D05B-837C-4A74-AAAD-2BCDAF7444D7','641DA0F4-42A7-4DE3-9A57-95A606016655','','','',GETDATE(),15) +--WP03 ܵɨ +delete PreRun_WorkInspectTemplate where WorkInspectId='BC693EF5-405B-4341-8D7F-E1A7DF613CB5' +delete PreRun_WorkInspectTemplate where WorkInspectId='D1977C77-1823-4EC6-8B6A-576ED5C664BC' +delete PreRun_WorkInspectTemplate where WorkInspectId='BC5B90E2-BE72-4957-98CF-0018F8F79900' +delete PreRun_WorkInspectTemplate where WorkInspectId='B8700369-6E43-4D4A-8D35-5D46E064511C' +delete PreRun_WorkInspectTemplate where WorkInspectId='4CBE76B2-1760-428C-9855-30FBD610157D' +delete PreRun_WorkInspectTemplate where WorkInspectId='CC5718D2-10D4-449E-8527-3ABD6E12F120' +delete PreRun_WorkInspectTemplate where WorkInspectId='99068D60-FD45-4435-890C-52E5BC743645' +delete PreRun_WorkInspectTemplate where WorkInspectId='A830F841-C86F-45F6-A888-7EFFA9914F9C' +delete PreRun_WorkInspectTemplate where WorkInspectId='7671F673-6BF1-4A65-9848-6ED60E541C38' +delete PreRun_WorkInspectTemplate where WorkInspectId='41B4C1ED-0D00-4C8F-BDB6-8C3450330255' +delete PreRun_WorkInspectTemplate where WorkInspectId='A0CD44CB-48FC-46E7-A7EA-177B8D880409' +delete PreRun_WorkInspectTemplate where WorkInspectId='3C5F0A0B-0A45-45BE-BDC8-8444415DFEAC' +delete PreRun_WorkInspectTemplate where WorkInspectId='AE04B9B6-0143-411D-BD45-C53FEC73D78C' +delete PreRun_WorkInspectTemplate where WorkInspectId='F51EAB4B-96E8-48C6-848D-DD0EBEDA7539' +delete PreRun_WorkInspectTemplate where WorkInspectId='7428215F-D5BE-4FE3-98B9-6D962B13224B' +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('BC693EF5-405B-4341-8D7F-E1A7DF613CB5','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ϴɨ·ڵĹܵѹϸ','','',GETDATE(),1) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('D1977C77-1823-4EC6-8B6A-576ED5C664BC','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','װƵĿװȡ','','',GETDATE(),2) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('BC5B90E2-BE72-4957-98CF-0018F8F79900','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ҪѲȡЧʩ','','',GETDATE(),3) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('B8700369-6E43-4D4A-8D35-5D46E064511C','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ڷѲѲȡʩ','','',GETDATE(),4) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('4CBE76B2-1760-428C-9855-30FBD610157D','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','Ҫ¶ȼƲԪʱͷס','','',GETDATE(),5) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('CC5718D2-10D4-449E-8527-3ABD6E12F120','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ҪDZѲȡЧʩ','','',GETDATE(),6) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('99068D60-FD45-4435-890C-52E5BC743645','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ͽλ״̬ϳϴɨҪ','','',GETDATE(),7) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('A830F841-C86F-45F6-A888-7EFFA9914F9C','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','֧״̬ϳϴɨҪ','','',GETDATE(),8) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('7671F673-6BF1-4A65-9848-6ED60E541C38','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ưѲä塣','','',GETDATE(),9) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('41B4C1ED-0D00-4C8F-BDB6-8C3450330255','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','豸ڼĭ̵ѲȡЧʩ','','',GETDATE(),10) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('A0CD44CB-48FC-46E7-A7EA-177B8D880409','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ϴܵ޹ϵͳäʩƱʾ','','',GETDATE(),11) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('3C5F0A0B-0A45-45BE-BDC8-8444415DFEAC','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ųѼӹ̣ʱ̶ʩϳϴɨҪ','','',GETDATE(),12) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('AE04B9B6-0143-411D-BD45-C53FEC73D78C','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ȫʩϳϴɨҪ','','',GETDATE(),13) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('F51EAB4B-96E8-48C6-848D-DD0EBEDA7539','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ʩϳϴɨҪ','','',GETDATE(),14) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('7428215F-D5BE-4FE3-98B9-6D962B13224B','BEB24AE8-F66D-458B-ADFD-3810405B5EB8','','','',GETDATE(),15) +--WP05 ѧϴ +delete PreRun_WorkInspectTemplate where WorkInspectId='2C74C5DE-D600-425E-9870-061715D0AA93' +delete PreRun_WorkInspectTemplate where WorkInspectId='F2F146F9-4A2A-40E2-9FA3-83B954DF4775' +delete PreRun_WorkInspectTemplate where WorkInspectId='EF527C06-4CAB-46EC-A6C6-FB5C9152C03B' +delete PreRun_WorkInspectTemplate where WorkInspectId='25D55B52-6083-4856-BEAA-F983DB250CE2' +delete PreRun_WorkInspectTemplate where WorkInspectId='14DBD15B-F40E-4FAD-B903-5FACEF1D85F4' +delete PreRun_WorkInspectTemplate where WorkInspectId='89D04B6E-16D0-4870-B006-7ADA9FED4F8D' +delete PreRun_WorkInspectTemplate where WorkInspectId='B534309B-1767-47A2-9729-46ACB732AAD2' +delete PreRun_WorkInspectTemplate where WorkInspectId='D76DB877-D8C6-45EB-BDB0-E33AC3EA3272' +delete PreRun_WorkInspectTemplate where WorkInspectId='6CB94B9D-2ED6-4C6D-A164-1AE8EE3CB02E' +delete PreRun_WorkInspectTemplate where WorkInspectId='F9B9A741-A9F1-4863-86C1-B061A4645B1F' +delete PreRun_WorkInspectTemplate where WorkInspectId='4C1F3A32-A3CF-48A9-83A5-ACD7C6CBE644' +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('2C74C5DE-D600-425E-9870-061715D0AA93','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ѧϴ·Ĺܵѹϸ','','',GETDATE(),1) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('F2F146F9-4A2A-40E2-9FA3-83B954DF4775','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ϵͳ·ıáѹѵԳϸ','','',GETDATE(),2) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('EF527C06-4CAB-46EC-A6C6-FB5C9152C03B','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ҪDZڷѲȡЧʩ','','',GETDATE(),3) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('25D55B52-6083-4856-BEAA-F983DB250CE2','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ϵͳе豸ڼѲȡʩ','','',GETDATE(),4) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('14DBD15B-F40E-4FAD-B903-5FACEF1D85F4','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ҪIJԪʱͷס','','',GETDATE(),5) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('89D04B6E-16D0-4870-B006-7ADA9FED4F8D','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','֧ܵܰװϷҪ','','',GETDATE(),6) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('B534309B-1767-47A2-9729-46ACB732AAD2','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','֧״̬ϻѧϴҪ','','',GETDATE(),7) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('D76DB877-D8C6-45EB-BDB0-E33AC3EA3272','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ưѲä塣','','',GETDATE(),8) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('6CB94B9D-2ED6-4C6D-A164-1AE8EE3CB02E','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ϴϵͳ޹ϵͳäʩƱʾ','','',GETDATE(),9) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('F9B9A741-A9F1-4863-86C1-B061A4645B1F','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ѧϴʱʩԴҩƷѧߵȽѱ롣','','',GETDATE(),10) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('4C1F3A32-A3CF-48A9-83A5-ACD7C6CBE644','474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ȫʩϻѧϴҪ','','',GETDATE(),11) + +--WP06 ¯ +delete PreRun_WorkInspectTemplate where WorkInspectId='CB8F1765-C8BB-484C-9F26-21C8E9CB4CE7' +delete PreRun_WorkInspectTemplate where WorkInspectId='F2F29570-1975-4014-A99A-4A03DB4A536D' +delete PreRun_WorkInspectTemplate where WorkInspectId='1A00CB42-25E4-4F97-A1B5-3F7C4490F223' +delete PreRun_WorkInspectTemplate where WorkInspectId='9DECCBE6-65CC-419A-A048-979783FD6842' +delete PreRun_WorkInspectTemplate where WorkInspectId='21BF145B-EA14-4E55-B037-E819234F1F7A' +delete PreRun_WorkInspectTemplate where WorkInspectId='5E0511A0-C5A9-4B61-9685-4E6C8037F4C6' +delete PreRun_WorkInspectTemplate where WorkInspectId='C7593DCE-AA2A-4049-91E5-39E0E9B0E13A' +delete PreRun_WorkInspectTemplate where WorkInspectId='583F587F-DAC6-480B-9731-5BAC193E7F96' +delete PreRun_WorkInspectTemplate where WorkInspectId='5DFCD094-DDF7-4B2C-9734-37FF80763974' +delete PreRun_WorkInspectTemplate where WorkInspectId='FA2DCD68-F4CE-495A-AF9F-E368248D5386' +delete PreRun_WorkInspectTemplate where WorkInspectId='3DEF5BB6-E60F-4F7A-85AB-74FE48BE3E93' +delete PreRun_WorkInspectTemplate where WorkInspectId='ED369C77-1B1A-46DE-826E-DDD9E866A4D7' +delete PreRun_WorkInspectTemplate where WorkInspectId='A0C6A601-ABBE-4EBF-9193-2796F56ADD91' +delete PreRun_WorkInspectTemplate where WorkInspectId='177F8D2C-BE13-437E-92EB-B0C79797F161' +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('CB8F1765-C8BB-484C-9F26-21C8E9CB4CE7','3289A3D2-0691-4AD1-BDF3-1FD784564E71','¯ǽ(졢̵ͷ)½ڲɾ','','',GETDATE(),1) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('F2F29570-1975-4014-A99A-4A03DB4A536D','3289A3D2-0691-4AD1-BDF3-1FD784564E71','豸еĵºͨˮ֣ѲȡͨˮͨȴʩԷܵ¡','','',GETDATE(),2) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('1A00CB42-25E4-4F97-A1B5-3F7C4490F223','3289A3D2-0691-4AD1-BDF3-1FD784564E71','ߺ¯Ҫȷ¯ϵͳϵͳȫ롣','','',GETDATE(),3) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('9DECCBE6-65CC-419A-A048-979783FD6842','3289A3D2-0691-4AD1-BDF3-1FD784564E71','ָʾװϣָλ','','',GETDATE(),4) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('21BF145B-EA14-4E55-B037-E819234F1F7A','3289A3D2-0691-4AD1-BDF3-1FD784564E71','¯豸װϲкϸ','','',GETDATE(),5) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('5E0511A0-C5A9-4B61-9685-4E6C8037F4C6','3289A3D2-0691-4AD1-BDF3-1FD784564E71','¯õȹ͵DZװϲУϸ','','',GETDATE(),6) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('C7593DCE-AA2A-4049-91E5-39E0E9B0E13A','3289A3D2-0691-4AD1-BDF3-1FD784564E71','̵̵尲װϲԣ̵ųڰȫλá','','',GETDATE(),7) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('583F587F-DAC6-480B-9731-5BAC193E7F96','3289A3D2-0691-4AD1-BDF3-1FD784564E71','µѾҪúá','','',GETDATE(),8) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('5DFCD094-DDF7-4B2C-9734-37FF80763974','3289A3D2-0691-4AD1-BDF3-1FD784564E71','¯߱Ѿò¯ңͻϹӦ̣ȷϡ','','',GETDATE(),9) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('FA2DCD68-F4CE-495A-AF9F-E368248D5386','3289A3D2-0691-4AD1-BDF3-1FD784564E71','ͻϵѾòñ,¯ѡĸλá','','',GETDATE(),10) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('3DEF5BB6-E60F-4F7A-85AB-74FE48BE3E93','3289A3D2-0691-4AD1-BDF3-1FD784564E71','¯ȼϣͣȼȵλ','','',GETDATE(),11) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('ED369C77-1B1A-46DE-826E-DDD9E866A4D7','3289A3D2-0691-4AD1-BDF3-1FD784564E71','ʱ¯ϡ','','',GETDATE(),12) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('A0C6A601-ABBE-4EBF-9193-2796F56ADD91','3289A3D2-0691-4AD1-BDF3-1FD784564E71','𡢰ȫʩϺ¯Ҫ','','',GETDATE(),13) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('177F8D2C-BE13-437E-92EB-B0C79797F161','3289A3D2-0691-4AD1-BDF3-1FD784564E71','','','',GETDATE(),14) + +--WP12 Գ +delete PreRun_WorkInspectTemplate where WorkInspectId='19BE0861-1AD7-40A3-AA18-01C5CEB64131' +delete PreRun_WorkInspectTemplate where WorkInspectId='B55865DC-035D-48B5-84BE-7C34C3353B21' +delete PreRun_WorkInspectTemplate where WorkInspectId='0B8CB7D6-8D89-4427-A62E-739643E2F1C2' +delete PreRun_WorkInspectTemplate where WorkInspectId='2D114EBD-FE45-4D50-AF13-C79063C8D475' +delete PreRun_WorkInspectTemplate where WorkInspectId='F58D79AE-9579-4BB9-AA39-AC5B92D21059' +delete PreRun_WorkInspectTemplate where WorkInspectId='EC7F7D2E-CE08-4F89-9538-03650EFB45BD' +delete PreRun_WorkInspectTemplate where WorkInspectId='F71B00D0-2029-458F-A3AE-D4B624F0908A' +delete PreRun_WorkInspectTemplate where WorkInspectId='1427A267-A5A2-4D46-A2AA-EE3337966481' +delete PreRun_WorkInspectTemplate where WorkInspectId='A1EEC73A-7499-4E3E-BFF3-6C997E5F9122' +delete PreRun_WorkInspectTemplate where WorkInspectId='44EF73C6-AE42-4062-80FA-F9A9AD72E8BD' +delete PreRun_WorkInspectTemplate where WorkInspectId='94493ADE-6942-43B3-A91E-528C5F9A9494' +delete PreRun_WorkInspectTemplate where WorkInspectId='5A4BF482-A006-4C74-85E6-2CB819498435' +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('19BE0861-1AD7-40A3-AA18-01C5CEB64131','963E658B-CB53-4FEA-BA7D-723C538B2BD5','鰲װȫƺ͹淶Ĺ涨װ¼ȫ','','',GETDATE(),1) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('B55865DC-035D-48B5-84BE-7C34C3353B21','963E658B-CB53-4FEA-BA7D-723C538B2BD5','ܵϵͳѹϴɨϸϸ','','',GETDATE(),2) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('0B8CB7D6-8D89-4427-A62E-739643E2F1C2','963E658B-CB53-4FEA-BA7D-723C538B2BD5','·ϵͳѧϴͳϴϸ','','',GETDATE(),3) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('2D114EBD-FE45-4D50-AF13-C79063C8D475','963E658B-CB53-4FEA-BA7D-723C538B2BD5','DZװ꣬ϵͳơĵԷҪ','','',GETDATE(),4) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('F58D79AE-9579-4BB9-AA39-AC5B92D21059','963E658B-CB53-4FEA-BA7D-723C538B2BD5','ٻ١ΣϵͳװϡԺϸ','','',GETDATE(),5) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('EC7F7D2E-CE08-4F89-9538-03650EFB45BD','963E658B-CB53-4FEA-BA7D-723C538B2BD5','ʴʩѻɡ','','',GETDATE(),6) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('F71B00D0-2029-458F-A3AE-D4B624F0908A','963E658B-CB53-4FEA-BA7D-723C538B2BD5','鰲װҪ','','',GETDATE(),7) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('1427A267-A5A2-4D46-A2AA-EE3337966481','963E658B-CB53-4FEA-BA7D-723C538B2BD5','߱ȴˮDZȷӦ','','',GETDATE(),8) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('A1EEC73A-7499-4E3E-BFF3-6C997E5F9122','963E658B-CB53-4FEA-BA7D-723C538B2BD5','DZߡ¼뱸Աλ','','',GETDATE(),9) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('44EF73C6-AE42-4062-80FA-F9A9AD72E8BD','963E658B-CB53-4FEA-BA7D-723C538B2BD5','ֳȫʩͶƷ׼','','',GETDATE(),10) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('94493ADE-6942-43B3-A91E-528C5F9A9494','963E658B-CB53-4FEA-BA7D-723C538B2BD5','DZߡ¼룬Աλ','','',GETDATE(),11) +INSERT INTO dbo.PreRun_WorkInspectTemplate(WorkInspectId,WorkPackId,WorkInspectName,Remark,AddUser,AddTime,Sort) VALUES('5A4BF482-A006-4C74-85E6-2CB819498435','963E658B-CB53-4FEA-BA7D-723C538B2BD5','','','',GETDATE(),12) + +--ҵ߼ɾ +truncate table PreRun_SubInspectTerm +truncate table PreRun_SubInspectTermItem + +--Ӽβ˵ +delete Sys_Menu where MenuId='B6A6EA7D-EDAB-40C8-920D-A106731D0E08' +delete Sys_Menu where MenuId='8542644D-BD9B-4188-9FDE-AE5D6D6D9A40' +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('B6A6EA7D-EDAB-40C8-920D-A106731D0E08','β',null,'TestRun/BeforeTestRun/InspectTailTermList.aspx',8,'AD6E08B6-5571-4FFB-BDBE-9E6811770BD6','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('8542644D-BD9B-4188-9FDE-AE5D6D6D9A40','',null,'TestRun/BeforeTestRun/TailTermApproveList.aspx',9,'AD6E08B6-5571-4FFB-BDBE-9E6811770BD6','Menu_TestRun',0,1,1) +GO + +--ְ +alter table PreRun_SubInspectTerm add Subcontractor varchar(50) null +--а +alter table PreRun_SubInspectTerm add Contractor varchar(50) null +-- +alter table PreRun_SubInspectTerm add Supervision varchar(50) null +--ҵ +alter table PreRun_SubInspectTerm add Owner varchar(50) null +--0=ȫ1=ܵ2=豸 +alter table PreRun_WorkPackage add WorkPackType int null +alter table PreRun_SubInspectTerm add WorkPackType int null +--ܵ豸 +alter table PreRun_SubInspectTerm add PropertyTechnologyId varchar(50) null +go + +--==ϵͳ +if object_id(N'PreRun_SubInspectTermItem',N'U') is not null +drop table dbo.PreRun_SubInspectTermItem +CREATE TABLE dbo.PreRun_SubInspectTermItem( + TermItemId varchar(50) NOT NULL,-- + SubItemId varchar(50) NULL,-- + SubInspectId varchar(50) NULL,-- + WorkPackId varchar(50) NULL,-- + ProjectId varchar(50) NULL,--Ŀ + WorkInspectId varchar(50) NOT NULL,--ģ + WorkInspectName varchar(500) NULL,-- + InstallationId varchar(50) NULL,--װ(ֶΣڹ) + ProcessesId varchar(50) NULL,--(ֶΣڹ) + SystemId varchar(50) NULL,--ϵͳ(ֶΣڹ) + SubSystemId varchar(50) NULL,--ϵͳ + InspectedUser varchar(50) NULL,-- + InspectionResults int NULL,--0:δͨ 1:ͨ + InspectionIllustrate varchar(200) NULL,--˵ + Subcontractor varchar(50) null,--ְ + Contractor varchar(50) null,--а + Supervision varchar(50) null,-- + Owner varchar(50) null,--ҵ + WorkPackType int null,--0=ȫ1=ܵ2=豸 + PropertyTechnologyId varchar(50) null,--ܵ豸 + Remark varchar(200) NULL,--ע + AddUser varchar(50) NULL,-- + AddTime datetime NULL,-- + Sort int NULL,-- + CONSTRAINT PK_PreRun_SubInspectTermItem PRIMARY KEY CLUSTERED +( + TermItemId ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +--Ԥ +delete PreRun_WorkPackage where WorkPackId='1C01150C-977E-499A-9173-95F319BEEF87' +delete PreRun_WorkPackage where WorkPackId='641DA0F4-42A7-4DE3-9A57-95A606016655' +delete PreRun_WorkPackage where WorkPackId='BEB24AE8-F66D-458B-ADFD-3810405B5EB8' +delete PreRun_WorkPackage where WorkPackId='02BC1E1E-E531-4738-B6EC-5CE5BDC47B43' +delete PreRun_WorkPackage where WorkPackId='474F94B6-E927-4E9A-A544-F8E1AE63F6FF' +delete PreRun_WorkPackage where WorkPackId='3289A3D2-0691-4AD1-BDF3-1FD784564E71' +delete PreRun_WorkPackage where WorkPackId='445B915B-3E6D-47BE-BFF4-8762695ADB20' +delete PreRun_WorkPackage where WorkPackId='73C7D1D7-6DA3-44DD-A88B-7DF0FF15AA4F' +delete PreRun_WorkPackage where WorkPackId='8845C52D-4C56-442E-9237-CE33E8FC66AA' +delete PreRun_WorkPackage where WorkPackId='B0D040D4-5867-4335-9258-75504E73987E' +delete PreRun_WorkPackage where WorkPackId='84C6DAD6-3ED8-4869-ADB4-2EDA3512DB16' +delete PreRun_WorkPackage where WorkPackId='963E658B-CB53-4FEA-BA7D-723C538B2BD5' +delete PreRun_WorkPackage where WorkPackId='598A028A-5812-40E3-9D9D-5180A36F4453' +delete PreRun_WorkPackage where WorkPackId='6D827784-6ABD-4327-ABB7-FDABAC99853F' +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('1C01150C-977E-499A-9173-95F319BEEF87','Գ',2,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),1) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('641DA0F4-42A7-4DE3-9A57-95A606016655','ܵϴ',1,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),2) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('BEB24AE8-F66D-458B-ADFD-3810405B5EB8','ܵɨ',1,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),3) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('02BC1E1E-E531-4738-B6EC-5CE5BDC47B43','ɨ',1,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),4) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('474F94B6-E927-4E9A-A544-F8E1AE63F6FF','ѧϴ',1,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),5) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('3289A3D2-0691-4AD1-BDF3-1FD784564E71','¯',2,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),6) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('445B915B-3E6D-47BE-BFF4-8762695ADB20','߻װ',2,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),7) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('73C7D1D7-6DA3-44DD-A88B-7DF0FF15AA4F','ɸװ',2,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),8) +--INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +--VALUES('8845C52D-4C56-442E-9237-CE33E8FC66AA','','','','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),9) +--INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +--VALUES('B0D040D4-5867-4335-9258-75504E73987E','DZ','','','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),10) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('84C6DAD6-3ED8-4869-ADB4-2EDA3512DB16','ֻԳ',2,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),11) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('963E658B-CB53-4FEA-BA7D-723C538B2BD5','Գ',2,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),12) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('598A028A-5812-40E3-9D9D-5180A36F4453','',1,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),13) +INSERT INTO dbo.PreRun_WorkPackage(WorkPackId,WorkPackName,WorkPackType,Remark,AddUser,AddTime,Sort) +VALUES('6D827784-6ABD-4327-ABB7-FDABAC99853F','ȼ',0,'','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0',GETDATE(),14) +go + +--==β +if object_id(N'PreRun_InspectTailTerm',N'U') is not null +drop table dbo.PreRun_InspectTailTerm +CREATE TABLE dbo.PreRun_InspectTailTerm( + TailTermId varchar(50) NOT NULL,-- + ProjectId varchar(50) NULL,--Ŀ + ProjectName varchar(50) NULL,--Ŀ + TailTermCode varchar(50) NULL,--Ѳ + ConstructionUnit varchar(50) NULL,--ʩλ + ProblemType int NULL,--1:ܵ2:豸 + QuestionTechnologyId varchar(50) NULL,--ܵ豸 + TermItemId varchar(50) NULL,-- + WorkPackId varchar(50) NULL,-- + QuestionDesc varchar(max) NULL,-- + RectifyOpinion varchar(max) NULL,-- + RectifyTime datetime NULL,--ʱ + InspectUser varchar(50) NULL,-- + ApproveUser varchar(50) NULL,-- + ApproveState int NULL,--0:ύ1:˻2:3:ͨ + AddUser varchar(50) NULL,-- + AddTime datetime NULL,-- + CONSTRAINT PK_PreRun_InspectTailTerm PRIMARY KEY CLUSTERED +( + TailTermId ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +--==˼¼ +if object_id(N'PreRun_InspectTermApproveRecords',N'U') is not null +drop table dbo.PreRun_InspectTermApproveRecords +CREATE TABLE dbo.PreRun_InspectTermApproveRecords( + InspectTermId varchar(50) NOT NULL,-- + ProjectId varchar(50) NULL,--Ŀ + TermItemId varchar(50) NULL,-- + TailTermId varchar(50) NULL,--β + ApproveOpinion varchar(max) NULL,-- + ApproveTime datetime NULL,--ʱ + ApproveUser varchar(50) NULL,-- + ApproveState int NULL,--0:˻1:ͨ + AddUser varchar(50) NULL,-- + AddTime datetime NULL,-- + CONSTRAINT PK_PreRun_InspectTermApproveRecords PRIMARY KEY CLUSTERED +( + InspectTermId ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-20.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-20.sql new file mode 100644 index 00000000..6ad99dbe --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-20.sql @@ -0,0 +1,317 @@ +alter table Manager_PersonSortC add SumOutPersonNum int +go + +update Sys_Const set ConstText='3 本月项目现场HSE工时/工日统计' where ID='D8141695-CD8C-4724-98A5-C5DD015FA917' +update Sys_Const set ConstText='4 HSE绩效管理数据' where ID='244E173B-43D8-4D37-B4BE-FFBAF6EC18B7' +update Sys_Const set ConstText='5 本月项目HSE费用管理' where ID='890B9A0E-DA44-471A-92BD-E7150E4FFC7C' +update Sys_Const set ConstText='6 HSE责任事故/事件描述' where ID='7EC9E717-5869-4B16-8D38-7CD156C0330A' +update Sys_Const set ConstText='7 下月HSE工作计划' where ID='80488E9F-5289-4A77-A7E8-0B13FEF14ABA' +update Sys_Const set ConstText='8 HSE合规义务识别与评价' where ID='FC2F863C-248D-424C-998D-9FC00B55C13D' +update Sys_Const set ConstText='9 需协调解决的主要问题' where ID='C11BB760-8C4D-489F-8FA3-324BD0CBEB38' +update Sys_Const set ConstText='10 项目现场HSE影像照片' where ID='671D47D7-511A-404C-B864-3179483F3579' +go + +alter table Manager_TrainSortC add TrainType nvarchar(50) +alter table Manager_TrainSortC add TotalPersonNum int +alter table Manager_MonthReportC add AccidentDef nvarchar(2000) +go + + +CREATE TABLE [dbo].[Manager_Month_ComplianceObligationsC]( + [ComplianceObligationsId] [nvarchar](50) NOT NULL, + [MonthReportId] [nvarchar](50) NULL, + [InformationContent] [nvarchar](500) NULL, + [ResponseMeasures] [nvarchar](500) NULL, + [ImplementationStatus] [nvarchar](500) NULL, + [EvaluationConclusion] [nvarchar](50) NULL, + CONSTRAINT [PK_Manager_Month_ComplianceObligationsC] PRIMARY KEY CLUSTERED +( + [ComplianceObligationsId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[Manager_Month_ComplianceObligationsC] WITH CHECK ADD CONSTRAINT [FK_Manager_Month_ComplianceObligationsC_Manager_MonthReportC] FOREIGN KEY([MonthReportId]) +REFERENCES [dbo].[Manager_MonthReportC] ([MonthReportId]) +GO + +ALTER TABLE [dbo].[Manager_Month_ComplianceObligationsC] CHECK CONSTRAINT [FK_Manager_Month_ComplianceObligationsC_Manager_MonthReportC] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_ComplianceObligationsC', @level2type=N'COLUMN',@level2name=N'ComplianceObligationsId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'HSE管理月报ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_ComplianceObligationsC', @level2type=N'COLUMN',@level2name=N'MonthReportId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'HSE合规义务信息内容' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_ComplianceObligationsC', @level2type=N'COLUMN',@level2name=N'InformationContent' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'响应措施内容' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_ComplianceObligationsC', @level2type=N'COLUMN',@level2name=N'ResponseMeasures' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'实施情况' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_ComplianceObligationsC', @level2type=N'COLUMN',@level2name=N'ImplementationStatus' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'HSE合规义务识别与评价表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_ComplianceObligationsC' +GO + +drop table Manager_Month_HazardC +go +CREATE TABLE [dbo].[Manager_Month_HazardC]( + [HazardId] [nvarchar](50) NOT NULL, + [MonthReportId] [nvarchar](50) NOT NULL, + [WorkArea] [nvarchar](50) NULL, + [EnvironmentalFactors] [nvarchar](500) NULL, + [Consequence] [nvarchar](500) NULL, + [ControlMeasures] [nvarchar](100) NULL, + [IsMajor] [bit] NULL, + CONSTRAINT [PK_Manager_Month_HazardC] PRIMARY KEY CLUSTERED +( + [HazardId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[Manager_Month_HazardC] WITH CHECK ADD CONSTRAINT [FK_Manager_Month_HazardC_Manager_MonthReport] FOREIGN KEY([MonthReportId]) +REFERENCES [dbo].[Manager_MonthReportC] ([MonthReportId]) +GO + +ALTER TABLE [dbo].[Manager_Month_HazardC] CHECK CONSTRAINT [FK_Manager_Month_HazardC_Manager_MonthReport] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_HazardC', @level2type=N'COLUMN',@level2name=N'HazardId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'月报Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_HazardC', @level2type=N'COLUMN',@level2name=N'MonthReportId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'活动/过程/地点' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_HazardC', @level2type=N'COLUMN',@level2name=N'WorkArea' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'危险源环境因素描述' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_HazardC', @level2type=N'COLUMN',@level2name=N'EnvironmentalFactors' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'可能存在的危险源' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_HazardC', @level2type=N'COLUMN',@level2name=N'Consequence' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'控制措施' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_HazardC', @level2type=N'COLUMN',@level2name=N'ControlMeasures' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否重大危险源/重要环境因素' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_HazardC', @level2type=N'COLUMN',@level2name=N'IsMajor' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'新增危险源识别及控制' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_HazardC' +GO + + + +CREATE TABLE [dbo].[Manager_RewardAndPunishSortC]( + [RewardAndPunishId] [nvarchar](50) NOT NULL, + [MonthReportId] [nvarchar](50) NULL, + [RewardNum] [int] NULL, + [RewardMoney] [decimal](18, 2) NULL, + [ProjectRewardMoney] [numeric](18, 2) NULL, + [PunishNum] [int] NULL, + [PunishMoney] [decimal](18, 2) NULL, + [ProjectPunishMoney] [decimal](18, 2) NULL, + CONSTRAINT [PK_Manager_RewardAndPunishSortC] PRIMARY KEY CLUSTERED +( + [RewardAndPunishId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[Manager_RewardAndPunishSortC] WITH CHECK ADD CONSTRAINT [FK_Manager_RewardAndPunishSortC_Manager_MonthReportC] FOREIGN KEY([MonthReportId]) +REFERENCES [dbo].[Manager_MonthReportC] ([MonthReportId]) +GO + +ALTER TABLE [dbo].[Manager_RewardAndPunishSortC] CHECK CONSTRAINT [FK_Manager_RewardAndPunishSortC_Manager_MonthReportC] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_RewardAndPunishSortC', @level2type=N'COLUMN',@level2name=N'RewardAndPunishId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'HSE管理月报ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_RewardAndPunishSortC', @level2type=N'COLUMN',@level2name=N'MonthReportId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'本月HSE奖励次数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_RewardAndPunishSortC', @level2type=N'COLUMN',@level2name=N'RewardNum' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'本月奖励金额（元）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_RewardAndPunishSortC', @level2type=N'COLUMN',@level2name=N'RewardMoney' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目累计奖励金额' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_RewardAndPunishSortC', @level2type=N'COLUMN',@level2name=N'ProjectRewardMoney' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'本月HSE处罚次数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_RewardAndPunishSortC', @level2type=N'COLUMN',@level2name=N'PunishNum' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'本月处罚金额（元）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_RewardAndPunishSortC', @level2type=N'COLUMN',@level2name=N'PunishMoney' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目累计处罚金额' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_RewardAndPunishSortC', @level2type=N'COLUMN',@level2name=N'ProjectPunishMoney' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N' HSE奖励与处罚' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_RewardAndPunishSortC' +GO + +alter table Manager_Month_SubExpenseC add ContractAmount decimal(18,2) +alter table Manager_Month_SubExpenseC add MonthApprovalAmount decimal(18,2) +alter table Manager_Month_SubExpenseC add ProjectApprovalAmount decimal(18,2) +go + +CREATE TABLE [dbo].[Manager_Month_InjuryAccidentC]( + [InjuryAccidentId] [nvarchar](50) NOT NULL, + [MonthReportId] [nvarchar](50) NULL, + [UnitName] [nvarchar](50) NULL, + [AttemptedIncidents] [int] NULL, + [FirstAidDressing] [int] NULL, + [MedicalTreatment] [int] NULL, + [WorkLimitation] [int] NULL, + [LossPerson] [int] NULL, + [LossWorkTime] [decimal](18, 2) NULL, + [LossEconomy] [decimal](18, 2) NULL, + [DeathPerson] [int] NULL, + [DeathWorkTime] [decimal](18, 2) NULL, + [DeathEconomy] [decimal](18, 2) NULL, + CONSTRAINT [PK_Manager_Month_InjuryAccidentC] PRIMARY KEY CLUSTERED +( + [InjuryAccidentId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[Manager_Month_InjuryAccidentC] WITH CHECK ADD CONSTRAINT [FK_Manager_Month_InjuryAccidentC_Manager_MonthReportC] FOREIGN KEY([MonthReportId]) +REFERENCES [dbo].[Manager_MonthReportC] ([MonthReportId]) +GO + +ALTER TABLE [dbo].[Manager_Month_InjuryAccidentC] CHECK CONSTRAINT [FK_Manager_Month_InjuryAccidentC_Manager_MonthReportC] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'未遂事件起数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_InjuryAccidentC', @level2type=N'COLUMN',@level2name=N'AttemptedIncidents' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'急救包扎事故人数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_InjuryAccidentC', @level2type=N'COLUMN',@level2name=N'FirstAidDressing' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'医疗处置事故人数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_InjuryAccidentC', @level2type=N'COLUMN',@level2name=N'MedicalTreatment' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'工作受限事故人数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_InjuryAccidentC', @level2type=N'COLUMN',@level2name=N'WorkLimitation' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'损失事故（人数）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_InjuryAccidentC', @level2type=N'COLUMN',@level2name=N'LossPerson' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'损失事故（损失工时）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_InjuryAccidentC', @level2type=N'COLUMN',@level2name=N'LossWorkTime' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'损失事故（经济损失）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_InjuryAccidentC', @level2type=N'COLUMN',@level2name=N'LossEconomy' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'死亡事故（人数）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_InjuryAccidentC', @level2type=N'COLUMN',@level2name=N'DeathPerson' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'死亡事故（损失工时）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_InjuryAccidentC', @level2type=N'COLUMN',@level2name=N'DeathWorkTime' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'死亡事故（经济损失）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_InjuryAccidentC', @level2type=N'COLUMN',@level2name=N'DeathEconomy' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'本月伤害事故统计' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_InjuryAccidentC' +GO + + + +CREATE TABLE [dbo].[Manager_Month_NoInjuryAccidentC]( + [NoInjuryAccidentId] [nvarchar](50) NOT NULL, + [MonthReportId] [nvarchar](50) NULL, + [AccidentType] [nvarchar](50) NULL, + [EconomicLosses] [decimal](18, 2) NULL, + [WHAccidentCount] [int] NULL, + [SubAccidentCount] [int] NULL, + CONSTRAINT [PK_Manager_Month_NoInjuryAccidentC] PRIMARY KEY CLUSTERED +( + [NoInjuryAccidentId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[Manager_Month_NoInjuryAccidentC] WITH CHECK ADD CONSTRAINT [FK_Manager_Month_NoInjuryAccidentC_Manager_MonthReportC] FOREIGN KEY([MonthReportId]) +REFERENCES [dbo].[Manager_MonthReportC] ([MonthReportId]) +GO + +ALTER TABLE [dbo].[Manager_Month_NoInjuryAccidentC] CHECK CONSTRAINT [FK_Manager_Month_NoInjuryAccidentC_Manager_MonthReportC] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_NoInjuryAccidentC', @level2type=N'COLUMN',@level2name=N'NoInjuryAccidentId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'月报ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_NoInjuryAccidentC', @level2type=N'COLUMN',@level2name=N'MonthReportId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'事故类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_NoInjuryAccidentC', @level2type=N'COLUMN',@level2name=N'AccidentType' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'经济损失' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_NoInjuryAccidentC', @level2type=N'COLUMN',@level2name=N'EconomicLosses' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'事故起数（五环）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_NoInjuryAccidentC', @level2type=N'COLUMN',@level2name=N'WHAccidentCount' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'事故起数（分包）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_NoInjuryAccidentC', @level2type=N'COLUMN',@level2name=N'SubAccidentCount' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'本月无伤害事故统计' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_NoInjuryAccidentC' +GO + + + +CREATE TABLE [dbo].[Manager_Month_PerformanceIndicatorC]( + [PerformanceIndicatorId] [nvarchar](50) NOT NULL, + [MonthReportId] [nvarchar](50) NULL, + [IndicatorType] [nvarchar](50) NULL, + [IndicatorName] [nvarchar](200) NULL, + [IndicatorValue] [nvarchar](50) NULL, + [SortIndex] [int] NULL, + CONSTRAINT [PK_Manager_Month_PerformanceIndicatorC] PRIMARY KEY CLUSTERED +( + [PerformanceIndicatorId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[Manager_Month_PerformanceIndicatorC] WITH CHECK ADD CONSTRAINT [FK_Manager_Month_PerformanceIndicatorC_Manager_MonthReportC] FOREIGN KEY([MonthReportId]) +REFERENCES [dbo].[Manager_MonthReportC] ([MonthReportId]) +GO + +ALTER TABLE [dbo].[Manager_Month_PerformanceIndicatorC] CHECK CONSTRAINT [FK_Manager_Month_PerformanceIndicatorC_Manager_MonthReportC] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_PerformanceIndicatorC', @level2type=N'COLUMN',@level2name=N'PerformanceIndicatorId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'月报ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_PerformanceIndicatorC', @level2type=N'COLUMN',@level2name=N'MonthReportId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'指标类别' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_PerformanceIndicatorC', @level2type=N'COLUMN',@level2name=N'IndicatorType' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'指标名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_PerformanceIndicatorC', @level2type=N'COLUMN',@level2name=N'IndicatorName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'指标值' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_PerformanceIndicatorC', @level2type=N'COLUMN',@level2name=N'IndicatorValue' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'绩效指标' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Manager_Month_PerformanceIndicatorC' +GO + + + diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-21.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-21.sql new file mode 100644 index 00000000..a5a6dfe9 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-21.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/BLL.csproj b/SGGL/BLL/BLL.csproj index a90535d5..f8b66252 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -467,6 +467,7 @@ + @@ -478,18 +479,22 @@ + + + + diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 56347d6c..e7e560be 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -207,6 +207,11 @@ namespace BLL /// public const string AppSecret_CWCEC = "a08b6ad503f1ced05d27bc11dc9198c3"; + /// + /// 施工单位ID + /// + public const string UnitId_Con = "fedf9907-54f8-481d-ae4c-8f3dfb7c8eda"; + /// ///施工部门id /// @@ -281,7 +286,7 @@ namespace BLL /// /// HSE工程师岗位Id /// - public static string WorkPost_HSSEEngineer = "9b15af2e-6131-462c-9f8a-71533957ca0e"; + public static string WorkPost_HSSEEngineer = "D1115B78-C9E1-43A4-8AB1-FF099CAF7BA4"; /// /// 项目安全总监岗位Id /// @@ -289,7 +294,7 @@ namespace BLL /// /// HSE经理岗位Id /// - public static string WorkPost_SafetyManager = "e426e560-9906-4aba-843e-2daef9ebeb05"; + public static string WorkPost_SafetyManager = "eac153fd-4cf3-4f5f-984d-022a636d47aa"; /// /// HSE副经理岗位Id @@ -3298,6 +3303,10 @@ namespace BLL /// 作废 /// public const string State_C = "-2"; + /// + /// 关闭提交 + /// + public const string State_6 = "6"; #endregion #region 文档流程定义 @@ -5546,5 +5555,10 @@ namespace BLL /// 实业 /// public const string SYHSEData_DataMenuId = "S89E5EC2-F725-4656-9110-5AF83C18FB6C"; + + /// + /// 检查表尾项管理 + /// + public const string InspectTailTerm = "B6A6EA7D-EDAB-40C8-920D-A106731D0E08"; } } \ No newline at end of file diff --git a/SGGL/BLL/CostGoods/PayRegistrationService.cs b/SGGL/BLL/CostGoods/PayRegistrationService.cs index ab737242..648ec829 100644 --- a/SGGL/BLL/CostGoods/PayRegistrationService.cs +++ b/SGGL/BLL/CostGoods/PayRegistrationService.cs @@ -475,15 +475,31 @@ namespace BLL } /// - /// 根据时间、项目获取安全费用投入登记信息 + /// 根据时间、项目获取五环安全费用投入登记信息 /// /// /// /// /// - public static List GetPayRegistrationByPayDate(DateTime startTime, DateTime endTime, string projectId) + public static List GetPayRegistrationByPayDate(DateTime startTime, DateTime endTime, string projectId,string unitId) { - return (from x in Funs.DB.CostGoods_PayRegistration where x.PayDate >= startTime && x.PayDate <= endTime && x.ProjectId == projectId select x).ToList(); + return (from x in Funs.DB.CostGoods_PayRegistration where x.PayDate >= startTime && x.PayDate <= endTime && x.ProjectId == projectId && x.UnitId == unitId select x).ToList(); + } + + /// + /// 根据时间、项目获取施工分包商安全费用投入登记信息 + /// + /// + /// + /// + /// + public static List GetConPayRegistrationByPayDate(DateTime startTime, DateTime endTime, string projectId) + { + return (from x in Funs.DB.CostGoods_PayRegistration + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.PayDate >= startTime && x.PayDate <= endTime && x.ProjectId == projectId + && y.UnitTypeId == BLL.Const.UnitId_Con + select x).ToList(); } } } diff --git a/SGGL/BLL/CostGoods/SubPayRegistrationService.cs b/SGGL/BLL/CostGoods/SubPayRegistrationService.cs index 395f0643..ca677519 100644 --- a/SGGL/BLL/CostGoods/SubPayRegistrationService.cs +++ b/SGGL/BLL/CostGoods/SubPayRegistrationService.cs @@ -219,6 +219,32 @@ namespace BLL return (from x in Funs.DB.CostGoods_SubPayRegistration where x.PayDate >= startTime && x.PayDate <= endTime && x.ProjectId == projectId select x).ToList(); } + /// + /// 根据单位获取HSE措施费合同额 + /// + /// + /// + /// + /// + public static decimal? GetSubPaySMonthTypeByUnitId(string unitId, DateTime startTime, DateTime endTime) + { + var q = (from x in Funs.DB.CostGoods_SubPayRegistration + where x.UnitId == unitId && x.PayDate >= startTime && x.PayDate < endTime + select x).ToList(); + if (q.Count > 0) + { + return q.Sum(e => (e.SMonthType1 + e.SMonthType2 + e.SMonthType3 + e.SMonthType4 + e.SMonthType5 + e.SMonthType6 + e.SMonthType7 + e.SMonthType8 + e.SMonthType9 + e.SMonthType10 + e.SMonthType11 + e.SMonthType12 + e.SMonthType13 + e.SMonthType14 + e.SMonthType15 + e.SMonthType16 + e.SMonthType17 + e.SMonthType18 + e.SMonthType19 + e.SMonthType20 + e.SMonthType21 + e.SMonthType22 + e.SMonthType23 + e.SMonthType24 + e.SMonthType25 + e.SMonthType26 + e.SMonthType27 + e.SMonthType28 + e.SMonthType29)); + } + return null; + } + + /// + /// 根据单位获取本月项目分包商HSE费用支付统计 + /// + /// + /// + /// + /// public static decimal? GetSubPayRegistrationByUnitId(string unitId, DateTime startTime, DateTime endTime) { var q = (from x in Funs.DB.CostGoods_SubPayRegistration diff --git a/SGGL/BLL/HSSE/Accident/AccidentHandleService.cs b/SGGL/BLL/HSSE/Accident/AccidentHandleService.cs index 6ba1d44f..b1f73c7d 100644 --- a/SGGL/BLL/HSSE/Accident/AccidentHandleService.cs +++ b/SGGL/BLL/HSSE/Accident/AccidentHandleService.cs @@ -102,5 +102,10 @@ namespace BLL db.SubmitChanges(); } } + + public static int GetAccidentHandleByAccidentDate(DateTime startTime, DateTime endTime, string projectId, string unitId) + { + return (from x in Funs.DB.Accident_AccidentHandle where x.AccidentDate >= startTime && x.AccidentDate < endTime && x.ProjectId == projectId && x.UnitId == unitId select x).Count(); + } } } \ No newline at end of file diff --git a/SGGL/BLL/HSSE/Accident/AccidentReportService.cs b/SGGL/BLL/HSSE/Accident/AccidentReportService.cs index bdabca29..febdddd9 100644 --- a/SGGL/BLL/HSSE/Accident/AccidentReportService.cs +++ b/SGGL/BLL/HSSE/Accident/AccidentReportService.cs @@ -453,5 +453,10 @@ namespace BLL db.SubmitChanges(); } } + + public static List GetAccidentReportsByAccidentType(string accidentType,DateTime startTime, DateTime endTime, string projectId) + { + return (from x in Funs.DB.Accident_AccidentReport where x.AccidentTypeId==accidentType && x.AccidentDate >= startTime && x.AccidentDate < endTime && x.ProjectId == projectId && x.States == BLL.Const.State_2 select x).ToList(); + } } } diff --git a/SGGL/BLL/HSSE/Check/Check_ProjectCheckItemSetService.cs b/SGGL/BLL/HSSE/Check/Check_ProjectCheckItemSetService.cs index ed18e1b8..381f4147 100644 --- a/SGGL/BLL/HSSE/Check/Check_ProjectCheckItemSetService.cs +++ b/SGGL/BLL/HSSE/Check/Check_ProjectCheckItemSetService.cs @@ -62,36 +62,42 @@ namespace BLL string type = string.Empty; if (CheckItem != null) { - Model.Check_ProjectCheckItemDetail detail = BLL.Check_ProjectCheckItemDetailService.GetCheckItemDetailById(CheckItem.ToString()); + //Model.Check_ProjectCheckItemDetail detail = BLL.Check_ProjectCheckItemDetailService.GetCheckItemDetailById(CheckItem.ToString()); + + //修改为项目安全检查项 + Model.Technique_CheckItemSet detail = Funs.DB.Technique_CheckItemSet.FirstOrDefault(x => x.CheckItemSetId == CheckItem.ToString()); + if (detail != null) { - Model.Check_ProjectCheckItemSet item = BLL.Check_ProjectCheckItemSetService.GetCheckItemSetById(detail.CheckItemSetId); - if (item != null) - { - if (item.SupCheckItem == "0") - { - type = item.CheckItemName; - } - else - { - type = BLL.Check_ProjectCheckItemSetService.GetCheckItemNameBySupCheckItem(item.SupCheckItem); - } - } + type = detail.CheckItemName; + //Model.Check_ProjectCheckItemSet item = BLL.Check_ProjectCheckItemSetService.GetCheckItemSetById(detail.CheckItemSetId); + //if (item != null) + //{ + // if (item.SupCheckItem == "0") + // { + // type = item.CheckItemName; + // } + // else + // { + // type = BLL.Check_ProjectCheckItemSetService.GetCheckItemNameBySupCheckItem(item.SupCheckItem); + // } + //} } else { - Model.Check_ProjectCheckItemSet item = BLL.Check_ProjectCheckItemSetService.GetCheckItemSetById(CheckItem.ToString()); - if (item != null) - { - if (item.SupCheckItem == "0") - { - type = item.CheckItemName; - } - else - { - type = BLL.Check_ProjectCheckItemSetService.GetCheckItemNameBySupCheckItem(item.SupCheckItem); - } - } + type = "季节性/节假日检查（无类型）"; + //Model.Check_ProjectCheckItemSet item = BLL.Check_ProjectCheckItemSetService.GetCheckItemSetById(CheckItem.ToString()); + //if (item != null) + //{ + // if (item.SupCheckItem == "0") + // { + // type = item.CheckItemName; + // } + // else + // { + // type = BLL.Check_ProjectCheckItemSetService.GetCheckItemNameBySupCheckItem(item.SupCheckItem); + // } + //} } } return type; diff --git a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs index 2f6b3c00..157168e1 100644 --- a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs +++ b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs @@ -154,5 +154,10 @@ namespace BLL { return (from x in Funs.DB.EduTrain_TrainRecord where x.TrainStartDate < time && x.ProjectId == projectId select x).Count(); } + + public static int? GetTrainPersonCount(DateTime startTime, DateTime endTime, string projectId) + { + return (from x in Funs.DB.EduTrain_TrainRecord where x.TrainStartDate >= startTime && x.TrainStartDate <= endTime && x.ProjectId == projectId select x.TrainPersonNum).Sum(); + } } } 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/BLL/HSSE/Manager/HSSELogService.cs b/SGGL/BLL/HSSE/Manager/HSSELogService.cs index 6b39376a..30638046 100644 --- a/SGGL/BLL/HSSE/Manager/HSSELogService.cs +++ b/SGGL/BLL/HSSE/Manager/HSSELogService.cs @@ -102,7 +102,7 @@ namespace BLL { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - Model.Manager_HSSELog newHSSELog =db.Manager_HSSELog.FirstOrDefault(e => e.HSSELogId == updateHSSELog.HSSELogId); + Model.Manager_HSSELog newHSSELog = db.Manager_HSSELog.FirstOrDefault(e => e.HSSELogId == updateHSSELog.HSSELogId); if (newHSSELog != null) { newHSSELog.CompileDate = updateHSSELog.CompileDate; @@ -980,5 +980,189 @@ namespace BLL } } #endregion + + #region 小程序接口 + /// + /// 返回列表 + /// + /// + /// + /// + public static List getHSSELogDataList(string projectId, string userId,string CompileMan,string CompileDate) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + List getInfoList = new List(); + getInfoList = (from x in db.Manager_HSSELog + join y in db.Sys_User on x.CompileMan equals y.UserId + join z in db.Sys_Const on x.Weather equals z.ConstValue + orderby x.CompileDate descending + where x.IsVisible != false && z.GroupId == BLL.ConstValue.Group_Weather && x.ProjectId == projectId + select new Model.HSSELogItem + { + HSSELogId = x.HSSELogId, + ProjectId = x.ProjectId, + CompileDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.CompileDate), + CompileMan = x.CompileMan, + Weather = x.Weather, + IsVisible = x.IsVisible, + CompileManName = y.UserName, + WeatherName = z.ConstText + }).ToList(); + Model.Project_ProjectUser projectUser = BLL.ProjectUserService.GetProjectUserByUserIdProjectId(projectId, userId); + if (projectUser != null) + { + if (projectUser.RoleId.Contains(BLL.Const.HSSEEngineer)) //项目安全工程师只能看到自己的日志内容 + { + getInfoList = getInfoList.Where(x => x.CompileMan == userId).ToList(); + } + } + if (!string.IsNullOrEmpty(CompileMan)) + { + getInfoList = getInfoList.Where(x => x.CompileMan == CompileMan).ToList(); + } + if (!string.IsNullOrEmpty(CompileDate)) + { + getInfoList = getInfoList.Where(x => x.CompileDate.Contains(CompileDate)).ToList(); + } + + return getInfoList; + } + } + + public static Model.HSSELogItem getHSSELogData(string HSSELogId) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + Model.HSSELogItem model = new Model.HSSELogItem(); + model = (from x in db.Manager_HSSELog + join y in db.Sys_User on x.CompileMan equals y.UserId + join z in db.Sys_Const on x.Weather equals z.ConstValue + orderby x.CompileDate + where x.IsVisible != false && z.GroupId == BLL.ConstValue.Group_Weather && x.HSSELogId == HSSELogId + select new Model.HSSELogItem + { + HSSELogId = x.HSSELogId, + ProjectId = x.ProjectId, + CompileDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.CompileDate), + CompileMan = x.CompileMan, + Weather = x.Weather, + IsVisible = x.IsVisible, + CompileManName = y.UserName, + WeatherName = z.ConstText, + + + Content1 = x.Num11.ToString(), + Content2= x.Contents12, + Content3= x.Contents13, + Content4= x.Contents21, + Content5= x.Num21.ToString(), + Content6= x.Contents22, + Content7 = x.Num22.ToString(), + Content8 = x.Contents23, + Content9 = x.Num23.ToString(), + Content10 = x.Contents24, + Content11 = x.Num24.ToString(), + Content12 = x.Contents210, + Content13 = x.Num210.ToString(), + Content14 = x.Num211.ToString(), + Content15 = x.Contents31, + Content16 = x.Num31.ToString(), + Content17 = x.Contents32, + Content18 = x.Num32.ToString(), + Content19 = x.Contents41, + Content20 = x.Contents42 + }).FirstOrDefault(); + + return model; + } + } + + /// + /// 增加HSSE日志暨管理数据收集 + /// + /// HSSE日志暨管理数据收集实体 + public static void AddHSSELogApi(Model.HSSELogItem HSSELog) + { + Model.Manager_HSSELog newHSSELog = new Model.Manager_HSSELog + { + HSSELogId = HSSELog.HSSELogId, + ProjectId = HSSELog.ProjectId, + CompileDate = Convert.ToDateTime(HSSELog.CompileDate), + CompileMan = HSSELog.CompileMan, + Weather = HSSELog.Weather, + IsVisible = HSSELog.IsVisible, + Num11 = Convert.ToInt32(HSSELog.Content1), + Contents12 = HSSELog.Content2, + Contents13 = HSSELog.Content3, + Contents21 = HSSELog.Content4, + Num21 = Convert.ToInt32(HSSELog.Content5), + Contents22 = HSSELog.Content6, + Num22 = Convert.ToInt32(HSSELog.Content7), + Contents23 = HSSELog.Content8, + Num23 = Convert.ToInt32(HSSELog.Content9), + Contents24 = HSSELog.Content10, + Num24 = Convert.ToInt32(HSSELog.Content11), + + Contents210 = HSSELog.Content12, + Num210 = Convert.ToInt32(HSSELog.Content13), + Num211 = Convert.ToInt32(HSSELog.Content14), + Contents31 = HSSELog.Content15, + Num31 = Convert.ToInt32(HSSELog.Content16), + Contents32 = HSSELog.Content17, + Num32 = Convert.ToInt32(HSSELog.Content18), + + Contents41 = HSSELog.Content19, + Contents42 = HSSELog.Content20 + }; + Funs.DB.Manager_HSSELog.InsertOnSubmit(newHSSELog); + Funs.DB.SubmitChanges(); + } + + /// + /// 修改HSSE日志暨管理数据收集 + /// + /// + public static void UpdateHSSELogApi(Model.HSSELogItem updateHSSELog) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + Model.Manager_HSSELog newHSSELog = db.Manager_HSSELog.FirstOrDefault(e => e.HSSELogId == updateHSSELog.HSSELogId); + if (newHSSELog != null) + { + newHSSELog.CompileDate = Convert.ToDateTime(updateHSSELog.CompileDate); + newHSSELog.CompileMan = updateHSSELog.CompileMan; + newHSSELog.Weather = updateHSSELog.Weather; + newHSSELog.IsVisible = updateHSSELog.IsVisible; + + newHSSELog.Num11 = Convert.ToInt32(updateHSSELog.Content1); + newHSSELog.Contents12 = updateHSSELog.Content2; + newHSSELog.Contents13 = updateHSSELog.Content3; + newHSSELog.Contents21 = updateHSSELog.Content4; + newHSSELog.Num21 = Convert.ToInt32(updateHSSELog.Content5); + newHSSELog.Contents22 = updateHSSELog.Content6; + newHSSELog.Num22 = Convert.ToInt32(updateHSSELog.Content7); + newHSSELog.Contents23 = updateHSSELog.Content8; + newHSSELog.Num23 = Convert.ToInt32(updateHSSELog.Content9); + newHSSELog.Contents24 = updateHSSELog.Content10; + newHSSELog.Num24 = Convert.ToInt32(updateHSSELog.Content11); + + newHSSELog.Contents210 = updateHSSELog.Content12; + newHSSELog.Num210 = Convert.ToInt32(updateHSSELog.Content13); + newHSSELog.Num211 = Convert.ToInt32(updateHSSELog.Content14); + newHSSELog.Contents31 = updateHSSELog.Content15; + newHSSELog.Num31 = Convert.ToInt32(updateHSSELog.Content16); + newHSSELog.Contents32 = updateHSSELog.Content17; + newHSSELog.Num32 = Convert.ToInt32(updateHSSELog.Content18); + + newHSSELog.Contents41 = updateHSSELog.Content19; + newHSSELog.Contents42 = updateHSSELog.Content20; + db.SubmitChanges(); + } + } + } + + + #endregion } } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ComplianceObligationsCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ComplianceObligationsCService.cs new file mode 100644 index 00000000..313d61fd --- /dev/null +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ComplianceObligationsCService.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// HSE合规义务识别与评价 + /// + public class ComplianceObligationsCService + { + /// + /// 根据月报ID获取相关HSE合规义务识别与评价 + /// + /// + /// + public static List GetComplianceObligationsCByMonthReportId(string monthRepportId) + { + return (from x in Funs.DB.Manager_Month_ComplianceObligationsC where x.MonthReportId == monthRepportId select x).ToList(); + } + + /// + /// 增加 + /// + /// + public static void AddComplianceObligationsC(Model.Manager_Month_ComplianceObligationsC data) + { + Model.Manager_Month_ComplianceObligationsC newData = new Model.Manager_Month_ComplianceObligationsC + { + ComplianceObligationsId = data.ComplianceObligationsId, + MonthReportId = data.MonthReportId, + InformationContent = data.InformationContent, + ResponseMeasures = data.ResponseMeasures, + ImplementationStatus = data.ImplementationStatus, + EvaluationConclusion = data.EvaluationConclusion + }; + Funs.DB.Manager_Month_ComplianceObligationsC.InsertOnSubmit(newData); + Funs.DB.SubmitChanges(); + } + + /// + /// 根据HSE月报ID删除相关HSE合规义务识别与评价 + /// + /// + public static void DeleteComplianceObligationsCByMonthReportId(string monthReportId) + { + var q = (from x in Funs.DB.Manager_Month_ComplianceObligationsC where x.MonthReportId == monthReportId select x).ToList(); + if (q != null) + { + Funs.DB.Manager_Month_ComplianceObligationsC.DeleteAllOnSubmit(q); + Funs.DB.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardCService.cs index 63fa1762..ec21a88e 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardCService.cs @@ -16,7 +16,7 @@ namespace BLL /// public static List GetHazardByMonthReportId(string monthReportId) { - return (from x in Funs.DB.Manager_Month_HazardC where x.MonthReportId == monthReportId orderby x.SortIndex select x).ToList(); + return (from x in Funs.DB.Manager_Month_HazardC where x.MonthReportId == monthReportId select x).ToList(); } /// @@ -31,10 +31,10 @@ namespace BLL HazardId = SQLHelper.GetNewID(typeof(Model.Manager_Month_HazardC)), MonthReportId = hazard.MonthReportId, WorkArea = hazard.WorkArea, - Subcontractor = hazard.Subcontractor, - DangerousSource = hazard.DangerousSource, + EnvironmentalFactors = hazard.EnvironmentalFactors, + Consequence = hazard.Consequence, ControlMeasures = hazard.ControlMeasures, - SortIndex = hazard.SortIndex + IsMajor = hazard.IsMajor }; db.Manager_Month_HazardC.InsertOnSubmit(newHazard); db.SubmitChanges(); diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/InjuryAccidentCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/InjuryAccidentCService.cs new file mode 100644 index 00000000..07f849d9 --- /dev/null +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/InjuryAccidentCService.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 伤害事故统计 + /// + public class InjuryAccidentCService + { + /// + /// 根据月报ID获取伤害事故统计 + /// + /// + /// + public static List GetInjuryAccidentCByMonthReportId(string monthReportId) + { + return (from x in Funs.DB.Manager_Month_InjuryAccidentC where x.MonthReportId == monthReportId select x).ToList(); + } + + /// + /// 添加伤害事故统计 + /// + /// + public static void AddInjuryAccidentC(Model.Manager_Month_InjuryAccidentC injuryAccident) + { + Model.Manager_Month_InjuryAccidentC newInjuryAccident = new Model.Manager_Month_InjuryAccidentC + { + InjuryAccidentId = injuryAccident.InjuryAccidentId, + MonthReportId = injuryAccident.MonthReportId, + UnitName = injuryAccident.UnitName, + AttemptedIncidents = injuryAccident.AttemptedIncidents, + FirstAidDressing = injuryAccident.FirstAidDressing, + MedicalTreatment = injuryAccident.MedicalTreatment, + WorkLimitation = injuryAccident.WorkLimitation, + LossPerson = injuryAccident.LossPerson, + LossWorkTime = injuryAccident.LossWorkTime, + LossEconomy = injuryAccident.LossEconomy, + DeathPerson = injuryAccident.DeathPerson, + DeathWorkTime = injuryAccident.DeathWorkTime, + DeathEconomy = injuryAccident.DeathEconomy + }; + Funs.DB.Manager_Month_InjuryAccidentC.InsertOnSubmit(newInjuryAccident); + Funs.DB.SubmitChanges(); + } + + /// + /// 根据月报ID删除伤害事故 + /// + /// + public static void DeleteInjuryAccidengtByMonthReportId(string montReportId) + { + var q = (from x in Funs.DB.Manager_Month_InjuryAccidentC where x.MonthReportId == montReportId select x).ToList(); + if (q != null) + { + Funs.DB.Manager_Month_InjuryAccidentC.DeleteAllOnSubmit(q); + Funs.DB.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs index 724cb04a..be75da67 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs @@ -225,7 +225,8 @@ namespace BLL YearSolutionNum = monthReport.YearSolutionNum, AccidentDes = monthReport.AccidentDes, Question = monthReport.Question, - SubcontractManHours = monthReport.SubcontractManHours + SubcontractManHours = monthReport.SubcontractManHours, + AccidentDef = monthReport.AccidentDef, }; db.Manager_MonthReportC.InsertOnSubmit(newMonthReport); @@ -295,6 +296,7 @@ namespace BLL newMonthReport.AccidentDes = monthReport.AccidentDes; newMonthReport.Question = monthReport.Question; newMonthReport.SubcontractManHours = monthReport.SubcontractManHours; + newMonthReport.AccidentDef = monthReport.AccidentDef; db.SubmitChanges(); } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/NoInjuryAccidentCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/NoInjuryAccidentCService.cs new file mode 100644 index 00000000..c646f973 --- /dev/null +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/NoInjuryAccidentCService.cs @@ -0,0 +1,54 @@ +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 本月无伤害事故统计 + /// + public class NoInjuryAccidentCService + { + /// + /// 根据月报ID获取本月无伤害事故统计 + /// + /// + /// + public static List GetNoInjuryAccidentByMonthReportId(string monthReportId) + { + return (from x in Funs.DB.Manager_Month_NoInjuryAccidentC where x.MonthReportId == monthReportId select x).ToList(); + } + + /// + /// 添加无伤害事故统计 + /// + /// + public static void AddNoInjuryAccident(Model.Manager_Month_NoInjuryAccidentC noInjury) + { + Model.Manager_Month_NoInjuryAccidentC newNoInjury = new Model.Manager_Month_NoInjuryAccidentC + { + NoInjuryAccidentId = noInjury.NoInjuryAccidentId, + MonthReportId = noInjury.MonthReportId, + AccidentType = noInjury.AccidentType, + EconomicLosses = noInjury.EconomicLosses, + WHAccidentCount = noInjury.WHAccidentCount, + SubAccidentCount = noInjury.SubAccidentCount, + }; + Funs.DB.Manager_Month_NoInjuryAccidentC.InsertOnSubmit(newNoInjury); + Funs.DB.SubmitChanges(); + } + + /// + /// 根据月报ID删除无伤害事故统计 + /// + /// + public static void DeleteNoInjuryAccidentByMonthReportId(string monthReportId) + { + var q = (from x in Funs.DB.Manager_Month_NoInjuryAccidentC where x.MonthReportId == monthReportId select x).ToList(); + if (q!=null) + { + Funs.DB.Manager_Month_NoInjuryAccidentC.DeleteAllOnSubmit(q); + Funs.DB.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PerformanceIndicatorCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PerformanceIndicatorCService.cs new file mode 100644 index 00000000..ed120ec8 --- /dev/null +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PerformanceIndicatorCService.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 项目HSE绩效指标 + /// + public class PerformanceIndicatorCService + { + /// + /// 根据月报ID获取HSE绩效指标 + /// + /// + /// + public static List GetPerformanceIndicatorByMonthReportId(string monthReportId) + { + return (from x in Funs.DB.Manager_Month_PerformanceIndicatorC where x.MonthReportId == monthReportId orderby x.SortIndex select x).ToList(); + } + + /// + /// 添加HSE绩效指标 + /// + /// + public static void AddPerformanceIndicator(Model.Manager_Month_PerformanceIndicatorC indicator) + { + Model.Manager_Month_PerformanceIndicatorC newIndicator = new Model.Manager_Month_PerformanceIndicatorC + { + PerformanceIndicatorId = indicator.PerformanceIndicatorId, + MonthReportId = indicator.MonthReportId, + IndicatorType = indicator.IndicatorType, + IndicatorName = indicator.IndicatorName, + IndicatorValue = indicator.IndicatorValue, + SortIndex = indicator.SortIndex, + }; + Funs.DB.Manager_Month_PerformanceIndicatorC.InsertOnSubmit(newIndicator); + Funs.DB.SubmitChanges(); + } + + /// + /// 根据主键删除HSE绩效指标 + /// + /// + public static void DeletePerformanceIndicatorByMonthReportId(string monthReportId) + { + var q = (from x in Funs.DB.Manager_Month_PerformanceIndicatorC where x.MonthReportId == monthReportId select x).ToList(); + if (q != null) + { + Funs.DB.Manager_Month_PerformanceIndicatorC.DeleteAllOnSubmit(q); + Funs.DB.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs index 60a7d289..d57b308e 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs @@ -39,11 +39,11 @@ namespace BLL MonthReportId = checkSort.MonthReportId, UnitId = checkSort.UnitId, SumPersonNum = checkSort.SumPersonNum, + SumOutPersonNum = checkSort.SumOutPersonNum, HSEPersonNum = checkSort.HSEPersonNum, ContractRange = checkSort.ContractRange, Remark = checkSort.Remark }; - db.Manager_PersonSortC.InsertOnSubmit(newPersonSort); db.SubmitChanges(); } diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/RewardAndPunishSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/RewardAndPunishSortCService.cs new file mode 100644 index 00000000..d0acb882 --- /dev/null +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/RewardAndPunishSortCService.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// HSE奖励与处罚 + /// + public class RewardAndPunishSortCService + { + /// + /// 根据月报ID获取HSE奖励与处罚列表 + /// + /// + /// + public static List GetRewardAndPunishSortCByMontReportId(string monthReportId) + { + return (from x in Funs.DB.Manager_RewardAndPunishSortC where x.MonthReportId == monthReportId select x).ToList(); + } + + /// + /// 增加HSE奖励与处罚 + /// + /// + public static void AddRewardAndPunishSortC(Model.Manager_RewardAndPunishSortC sortC) + { + Model.Manager_RewardAndPunishSortC newSortC = new Model.Manager_RewardAndPunishSortC + { + RewardAndPunishId = sortC.RewardAndPunishId, + MonthReportId = sortC.MonthReportId, + RewardNum = sortC.RewardNum, + RewardMoney = sortC.RewardMoney, + ProjectRewardMoney = sortC.ProjectRewardMoney, + PunishNum = sortC.PunishNum, + PunishMoney = sortC.PunishMoney, + ProjectPunishMoney = sortC.ProjectPunishMoney + }; + Funs.DB.Manager_RewardAndPunishSortC.InsertOnSubmit(newSortC); + Funs.DB.SubmitChanges(); + } + + /// + /// 根据月报id删除HSE奖励与处罚 + /// + /// + public static void DeleteRewardAndPunishSortCByMonthReportId(string monthReportId) + { + var q = (from x in Funs.DB.Manager_RewardAndPunishSortC where x.MonthReportId == monthReportId select x).ToList(); + if (q != null) + { + Funs.DB.Manager_RewardAndPunishSortC.DeleteAllOnSubmit(q); + Funs.DB.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/SubExpenseCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/SubExpenseCService.cs index ee335401..9c018d71 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/SubExpenseCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/SubExpenseCService.cs @@ -33,7 +33,10 @@ namespace BLL SubUnit = subExpense.SubUnit, CostMonth = subExpense.CostMonth, CostYear = subExpense.CostYear, - SortIndex = subExpense.SortIndex + SortIndex = subExpense.SortIndex, + ContractAmount=subExpense.ContractAmount, + MonthApprovalAmount = subExpense.MonthApprovalAmount, + ProjectApprovalAmount=subExpense.ProjectApprovalAmount }; db.Manager_Month_SubExpenseC.InsertOnSubmit(newSubExpense); db.SubmitChanges(); diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs index bfecd4ac..817befa0 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs @@ -36,7 +36,9 @@ namespace BLL TeachHour = trainSort.TeachHour, TeachMan = trainSort.TeachMan, UnitName = trainSort.UnitName, - PersonNum = trainSort.PersonNum + PersonNum = trainSort.PersonNum, + TrainType = trainSort.TrainType, + TotalPersonNum = trainSort.TotalPersonNum }; db.Manager_TrainSortC.InsertOnSubmit(newTrainSort); diff --git a/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs b/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs index e6ef0a0b..6e151d5c 100644 --- a/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs +++ b/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System; +using System.Linq; namespace BLL { @@ -100,5 +101,17 @@ namespace BLL db.SubmitChanges(); } } + + /// + /// 根据时间段获取班前会议集合 + /// + /// + /// + /// + /// + public static int GetCountByTime(DateTime startTime, DateTime endTime, string projectId) + { + return (from x in Funs.DB.Meeting_ClassMeeting where x.ClassMeetingDate >= startTime && x.ClassMeetingDate < endTime && x.ProjectId == projectId select x).Count(); + } } } diff --git a/SGGL/BLL/HSSE/SitePerson/PersonService.cs b/SGGL/BLL/HSSE/SitePerson/PersonService.cs index 0abd26a6..4dbd683d 100644 --- a/SGGL/BLL/HSSE/SitePerson/PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/PersonService.cs @@ -384,9 +384,9 @@ namespace BLL /// /// 单位Id /// 人员的数量 - public static int GetPersonCountByUnitId(string unitId, string projectId) + public static int GetPersonCountByUnitId(string unitId, string projectId, bool isOutside) { - var q = (from x in Funs.DB.SitePerson_Person where x.UnitId == unitId && x.ProjectId == projectId && x.IsUsed == true select x).ToList(); + var q = (from x in Funs.DB.SitePerson_Person where x.UnitId == unitId && x.ProjectId == projectId && x.IsUsed == true && x.IsOutside == isOutside select x).ToList(); return q.Count(); } diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 01866bc0..e69de29b 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,2656 +0,0 @@ - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:23 -出错时间:08/16/2023 16:11:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:23 -出错时间:08/16/2023 16:11:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:24 -出错时间:08/16/2023 16:11:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:24 -出错时间:08/16/2023 16:11:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:24 -出错时间:08/16/2023 16:11:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:24 -出错时间:08/16/2023 16:11:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:24 -出错时间:08/16/2023 16:11:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:24 -出错时间:08/16/2023 16:11:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:24 -出错时间:08/16/2023 16:11:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:24 -出错时间:08/16/2023 16:11:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:24 -出错时间:08/16/2023 16:11:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:24 -出错时间:08/16/2023 16:11:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:25 -出错时间:08/16/2023 16:11:25 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:50 -出错时间:08/16/2023 16:11:50 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:50 -出错时间:08/16/2023 16:11:50 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:50 -出错时间:08/16/2023 16:11:50 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:50 -出错时间:08/16/2023 16:11:50 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:11:50 -出错时间:08/16/2023 16:11:50 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:24 -出错时间:08/16/2023 16:41:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:24 -出错时间:08/16/2023 16:41:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:25 -出错时间:08/16/2023 16:41:25 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:25 -出错时间:08/16/2023 16:41:25 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:25 -出错时间:08/16/2023 16:41:25 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:25 -出错时间:08/16/2023 16:41:25 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:25 -出错时间:08/16/2023 16:41:26 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:26 -出错时间:08/16/2023 16:41:26 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:26 -出错时间:08/16/2023 16:41:26 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:26 -出错时间:08/16/2023 16:41:26 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:26 -出错时间:08/16/2023 16:41:26 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:26 -出错时间:08/16/2023 16:41:26 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:26 -出错时间:08/16/2023 16:41:26 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:27 -出错时间:08/16/2023 16:41:27 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:27 -出错时间:08/16/2023 16:41:27 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:27 -出错时间:08/16/2023 16:41:27 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:27 -出错时间:08/16/2023 16:41:27 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:27 -出错时间:08/16/2023 16:41:27 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 16:41:29 -出错时间:08/16/2023 16:41:29 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:26 -出错时间:08/16/2023 17:11:26 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:27 -出错时间:08/16/2023 17:11:27 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:27 -出错时间:08/16/2023 17:11:27 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:27 -出错时间:08/16/2023 17:11:27 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:27 -出错时间:08/16/2023 17:11:27 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:28 -出错时间:08/16/2023 17:11:28 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:28 -出错时间:08/16/2023 17:11:28 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:28 -出错时间:08/16/2023 17:11:28 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:28 -出错时间:08/16/2023 17:11:28 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:28 -出错时间:08/16/2023 17:11:28 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:28 -出错时间:08/16/2023 17:11:28 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:28 -出错时间:08/16/2023 17:11:28 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:28 -出错时间:08/16/2023 17:11:28 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:28 -出错时间:08/16/2023 17:11:28 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:28 -出错时间:08/16/2023 17:11:28 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:29 -出错时间:08/16/2023 17:11:29 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:29 -出错时间:08/16/2023 17:11:29 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:29 -出错时间:08/16/2023 17:11:29 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:29 -出错时间:08/16/2023 17:11:29 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:30 -出错时间:08/16/2023 17:11:30 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:31 -出错时间:08/16/2023 17:11:31 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:31 -出错时间:08/16/2023 17:11:31 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:31 -出错时间:08/16/2023 17:11:31 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:11:31 -出错时间:08/16/2023 17:11:31 - - -错误信息开始=====> -错误类型:ArgumentException -错误信息:提供的 URI 方案“http”无效，应为“https”。 -参数名: via -错误堆栈: - 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() - 在 System.ServiceModel.ClientBase`1.get_Channel() - 在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204 - 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2160 -出错时间:08/16/2023 17:41:19 -出错时间:08/16/2023 17:41:19 - - -错误信息开始=====> -错误类型:ArgumentException -错误信息:提供的 URI 方案“http”无效，应为“https”。 -参数名: via -错误堆栈: - 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() - 在 System.ServiceModel.ClientBase`1.get_Channel() - 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228 - 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2025 -出错时间:08/16/2023 17:41:19 -出错时间:08/16/2023 17:41:19 - - -错误信息开始=====> -错误类型:ArgumentException -错误信息:提供的 URI 方案“http”无效，应为“https”。 -参数名: via -错误堆栈: - 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() - 在 System.ServiceModel.ClientBase`1.get_Channel() - 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220 - 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1921 -出错时间:08/16/2023 17:41:19 -出错时间:08/16/2023 17:41:19 - - -错误信息开始=====> -错误类型:ArgumentException -错误信息:提供的 URI 方案“http”无效，应为“https”。 -参数名: via -错误堆栈: - 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) - 在 System.ServiceModel.ChannelFactory`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannel() - 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() - 在 System.ServiceModel.ClientBase`1.get_Channel() - 在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020 - 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1863 -出错时间:08/16/2023 17:41:19 -出错时间:08/16/2023 17:41:19 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:22 -出错时间:08/16/2023 17:41:22 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:23 -出错时间:08/16/2023 17:41:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:23 -出错时间:08/16/2023 17:41:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:23 -出错时间:08/16/2023 17:41:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:23 -出错时间:08/16/2023 17:41:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:23 -出错时间:08/16/2023 17:41:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:23 -出错时间:08/16/2023 17:41:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:23 -出错时间:08/16/2023 17:41:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:23 -出错时间:08/16/2023 17:41:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:23 -出错时间:08/16/2023 17:41:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:23 -出错时间:08/16/2023 17:41:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:23 -出错时间:08/16/2023 17:41:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:23 -出错时间:08/16/2023 17:41:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:24 -出错时间:08/16/2023 17:41:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:24 -出错时间:08/16/2023 17:41:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:24 -出错时间:08/16/2023 17:41:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:24 -出错时间:08/16/2023 17:41:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:24 -出错时间:08/16/2023 17:41:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:25 -出错时间:08/16/2023 17:41:25 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 325 -出错时间:08/16/2023 17:41:25 -出错时间:08/16/2023 17:41:25 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:55 -出错时间:08/22/2023 16:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:55 -出错时间:08/22/2023 16:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:55 -出错时间:08/22/2023 16:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:55 -出错时间:08/22/2023 16:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:55 -出错时间:08/22/2023 16:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:55 -出错时间:08/22/2023 16:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:55 -出错时间:08/22/2023 16:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:55 -出错时间:08/22/2023 16:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:56 -出错时间:08/22/2023 16:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:56 -出错时间:08/22/2023 16:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:56 -出错时间:08/22/2023 16:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:56 -出错时间:08/22/2023 16:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:56 -出错时间:08/22/2023 16:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:56 -出错时间:08/22/2023 16:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:56 -出错时间:08/22/2023 16:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:56 -出错时间:08/22/2023 16:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:56 -出错时间:08/22/2023 16:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:57 -出错时间:08/22/2023 16:32:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:57 -出错时间:08/22/2023 16:32:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:57 -出错时间:08/22/2023 16:32:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:57 -出错时间:08/22/2023 16:32:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:58 -出错时间:08/22/2023 16:32:58 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:58 -出错时间:08/22/2023 16:32:58 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:58 -出错时间:08/22/2023 16:32:58 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:58 -出错时间:08/22/2023 16:32:58 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:59 -出错时间:08/22/2023 16:32:59 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 16:32:59 -出错时间:08/22/2023 16:32:59 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:55 -出错时间:08/22/2023 17:02:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:55 -出错时间:08/22/2023 17:02:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:55 -出错时间:08/22/2023 17:02:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:56 -出错时间:08/22/2023 17:02:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:56 -出错时间:08/22/2023 17:02:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:56 -出错时间:08/22/2023 17:02:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:56 -出错时间:08/22/2023 17:02:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:56 -出错时间:08/22/2023 17:02:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:56 -出错时间:08/22/2023 17:02:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:56 -出错时间:08/22/2023 17:02:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:56 -出错时间:08/22/2023 17:02:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:56 -出错时间:08/22/2023 17:02:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:57 -出错时间:08/22/2023 17:02:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:57 -出错时间:08/22/2023 17:02:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:57 -出错时间:08/22/2023 17:02:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:57 -出错时间:08/22/2023 17:02:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:57 -出错时间:08/22/2023 17:02:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:57 -出错时间:08/22/2023 17:02:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:57 -出错时间:08/22/2023 17:02:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:58 -出错时间:08/22/2023 17:02:58 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:58 -出错时间:08/22/2023 17:02:58 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:59 -出错时间:08/22/2023 17:02:59 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:59 -出错时间:08/22/2023 17:02:59 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:02:59 -出错时间:08/22/2023 17:02:59 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:54 -出错时间:08/22/2023 17:32:54 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:54 -出错时间:08/22/2023 17:32:54 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:54 -出错时间:08/22/2023 17:32:54 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:54 -出错时间:08/22/2023 17:32:54 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:55 -出错时间:08/22/2023 17:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:55 -出错时间:08/22/2023 17:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:55 -出错时间:08/22/2023 17:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:55 -出错时间:08/22/2023 17:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:55 -出错时间:08/22/2023 17:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:55 -出错时间:08/22/2023 17:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:55 -出错时间:08/22/2023 17:32:55 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:56 -出错时间:08/22/2023 17:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:56 -出错时间:08/22/2023 17:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:56 -出错时间:08/22/2023 17:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:56 -出错时间:08/22/2023 17:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:56 -出错时间:08/22/2023 17:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:56 -出错时间:08/22/2023 17:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:56 -出错时间:08/22/2023 17:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:56 -出错时间:08/22/2023 17:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:56 -出错时间:08/22/2023 17:32:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:57 -出错时间:08/22/2023 17:32:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:57 -出错时间:08/22/2023 17:32:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:58 -出错时间:08/22/2023 17:32:58 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/22/2023 17:32:58 -出错时间:08/22/2023 17:32:58 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:49:59 -出错时间:08/24/2023 14:49:59 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:49:59 -出错时间:08/24/2023 14:49:59 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:00 -出错时间:08/24/2023 14:50:00 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:00 -出错时间:08/24/2023 14:50:00 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:00 -出错时间:08/24/2023 14:50:00 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:01 -出错时间:08/24/2023 14:50:01 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:01 -出错时间:08/24/2023 14:50:01 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:01 -出错时间:08/24/2023 14:50:01 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:01 -出错时间:08/24/2023 14:50:01 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:01 -出错时间:08/24/2023 14:50:01 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:01 -出错时间:08/24/2023 14:50:01 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:02 -出错时间:08/24/2023 14:50:02 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:02 -出错时间:08/24/2023 14:50:02 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:02 -出错时间:08/24/2023 14:50:02 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:02 -出错时间:08/24/2023 14:50:02 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:02 -出错时间:08/24/2023 14:50:02 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:02 -出错时间:08/24/2023 14:50:02 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:02 -出错时间:08/24/2023 14:50:02 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:03 -出错时间:08/24/2023 14:50:03 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:03 -出错时间:08/24/2023 14:50:03 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:03 -出错时间:08/24/2023 14:50:03 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:04 -出错时间:08/24/2023 14:50:04 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:04 -出错时间:08/24/2023 14:50:04 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:04 -出错时间:08/24/2023 14:50:04 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:04 -出错时间:08/24/2023 14:50:04 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:05 -出错时间:08/24/2023 14:50:05 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:05 -出错时间:08/24/2023 14:50:05 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 14:50:08 -出错时间:08/24/2023 14:50:08 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:56 -出错时间:08/24/2023 15:19:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:56 -出错时间:08/24/2023 15:19:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:56 -出错时间:08/24/2023 15:19:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:56 -出错时间:08/24/2023 15:19:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:56 -出错时间:08/24/2023 15:19:56 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:57 -出错时间:08/24/2023 15:19:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:57 -出错时间:08/24/2023 15:19:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:57 -出错时间:08/24/2023 15:19:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:57 -出错时间:08/24/2023 15:19:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:57 -出错时间:08/24/2023 15:19:57 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:58 -出错时间:08/24/2023 15:19:58 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:58 -出错时间:08/24/2023 15:19:58 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:58 -出错时间:08/24/2023 15:19:58 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:58 -出错时间:08/24/2023 15:19:58 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:58 -出错时间:08/24/2023 15:19:58 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:58 -出错时间:08/24/2023 15:19:58 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:59 -出错时间:08/24/2023 15:19:59 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:59 -出错时间:08/24/2023 15:19:59 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:59 -出错时间:08/24/2023 15:19:59 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:59 -出错时间:08/24/2023 15:19:59 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:59 -出错时间:08/24/2023 15:19:59 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:59 -出错时间:08/24/2023 15:19:59 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:19:59 -出错时间:08/24/2023 15:19:59 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:20:00 -出错时间:08/24/2023 15:20:00 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/24/2023 15:20:00 -出错时间:08/24/2023 15:20:00 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:21 -出错时间:08/30/2023 10:54:21 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:21 -出错时间:08/30/2023 10:54:21 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:22 -出错时间:08/30/2023 10:54:22 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:22 -出错时间:08/30/2023 10:54:22 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:22 -出错时间:08/30/2023 10:54:22 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:23 -出错时间:08/30/2023 10:54:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:23 -出错时间:08/30/2023 10:54:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:23 -出错时间:08/30/2023 10:54:23 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:24 -出错时间:08/30/2023 10:54:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:24 -出错时间:08/30/2023 10:54:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:24 -出错时间:08/30/2023 10:54:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:24 -出错时间:08/30/2023 10:54:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:24 -出错时间:08/30/2023 10:54:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:24 -出错时间:08/30/2023 10:54:24 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:25 -出错时间:08/30/2023 10:54:25 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:25 -出错时间:08/30/2023 10:54:25 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:25 -出错时间:08/30/2023 10:54:25 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:25 -出错时间:08/30/2023 10:54:25 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:26 -出错时间:08/30/2023 10:54:26 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:26 -出错时间:08/30/2023 10:54:26 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:27 -出错时间:08/30/2023 10:54:27 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:28 -出错时间:08/30/2023 10:54:28 - - -错误信息开始=====> -错误类型:InvalidOperationException -错误信息:不能添加已经存在的实体。 -错误堆栈: - 在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity) - 在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities) - 在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323 -出错时间:08/30/2023 10:54:28 -出错时间:08/30/2023 10:54:28 - diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/临时用电作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/临时用电作业票.doc new file mode 100644 index 00000000..274aefe4 Binary files /dev/null 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/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 60ca25c6..c215efda 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1113,8 +1113,8 @@ - + @@ -1655,6 +1655,8 @@ + + @@ -1664,6 +1666,8 @@ + + @@ -1994,6 +1998,7 @@ + @@ -11958,13 +11963,6 @@ MonthReportCEdit4.aspx - - MonthReportCEdit5.aspx - ASPXCodeBehind - - - MonthReportCEdit5.aspx - MonthReportCEdit6.aspx ASPXCodeBehind @@ -11972,6 +11970,13 @@ MonthReportCEdit6.aspx + + MonthReportCEdit5.aspx + ASPXCodeBehind + + + MonthReportCEdit5.aspx + MonthReportCEdit7.aspx ASPXCodeBehind @@ -14968,6 +14973,20 @@ DeviceRunEdit.aspx + + InspectTailTermEdit.aspx + ASPXCodeBehind + + + InspectTailTermEdit.aspx + + + InspectTailTermList.aspx + ASPXCodeBehind + + + InspectTailTermList.aspx + InspectTemplate.aspx ASPXCodeBehind @@ -15031,6 +15050,20 @@ SysPipingDeviceImport.aspx + + TailTermApprove.aspx + ASPXCodeBehind + + + TailTermApprove.aspx + + + TailTermApproveList.aspx + ASPXCodeBehind + + + TailTermApproveList.aspx + GoodsBuy.aspx ASPXCodeBehind 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 0d69be05..79e6cca7 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs @@ -289,7 +289,7 @@ namespace FineUIPro.Web.HSSE.License string uploadfilepath = string.Empty; string newUrl = string.Empty; string filePath = string.Empty; - initTemplatePath = "File\\Word\\HSSE\\动土作业票.doc"; + initTemplatePath = "File\\Word\\HSSE\\临时用电作业票.doc"; uploadfilepath = rootPath + initTemplatePath; newUrl = uploadfilepath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".doc"); filePath = initTemplatePath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".pdf"); @@ -340,12 +340,12 @@ namespace FineUIPro.Web.HSSE.License } } - Bookmark bookmarkWorkDepth = doc.Range.Bookmarks["WorkDepth"];//开挖深度 + Bookmark bookmarkWorkDepth = doc.Range.Bookmarks["WorkDepth"];//作业原因 if (bookmarkWorkDepth != null) { - if (getElectricity != null) + if (getElectricity.Reason != null) { - bookmarkWorkDepth.Text = getElectricity.WorkDepth; + 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/FineUIPro.Web/HSSE/Manager/MonthReportCEdit1.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit1.aspx index 8c95cecb..fa049c0d 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit1.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit1.aspx @@ -31,9 +31,9 @@ - + - + diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit10.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit10.aspx index 4e63b672..2f0d9ecb 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit10.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit10.aspx @@ -4,38 +4,38 @@ - + 10.项目现场HSE影像照片
- - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx index 47a6833a..450bec96 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx @@ -8,75 +8,87 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx.cs index c269fbd1..42a26793 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx.cs @@ -86,6 +86,7 @@ namespace FineUIPro.Web.HSSE.Manager JObject summary = new JObject(); summary.Add("UnitId", "合计："); summary.Add("SumPersonNum", (from x in personSorts select x.SumPersonNum ?? 0).Sum()); + summary.Add("SumOutPersonNum", (from x in personSorts select x.SumOutPersonNum ?? 0).Sum()); summary.Add("HSEPersonNum", (from x in personSorts select x.HSEPersonNum ?? 0).Sum()); this.gvPersonSort.SummaryData = summary; } @@ -94,7 +95,7 @@ namespace FineUIPro.Web.HSSE.Manager this.gvPersonSort.SummaryData = null; } } - else + else { GetPersonSort(); } @@ -118,7 +119,8 @@ namespace FineUIPro.Web.HSSE.Manager where x.ProjectId == this.ProjectId && (x.UnitType == "1" || x.UnitType == "2") orderby x.UnitType select x; //1为总包，2为施工分包 - int totalSumPersonNum = 0; + int totalSumPersonNum = 0;//总部 + int totalSumOutPersonNum = 0;//外聘 int totalHSEPersonNum = 0; if (units.Count() > 0) { @@ -128,12 +130,14 @@ namespace FineUIPro.Web.HSSE.Manager { PersonSortId = SQLHelper.GetNewID(typeof(Model.Manager_PersonSortC)), UnitId = u.UnitId, - SumPersonNum = BLL.PersonService.GetPersonCountByUnitId(u.UnitId, this.CurrUser.LoginProjectId), + SumPersonNum = BLL.PersonService.GetPersonCountByUnitId(u.UnitId, this.CurrUser.LoginProjectId, false),//本部 + SumOutPersonNum = BLL.PersonService.GetPersonCountByUnitId(u.UnitId, this.CurrUser.LoginProjectId, true),//外聘 HSEPersonNum = BLL.PersonService.GetHSEPersonCountByUnitId(u.UnitId, this.CurrUser.LoginProjectId), ContractRange = u.ContractRange }; personSorts.Add(personSort); totalSumPersonNum += Convert.ToInt32(personSort.SumPersonNum); + totalSumOutPersonNum += Convert.ToInt32(personSort.SumOutPersonNum); totalHSEPersonNum += Convert.ToInt32(personSort.HSEPersonNum); } } @@ -144,6 +148,7 @@ namespace FineUIPro.Web.HSSE.Manager JObject summary = new JObject(); summary.Add("UnitId", "合计："); summary.Add("SumPersonNum", totalSumPersonNum); + summary.Add("SumOutPersonNum", totalSumOutPersonNum); summary.Add("HSEPersonNum", totalHSEPersonNum); this.gvPersonSort.SummaryData = summary; } @@ -224,6 +229,7 @@ namespace FineUIPro.Web.HSSE.Manager MonthReportId = monthReportId, UnitId = this.gvPersonSort.Rows[i].DataKeys[1].ToString(), SumPersonNum = Funs.GetNewIntOrZero(values.Value("SumPersonNum").ToString()), + SumOutPersonNum = Funs.GetNewIntOrZero(values.Value("SumOutPersonNum").ToString()), HSEPersonNum = Funs.GetNewIntOrZero(values.Value("HSEPersonNum").ToString()), ContractRange = values.Value("ContractRange").ToString(), Remark = values.Value("Remark").ToString() diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx.designer.cs index 1dd0e3cd..d270afe9 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit2.aspx.designer.cs @@ -75,6 +75,15 @@ namespace FineUIPro.Web.HSSE.Manager { /// protected global::FineUIPro.NumberBox nbSumPersonNum; + /// + /// nbSumOutPersonNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox nbSumOutPersonNum; + /// /// nbHSEPersonNum 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit3.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit3.aspx index 5e7b788b..5968b85b 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit3.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit3.aspx @@ -15,9 +15,9 @@ - + - @@ -68,9 +68,9 @@ - + - + @@ -90,7 +90,7 @@ - + HSE绩效管理数据
- - - - - - - - - + + + + + + + + + + + <%-- + + + + + + + --%> + + <%----%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --%> + + + + + + + + + + + + + + + + <%-- + + + + + + + --%> + + <%----%> + <%----%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --%> + + + <%-- - - --%> + <%-- - - + --%> + <%-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -318,8 +595,8 @@ - - + --%> + <%-- @@ -406,298 +683,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + --%> + <%-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<%-- - - - - - --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + --%> + + + + + + + + + + + +
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit4.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit4.aspx.cs index 829eb183..b51487f7 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit4.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit4.aspx.cs @@ -52,70 +52,78 @@ namespace FineUIPro.Web.HSSE.Manager private static DateTime projectStartTime; #region 定义集合 - /// - /// 危险源情况集合 - /// - private static List hazardSorts = new List(); - /// /// 培训情况集合 /// private static List trainSorts = new List(); - /// - /// 培训活动情况集合 - /// - private static List trainActivitySorts = new List(); - /// /// 检查情况集合 /// private static List checkSorts = new List(); - /// - /// 检查明细情况集合 - /// - private static List checkDetailSorts = new List(); + + ///// + ///// 危险源情况集合 + ///// + //private static List hazardSorts = new List(); + + ///// + ///// 培训活动情况集合 + ///// + //private static List trainActivitySorts = new List(); + + + ///// + ///// 检查明细情况集合 + ///// + //private static List checkDetailSorts = new List(); + + ///// + ///// 会议情况集合 + ///// + //private static List meetingSorts = new List(); + + ///// + ///// HSE宣传活动集合 + ///// + //private static List promotionalActiviteSorts = new List(); + + ///// + ///// HSE应急预案集合 + ///// + //private static List emergencySorts = new List(); + + ///// + ///// HSE应急演练集合 + ///// + //private static List drillSorts = new List(); + + ///// + ///// HSE奖励集合 + ///// + //private static List rewardSorts = new List(); + + ///// + ///// HSE处罚集合 + ///// + //private static List punishSorts = new List(); + + ///// + ///// 其他HSE管理活动 + ///// + //private static List otherActiveSorts = new List(); + + ///// + ///// 4.9.2 活动情况说明集合 + ///// + //private static List activityDess = new List(); + /// - /// 会议情况集合 + /// HSE奖励与处罚 /// - private static List meetingSorts = new List(); - - /// - /// HSE宣传活动集合 - /// - private static List promotionalActiviteSorts = new List(); - - /// - /// HSE应急预案集合 - /// - private static List emergencySorts = new List(); - - /// - /// HSE应急演练集合 - /// - private static List drillSorts = new List(); - - /// - /// HSE奖励集合 - /// - private static List rewardSorts = new List(); - - /// - /// HSE处罚集合 - /// - private static List punishSorts = new List(); - - /// - /// 其他HSE管理活动 - /// - private static List otherActiveSorts = new List(); - - /// - /// 4.9.2 活动情况说明集合 - /// - private static List activityDess = new List(); + private static List rewardAndPunishSortCs = new List(); /// /// 4.10 HSE现场其他管理情况集合 @@ -131,19 +139,20 @@ namespace FineUIPro.Web.HSSE.Manager { if (!IsPostBack) { - hazardSorts.Clear(); trainSorts.Clear(); - trainActivitySorts.Clear(); checkSorts.Clear(); - checkDetailSorts.Clear(); - meetingSorts.Clear(); - emergencySorts.Clear(); - promotionalActiviteSorts.Clear(); - drillSorts.Clear(); - rewardSorts.Clear(); - punishSorts.Clear(); - otherActiveSorts.Clear(); - activityDess.Clear(); + //hazardSorts.Clear(); + //trainActivitySorts.Clear(); + //checkDetailSorts.Clear(); + //meetingSorts.Clear(); + //emergencySorts.Clear(); + //promotionalActiviteSorts.Clear(); + //drillSorts.Clear(); + //rewardSorts.Clear(); + //punishSorts.Clear(); + //otherActiveSorts.Clear(); + //activityDess.Clear(); + rewardAndPunishSortCs.Clear(); otherManagements.Clear(); this.MonthReportId = Request.Params["monthReportId"]; this.ProjectId = this.CurrUser.LoginProjectId; @@ -151,9 +160,9 @@ namespace FineUIPro.Web.HSSE.Manager startTime = Convert.ToDateTime(Request.Params["startTime"]); endTime = Convert.ToDateTime(Request.Params["endTime"]); yearStartTime = Convert.ToDateTime(Request.Params["yearStartTime"]); - Model.Manager_MonthReportC monthReport = BLL.MonthReportCService.GetMonthReportByMonths(months, this.CurrUser.LoginProjectId); + Model.Manager_MonthReportC monthReport = BLL.MonthReportCService.GetMonthReportByMonths(months, this.ProjectId); Model.Manager_MonthReportC mr = BLL.MonthReportCService.GetLastMonthReportByDate(endTime, this.ProjectId); - Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(ProjectId); + Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.ProjectId); if (project.StartDate != null) { projectStartTime = Convert.ToDateTime(project.StartDate); @@ -163,17 +172,11 @@ namespace FineUIPro.Web.HSSE.Manager this.MonthReportId = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; months = Convert.ToDateTime(monthReport.Months); - Model.SGGLDB db = Funs.DB; - this.txtMainActivitiesDef.Text = monthReport.MainActivitiesDef; - //危险源情况 - hazardSorts = (from x in db.Manager_HazardSortC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); - if (hazardSorts.Count > 0) //保存过数据 - { - this.gvHazardSort.DataSource = hazardSorts; - this.gvHazardSort.DataBind(); - } + //Model.SGGLDB db = Funs.DB; + + //培训情况 - trainSorts = (from x in db.Manager_TrainSortC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); + trainSorts = BLL.TrainSortCService.GetTrainSortsByMonthReportId(this.MonthReportId); if (trainSorts.Count > 0) { this.gvTrainSort.DataSource = trainSorts; @@ -183,15 +186,8 @@ namespace FineUIPro.Web.HSSE.Manager { GetTrainSort(); } - //培训活动情况 - trainActivitySorts = (from x in db.Manager_TrainActivitySortC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); - if (trainActivitySorts.Count > 0) - { - this.gvTrainActivitySort.DataSource = trainActivitySorts; - this.gvTrainActivitySort.DataBind(); - } //检查情况 - checkSorts = (from x in db.Manager_CheckSortC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); + checkSorts = BLL.CheckSortCService.GetCheckSortsByMonthReportId(this.MonthReportId); if (checkSorts.Count > 0) { this.gvCheckSort.DataSource = checkSorts; @@ -201,337 +197,369 @@ namespace FineUIPro.Web.HSSE.Manager { GetCheckSort(); } + //this.txtMainActivitiesDef.Text = monthReport.MainActivitiesDef; + //危险源情况 + //hazardSorts = (from x in db.Manager_HazardSortC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); + //if (hazardSorts.Count > 0) //保存过数据 + //{ + // this.gvHazardSort.DataSource = hazardSorts; + // this.gvHazardSort.DataBind(); + //} + //培训活动情况 + //trainActivitySorts = (from x in db.Manager_TrainActivitySortC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); + //if (trainActivitySorts.Count > 0) + //{ + // this.gvTrainActivitySort.DataSource = trainActivitySorts; + // this.gvTrainActivitySort.DataBind(); + //} //检查明细情况 - checkDetailSorts = (from x in db.Manager_CheckDetailSortC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); - if (checkDetailSorts.Count > 0) - { - this.gvCheckDetailSort.DataSource = checkDetailSorts; - this.gvCheckDetailSort.DataBind(); - } - else - { - GetCheckDetailSort(); - } - if (monthReport.MeetingNum != null) - { - this.txtMeetingNum.Text = (monthReport.MeetingNum ?? 0).ToString(); - this.txtYearMeetingNum.Text = (monthReport.YearMeetingNum ?? 0).ToString(); - } - else - { - //会议数量 - int meetingNum1 = BLL.WeekMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); - int meetingNum2 = BLL.MonthMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); - int meetingNum3 = BLL.SpecialMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); - int meetingNum4 = BLL.AttendMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); - this.txtMeetingNum.Text = (meetingNum1 + meetingNum2 + meetingNum3 + meetingNum4).ToString(); - if (mr != null) - { - if (mr.YearMeetingNum != 0) - { - this.txtYearMeetingNum.Text = (mr.YearMeetingNum + Convert.ToInt32(this.txtMeetingNum.Text.Trim())).ToString(); - } - else - { - this.txtYearMeetingNum.Text = txtMeetingNum.Text.Trim(); - } - } - else - { - this.txtYearMeetingNum.Text = txtMeetingNum.Text.Trim(); - } - } + //checkDetailSorts = (from x in db.Manager_CheckDetailSortC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); + //if (checkDetailSorts.Count > 0) + //{ + // this.gvCheckDetailSort.DataSource = checkDetailSorts; + // this.gvCheckDetailSort.DataBind(); + //} + //else + //{ + // GetCheckDetailSort(); + //} + //if (monthReport.MeetingNum != null) + //{ + // this.txtMeetingNum.Text = (monthReport.MeetingNum ?? 0).ToString(); + // this.txtYearMeetingNum.Text = (monthReport.YearMeetingNum ?? 0).ToString(); + //} + //else + //{ + // //会议数量 + // int meetingNum1 = BLL.WeekMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); + // int meetingNum2 = BLL.MonthMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); + // int meetingNum3 = BLL.SpecialMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); + // int meetingNum4 = BLL.AttendMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); + // this.txtMeetingNum.Text = (meetingNum1 + meetingNum2 + meetingNum3 + meetingNum4).ToString(); + // if (mr != null) + // { + // if (mr.YearMeetingNum != 0) + // { + // this.txtYearMeetingNum.Text = (mr.YearMeetingNum + Convert.ToInt32(this.txtMeetingNum.Text.Trim())).ToString(); + // } + // else + // { + // this.txtYearMeetingNum.Text = txtMeetingNum.Text.Trim(); + // } + // } + // else + // { + // this.txtYearMeetingNum.Text = txtMeetingNum.Text.Trim(); + // } + //} //会议情况 - meetingSorts = (from x in db.Manager_MeetingSortC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); - if (meetingSorts.Count > 0) - { - this.gvMeetingSort.DataSource = meetingSorts; - this.gvMeetingSort.DataBind(); - } - else - { - GetMeetingSort(); - } - if (monthReport.ComplexEmergencyNum != null) - { - this.txtComplexEmergencyNum.Text = (monthReport.ComplexEmergencyNum ?? 0).ToString(); - this.txtYearComplexEmergencyNum.Text = (monthReport.YearComplexEmergencyNum ?? 0).ToString(); - this.txtTotalComplexEmergencyNum.Text = (monthReport.TotalComplexEmergencyNum ?? 0).ToString(); - this.txtSpecialEmergencyNum.Text = (monthReport.SpecialEmergencyNum ?? 0).ToString(); - this.txtYearSpecialEmergencyNum.Text = (monthReport.YearSpecialEmergencyNum ?? 0).ToString(); - this.txtTotalSpecialEmergencyNum.Text = (monthReport.TotalSpecialEmergencyNum ?? 0).ToString(); - this.txtDrillRecordNum.Text = (monthReport.DrillRecordNum ?? 0).ToString(); - this.txtYearDrillRecordNum.Text = (monthReport.YearDrillRecordNum ?? 0).ToString(); - this.txtTotalDrillRecordNum.Text = (monthReport.TotalDrillRecordNum ?? 0).ToString(); - } - else - { - //应急管理 - List complexEmergencys = BLL.EmergencyListService.GetEmergencyListsByEmergencyType(BLL.Const.ComplexEmergencyName, this.ProjectId, startTime, endTime); //综合应急预案集合 - int complexEmergencyNum = complexEmergencys.Count; - this.txtComplexEmergencyNum.Text = complexEmergencyNum.ToString(); - List specialEmergencys = BLL.EmergencyListService.GetOtherEmergencyListsByEmergencyType(BLL.Const.ComplexEmergencyName, this.ProjectId, startTime, endTime); //专项应急预案集合 - int specialEmergencyNum = specialEmergencys.Count; - this.txtSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); - this.txtDrillRecordNum.Text = BLL.DrillRecordListService.GetCountByDate(startTime, endTime, this.ProjectId).ToString(); - if (mr != null) - { - //综合应急预案 - if (mr.YearComplexEmergencyNum != 0) - { - this.txtYearComplexEmergencyNum.Text = (mr.YearComplexEmergencyNum + complexEmergencyNum).ToString(); - this.txtTotalComplexEmergencyNum.Text = (mr.TotalComplexEmergencyNum + complexEmergencyNum).ToString(); - } - else - { - this.txtYearComplexEmergencyNum.Text = complexEmergencyNum.ToString(); - this.txtTotalComplexEmergencyNum.Text = complexEmergencyNum.ToString(); - } - //专项应急预案 - if (mr.YearSpecialEmergencyNum != 0) - { - this.txtYearSpecialEmergencyNum.Text = (mr.YearSpecialEmergencyNum + specialEmergencyNum).ToString(); - this.txtTotalSpecialEmergencyNum.Text = (mr.TotalSpecialEmergencyNum + specialEmergencyNum).ToString(); - } - else - { - this.txtYearSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); - this.txtTotalSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); - } - //应急演练活动 - if (mr.YearDrillRecordNum != 0) - { - this.txtYearDrillRecordNum.Text = (mr.YearDrillRecordNum + Convert.ToInt32(this.txtDrillRecordNum.Text.Trim())).ToString(); - this.txtTotalDrillRecordNum.Text = (mr.TotalDrillRecordNum + Convert.ToInt32(this.txtDrillRecordNum.Text.Trim())).ToString(); - } - else - { - this.txtYearDrillRecordNum.Text = this.txtDrillRecordNum.Text; - this.txtTotalDrillRecordNum.Text = this.txtDrillRecordNum.Text; - } - } - else - { - this.txtYearComplexEmergencyNum.Text = complexEmergencyNum.ToString(); - this.txtTotalComplexEmergencyNum.Text = complexEmergencyNum.ToString(); - this.txtYearSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); - this.txtTotalSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); - this.txtYearDrillRecordNum.Text = this.txtDrillRecordNum.Text; - this.txtTotalDrillRecordNum.Text = this.txtDrillRecordNum.Text; - } - } + // meetingSorts = (from x in db.Manager_MeetingSortC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); + // if (meetingSorts.Count > 0) + // { + // this.gvMeetingSort.DataSource = meetingSorts; + // this.gvMeetingSort.DataBind(); + // } + // else + // { + // GetMeetingSort(); + // } + // if (monthReport.ComplexEmergencyNum != null) + // { + // this.txtComplexEmergencyNum.Text = (monthReport.ComplexEmergencyNum ?? 0).ToString(); + // this.txtYearComplexEmergencyNum.Text = (monthReport.YearComplexEmergencyNum ?? 0).ToString(); + // this.txtTotalComplexEmergencyNum.Text = (monthReport.TotalComplexEmergencyNum ?? 0).ToString(); + // this.txtSpecialEmergencyNum.Text = (monthReport.SpecialEmergencyNum ?? 0).ToString(); + // this.txtYearSpecialEmergencyNum.Text = (monthReport.YearSpecialEmergencyNum ?? 0).ToString(); + // this.txtTotalSpecialEmergencyNum.Text = (monthReport.TotalSpecialEmergencyNum ?? 0).ToString(); + // this.txtDrillRecordNum.Text = (monthReport.DrillRecordNum ?? 0).ToString(); + // this.txtYearDrillRecordNum.Text = (monthReport.YearDrillRecordNum ?? 0).ToString(); + // this.txtTotalDrillRecordNum.Text = (monthReport.TotalDrillRecordNum ?? 0).ToString(); + // } + // else + // { + // //应急管理 + // List complexEmergencys = BLL.EmergencyListService.GetEmergencyListsByEmergencyType(BLL.Const.ComplexEmergencyName, this.ProjectId, startTime, endTime); //综合应急预案集合 + // int complexEmergencyNum = complexEmergencys.Count; + // this.txtComplexEmergencyNum.Text = complexEmergencyNum.ToString(); + // List specialEmergencys = BLL.EmergencyListService.GetOtherEmergencyListsByEmergencyType(BLL.Const.ComplexEmergencyName, this.ProjectId, startTime, endTime); //专项应急预案集合 + // int specialEmergencyNum = specialEmergencys.Count; + // this.txtSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); + // this.txtDrillRecordNum.Text = BLL.DrillRecordListService.GetCountByDate(startTime, endTime, this.ProjectId).ToString(); + // if (mr != null) + // { + // //综合应急预案 + // if (mr.YearComplexEmergencyNum != 0) + // { + // this.txtYearComplexEmergencyNum.Text = (mr.YearComplexEmergencyNum + complexEmergencyNum).ToString(); + // this.txtTotalComplexEmergencyNum.Text = (mr.TotalComplexEmergencyNum + complexEmergencyNum).ToString(); + // } + // else + // { + // this.txtYearComplexEmergencyNum.Text = complexEmergencyNum.ToString(); + // this.txtTotalComplexEmergencyNum.Text = complexEmergencyNum.ToString(); + // } + // //专项应急预案 + // if (mr.YearSpecialEmergencyNum != 0) + // { + // this.txtYearSpecialEmergencyNum.Text = (mr.YearSpecialEmergencyNum + specialEmergencyNum).ToString(); + // this.txtTotalSpecialEmergencyNum.Text = (mr.TotalSpecialEmergencyNum + specialEmergencyNum).ToString(); + // } + // else + // { + // this.txtYearSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); + // this.txtTotalSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); + // } + // //应急演练活动 + // if (mr.YearDrillRecordNum != 0) + // { + // this.txtYearDrillRecordNum.Text = (mr.YearDrillRecordNum + Convert.ToInt32(this.txtDrillRecordNum.Text.Trim())).ToString(); + // this.txtTotalDrillRecordNum.Text = (mr.TotalDrillRecordNum + Convert.ToInt32(this.txtDrillRecordNum.Text.Trim())).ToString(); + // } + // else + // { + // this.txtYearDrillRecordNum.Text = this.txtDrillRecordNum.Text; + // this.txtTotalDrillRecordNum.Text = this.txtDrillRecordNum.Text; + // } + // } + // else + // { + // this.txtYearComplexEmergencyNum.Text = complexEmergencyNum.ToString(); + // this.txtTotalComplexEmergencyNum.Text = complexEmergencyNum.ToString(); + // this.txtYearSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); + // this.txtTotalSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); + // this.txtYearDrillRecordNum.Text = this.txtDrillRecordNum.Text; + // this.txtTotalDrillRecordNum.Text = this.txtDrillRecordNum.Text; + // } + // } this.txtEmergencyManagementWorkDef.Text = monthReport.EmergencyManagementWorkDef; - this.txtLicenseRemark.Text = monthReport.LicenseRemark; - this.txtEquipmentRemark.Text = monthReport.EquipmentRemark; - //HSE奖励情况 - rewardSorts = (from x in db.Manager_IncentiveSortC where x.MonthReportId == MonthReportId && x.BigType == "1" orderby x.SortIndex select x).ToList(); - if (rewardSorts.Count > 0) + this.txtWorkDef.Text = monthReport.LicenseRemark; + // this.txtEquipmentRemark.Text = monthReport.EquipmentRemark; + // //HSE奖励情况 + // rewardSorts = (from x in db.Manager_IncentiveSortC where x.MonthReportId == MonthReportId && x.BigType == "1" orderby x.SortIndex select x).ToList(); + // if (rewardSorts.Count > 0) + // { + // this.gvRewardSort.DataSource = rewardSorts; + // this.gvRewardSort.DataBind(); + // } + // else + // { + // GetRewardSort(); + // } + // //HSE处罚情况 + // punishSorts = (from x in db.Manager_IncentiveSortC where x.MonthReportId == MonthReportId && x.BigType == "2" orderby x.SortIndex select x).ToList(); + // if (punishSorts.Count > 0) + // { + // this.gvPunishSort.DataSource = punishSorts; + // this.gvPunishSort.DataBind(); + // } + // else + // { + // GetPunishSort(); + // } + // if (monthReport.RewardNum != null) + // { + // this.txtRewardNum.Text = (monthReport.RewardNum ?? 0).ToString(); + // this.txtYearRewardNum.Text = (monthReport.YearRewardNum ?? 0).ToString(); + // this.txtRewardMoney.Text = (monthReport.RewardMoney ?? 0).ToString(); + // this.txtYearRewardMoney.Text = (monthReport.YearRewardMoney ?? 0).ToString(); + // this.txtPunishNum.Text = (monthReport.PunishNum ?? 0).ToString(); + // this.txtYearPunishNum.Text = (monthReport.YearPunishNum ?? 0).ToString(); + // this.txtPunishMoney.Text = (monthReport.PunishMoney ?? 0).ToString(); + // this.txtYearPunishMoney.Text = (monthReport.YearPunishMoney ?? 0).ToString(); + // } + // else + // { + // this.txtRewardNum.Text = BLL.IncentiveNoticeService.GetCountByDate(startTime, endTime, this.ProjectId).ToString(); + // this.txtRewardMoney.Text = Convert.ToInt32(BLL.IncentiveNoticeService.GetSumMoneyByDate(startTime, endTime, this.ProjectId)).ToString(); + // this.txtPunishNum.Text = BLL.PunishNoticeService.GetCountByDate(startTime, endTime, this.ProjectId).ToString(); + // this.txtPunishMoney.Text = Convert.ToInt32(BLL.PunishNoticeService.GetSumMoneyByDate(startTime, endTime, this.ProjectId)).ToString(); + // if (mr != null) + // { + // if (mr.YearRewardNum != 0) + // { + // this.txtYearRewardNum.Text = (mr.YearRewardNum + Convert.ToInt32(this.txtRewardNum.Text.Trim())).ToString(); + // } + // else + // { + // this.txtYearRewardNum.Text = this.txtRewardNum.Text.Trim(); + // } + // if (mr.YearRewardMoney != 0) + // { + // this.txtYearRewardMoney.Text = (mr.YearRewardMoney + Convert.ToInt32(this.txtRewardMoney.Text.Trim())).ToString(); + // } + // else + // { + // this.txtYearRewardMoney.Text = this.txtRewardMoney.Text.Trim(); + // } + // if (mr.YearPunishNum != 0) + // { + // this.txtYearPunishNum.Text = (mr.YearPunishNum + Convert.ToInt32(this.txtPunishNum.Text.Trim())).ToString(); + // } + // else + // { + // this.txtYearPunishNum.Text = this.txtPunishNum.Text.Trim(); + // } + // if (mr.YearPunishMoney != 0) + // { + // this.txtYearPunishMoney.Text = (mr.YearPunishMoney + Convert.ToInt32(this.txtPunishMoney.Text.Trim())).ToString(); + // } + // else + // { + // this.txtYearPunishMoney.Text = this.txtPunishMoney.Text.Trim(); + // } + // } + // else + // { + // this.txtYearRewardNum.Text = this.txtYearRewardNum.Text.Trim(); + // this.txtYearRewardMoney.Text = this.txtRewardMoney.Text.Trim(); + // this.txtYearPunishNum.Text = this.txtPunishNum.Text.Trim(); + // this.txtYearPunishMoney.Text = this.txtPunishMoney.Text.Trim(); + // } + // } + //HSE奖励与处罚 + rewardAndPunishSortCs = BLL.RewardAndPunishSortCService.GetRewardAndPunishSortCByMontReportId(this.MonthReportId); + if (rewardAndPunishSortCs.Count>0) { - this.gvRewardSort.DataSource = rewardSorts; - this.gvRewardSort.DataBind(); + this.gvRewardSortAndPunish.DataSource = rewardAndPunishSortCs; + this.gvRewardSortAndPunish.DataBind(); } else { - GetRewardSort(); - } - //HSE处罚情况 - punishSorts = (from x in db.Manager_IncentiveSortC where x.MonthReportId == MonthReportId && x.BigType == "2" orderby x.SortIndex select x).ToList(); - if (punishSorts.Count > 0) - { - this.gvPunishSort.DataSource = punishSorts; - this.gvPunishSort.DataBind(); - } - else - { - GetPunishSort(); - } - if (monthReport.RewardNum != null) - { - this.txtRewardNum.Text = (monthReport.RewardNum ?? 0).ToString(); - this.txtYearRewardNum.Text = (monthReport.YearRewardNum ?? 0).ToString(); - this.txtRewardMoney.Text = (monthReport.RewardMoney ?? 0).ToString(); - this.txtYearRewardMoney.Text = (monthReport.YearRewardMoney ?? 0).ToString(); - this.txtPunishNum.Text = (monthReport.PunishNum ?? 0).ToString(); - this.txtYearPunishNum.Text = (monthReport.YearPunishNum ?? 0).ToString(); - this.txtPunishMoney.Text = (monthReport.PunishMoney ?? 0).ToString(); - this.txtYearPunishMoney.Text = (monthReport.YearPunishMoney ?? 0).ToString(); - } - else - { - this.txtRewardNum.Text = BLL.IncentiveNoticeService.GetCountByDate(startTime, endTime, this.ProjectId).ToString(); - this.txtRewardMoney.Text = Convert.ToInt32(BLL.IncentiveNoticeService.GetSumMoneyByDate(startTime, endTime, this.ProjectId)).ToString(); - this.txtPunishNum.Text = BLL.PunishNoticeService.GetCountByDate(startTime, endTime, this.ProjectId).ToString(); - this.txtPunishMoney.Text = Convert.ToInt32(BLL.PunishNoticeService.GetSumMoneyByDate(startTime, endTime, this.ProjectId)).ToString(); - if (mr != null) - { - if (mr.YearRewardNum != 0) - { - this.txtYearRewardNum.Text = (mr.YearRewardNum + Convert.ToInt32(this.txtRewardNum.Text.Trim())).ToString(); - } - else - { - this.txtYearRewardNum.Text = this.txtRewardNum.Text.Trim(); - } - if (mr.YearRewardMoney != 0) - { - this.txtYearRewardMoney.Text = (mr.YearRewardMoney + Convert.ToInt32(this.txtRewardMoney.Text.Trim())).ToString(); - } - else - { - this.txtYearRewardMoney.Text = this.txtRewardMoney.Text.Trim(); - } - if (mr.YearPunishNum != 0) - { - this.txtYearPunishNum.Text = (mr.YearPunishNum + Convert.ToInt32(this.txtPunishNum.Text.Trim())).ToString(); - } - else - { - this.txtYearPunishNum.Text = this.txtPunishNum.Text.Trim(); - } - if (mr.YearPunishMoney != 0) - { - this.txtYearPunishMoney.Text = (mr.YearPunishMoney + Convert.ToInt32(this.txtPunishMoney.Text.Trim())).ToString(); - } - else - { - this.txtYearPunishMoney.Text = this.txtPunishMoney.Text.Trim(); - } - } - else - { - this.txtYearRewardNum.Text = this.txtYearRewardNum.Text.Trim(); - this.txtYearRewardMoney.Text = this.txtRewardMoney.Text.Trim(); - this.txtYearPunishNum.Text = this.txtPunishNum.Text.Trim(); - this.txtYearPunishMoney.Text = this.txtPunishMoney.Text.Trim(); - } + GetRewardAndPunishSort(); } //4.10 HSE现场其他管理情况 - otherManagements = (from x in db.Manager_Month_OtherManagementC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); + otherManagements = BLL.OtherManagementCService.GetOtherManagementByMonthReportId(this.MonthReportId); if (otherManagements.Count > 0) { this.gvOtherManagement.DataSource = otherManagements; this.gvOtherManagement.DataBind(); } + //} + //else + //{ + // GetTrainSort(); + // GetCheckSort(); + // GetCheckDetailSort(); + // //会议数量 + // int meetingNum1 = BLL.WeekMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); + // int meetingNum2 = BLL.MonthMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); + // int meetingNum3 = BLL.SpecialMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); + // int meetingNum4 = BLL.AttendMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); + // this.txtMeetingNum.Text = (meetingNum1 + meetingNum2 + meetingNum3 + meetingNum4).ToString(); + // if (mr != null) + // { + // if (mr.YearMeetingNum != 0) + // { + // this.txtYearMeetingNum.Text = (mr.YearMeetingNum + Convert.ToInt32(this.txtMeetingNum.Text.Trim())).ToString(); + // } + // else + // { + // this.txtYearMeetingNum.Text = txtMeetingNum.Text.Trim(); + // } + // } + // else + // { + // this.txtYearMeetingNum.Text = txtMeetingNum.Text.Trim(); + // } + // GetMeetingSort(); + // //应急管理 + // List complexEmergencys = BLL.EmergencyListService.GetEmergencyListsByEmergencyType(BLL.Const.ComplexEmergencyName, this.ProjectId, startTime, endTime); //综合应急预案集合 + // int complexEmergencyNum = complexEmergencys.Count; + // this.txtComplexEmergencyNum.Text = complexEmergencyNum.ToString(); + // List specialEmergencys = BLL.EmergencyListService.GetOtherEmergencyListsByEmergencyType(BLL.Const.ComplexEmergencyName, this.ProjectId, startTime, endTime); //专项应急预案集合 + // int specialEmergencyNum = specialEmergencys.Count; + // this.txtSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); + // this.txtDrillRecordNum.Text = BLL.DrillRecordListService.GetCountByDate(startTime, endTime, this.ProjectId).ToString(); + // if (mr != null) + // { + // //综合应急预案 + // if (mr.YearComplexEmergencyNum != 0) + // { + // this.txtYearComplexEmergencyNum.Text = (mr.YearComplexEmergencyNum + complexEmergencyNum).ToString(); + // } + // else + // { + // this.txtYearComplexEmergencyNum.Text = complexEmergencyNum.ToString(); + // } + // //专项应急预案 + // if (mr.YearSpecialEmergencyNum != 0) + // { + // this.txtYearSpecialEmergencyNum.Text = (mr.YearSpecialEmergencyNum + specialEmergencyNum).ToString(); + // } + // else + // { + // this.txtYearSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); + // } + // //应急演练活动 + // if (mr.YearDrillRecordNum != 0) + // { + // this.txtYearDrillRecordNum.Text = (mr.YearDrillRecordNum + Convert.ToInt32(this.txtDrillRecordNum.Text.Trim())).ToString(); + // } + // else + // { + // this.txtYearDrillRecordNum.Text = this.txtDrillRecordNum.Text; + // } + // } + // else + // { + // this.txtYearComplexEmergencyNum.Text = complexEmergencyNum.ToString(); + // this.txtYearSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); + // this.txtYearDrillRecordNum.Text = this.txtDrillRecordNum.Text; + // } + // GetRewardSort(); + // GetPunishSort(); + // this.txtRewardNum.Text = BLL.IncentiveNoticeService.GetCountByDate(startTime, endTime, this.ProjectId).ToString(); + // this.txtRewardMoney.Text = Convert.ToInt32(BLL.IncentiveNoticeService.GetSumMoneyByDate(startTime, endTime, this.ProjectId)).ToString(); + // this.txtPunishNum.Text = BLL.PunishNoticeService.GetCountByDate(startTime, endTime, this.ProjectId).ToString(); + // this.txtPunishMoney.Text = Convert.ToInt32(BLL.PunishNoticeService.GetSumMoneyByDate(startTime, endTime, this.ProjectId)).ToString(); + // if (mr != null) + // { + // if (mr.YearRewardNum != 0) + // { + // this.txtYearRewardNum.Text = (mr.YearRewardNum + Convert.ToInt32(this.txtRewardNum.Text.Trim())).ToString(); + // } + // else + // { + // this.txtYearRewardNum.Text = this.txtRewardNum.Text.Trim(); + // } + // if (mr.YearRewardMoney != 0) + // { + // this.txtYearRewardMoney.Text = (mr.YearRewardMoney + Convert.ToInt32(this.txtRewardMoney.Text.Trim())).ToString(); + // } + // else + // { + // this.txtYearRewardMoney.Text = this.txtRewardMoney.Text.Trim(); + // } + // if (mr.YearPunishNum != 0) + // { + // this.txtYearPunishNum.Text = (mr.YearPunishNum + Convert.ToInt32(this.txtPunishNum.Text.Trim())).ToString(); + // } + // else + // { + // this.txtYearPunishNum.Text = this.txtPunishNum.Text.Trim(); + // } + // if (mr.YearPunishMoney != 0) + // { + // this.txtYearPunishMoney.Text = (mr.YearPunishMoney + Convert.ToInt32(this.txtPunishMoney.Text.Trim())).ToString(); + // } + // else + // { + // this.txtYearPunishMoney.Text = this.txtPunishMoney.Text.Trim(); + // } + // } + // else + // { + // this.txtYearRewardNum.Text = this.txtRewardNum.Text.Trim(); + // this.txtYearRewardMoney.Text = this.txtRewardMoney.Text.Trim(); + // this.txtYearPunishNum.Text = this.txtPunishNum.Text.Trim(); + // this.txtYearPunishMoney.Text = this.txtPunishMoney.Text.Trim(); + // } } else { - GetTrainSort(); - GetCheckSort(); - GetCheckDetailSort(); - //会议数量 - int meetingNum1 = BLL.WeekMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); - int meetingNum2 = BLL.MonthMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); - int meetingNum3 = BLL.SpecialMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); - int meetingNum4 = BLL.AttendMeetingService.GetCountByTime(startTime, endTime, this.ProjectId); - this.txtMeetingNum.Text = (meetingNum1 + meetingNum2 + meetingNum3 + meetingNum4).ToString(); - if (mr != null) - { - if (mr.YearMeetingNum != 0) - { - this.txtYearMeetingNum.Text = (mr.YearMeetingNum + Convert.ToInt32(this.txtMeetingNum.Text.Trim())).ToString(); - } - else - { - this.txtYearMeetingNum.Text = txtMeetingNum.Text.Trim(); - } - } - else - { - this.txtYearMeetingNum.Text = txtMeetingNum.Text.Trim(); - } - GetMeetingSort(); - //应急管理 - List complexEmergencys = BLL.EmergencyListService.GetEmergencyListsByEmergencyType(BLL.Const.ComplexEmergencyName, this.ProjectId, startTime, endTime); //综合应急预案集合 - int complexEmergencyNum = complexEmergencys.Count; - this.txtComplexEmergencyNum.Text = complexEmergencyNum.ToString(); - List specialEmergencys = BLL.EmergencyListService.GetOtherEmergencyListsByEmergencyType(BLL.Const.ComplexEmergencyName, this.ProjectId, startTime, endTime); //专项应急预案集合 - int specialEmergencyNum = specialEmergencys.Count; - this.txtSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); - this.txtDrillRecordNum.Text = BLL.DrillRecordListService.GetCountByDate(startTime, endTime, this.ProjectId).ToString(); - if (mr != null) - { - //综合应急预案 - if (mr.YearComplexEmergencyNum != 0) - { - this.txtYearComplexEmergencyNum.Text = (mr.YearComplexEmergencyNum + complexEmergencyNum).ToString(); - } - else - { - this.txtYearComplexEmergencyNum.Text = complexEmergencyNum.ToString(); - } - //专项应急预案 - if (mr.YearSpecialEmergencyNum != 0) - { - this.txtYearSpecialEmergencyNum.Text = (mr.YearSpecialEmergencyNum + specialEmergencyNum).ToString(); - } - else - { - this.txtYearSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); - } - //应急演练活动 - if (mr.YearDrillRecordNum != 0) - { - this.txtYearDrillRecordNum.Text = (mr.YearDrillRecordNum + Convert.ToInt32(this.txtDrillRecordNum.Text.Trim())).ToString(); - } - else - { - this.txtYearDrillRecordNum.Text = this.txtDrillRecordNum.Text; - } - } - else - { - this.txtYearComplexEmergencyNum.Text = complexEmergencyNum.ToString(); - this.txtYearSpecialEmergencyNum.Text = specialEmergencyNum.ToString(); - this.txtYearDrillRecordNum.Text = this.txtDrillRecordNum.Text; - } - GetRewardSort(); - GetPunishSort(); - this.txtRewardNum.Text = BLL.IncentiveNoticeService.GetCountByDate(startTime, endTime, this.ProjectId).ToString(); - this.txtRewardMoney.Text = Convert.ToInt32(BLL.IncentiveNoticeService.GetSumMoneyByDate(startTime, endTime, this.ProjectId)).ToString(); - this.txtPunishNum.Text = BLL.PunishNoticeService.GetCountByDate(startTime, endTime, this.ProjectId).ToString(); - this.txtPunishMoney.Text = Convert.ToInt32(BLL.PunishNoticeService.GetSumMoneyByDate(startTime, endTime, this.ProjectId)).ToString(); - if (mr != null) - { - if (mr.YearRewardNum != 0) - { - this.txtYearRewardNum.Text = (mr.YearRewardNum + Convert.ToInt32(this.txtRewardNum.Text.Trim())).ToString(); - } - else - { - this.txtYearRewardNum.Text = this.txtRewardNum.Text.Trim(); - } - if (mr.YearRewardMoney != 0) - { - this.txtYearRewardMoney.Text = (mr.YearRewardMoney + Convert.ToInt32(this.txtRewardMoney.Text.Trim())).ToString(); - } - else - { - this.txtYearRewardMoney.Text = this.txtRewardMoney.Text.Trim(); - } - if (mr.YearPunishNum != 0) - { - this.txtYearPunishNum.Text = (mr.YearPunishNum + Convert.ToInt32(this.txtPunishNum.Text.Trim())).ToString(); - } - else - { - this.txtYearPunishNum.Text = this.txtPunishNum.Text.Trim(); - } - if (mr.YearPunishMoney != 0) - { - this.txtYearPunishMoney.Text = (mr.YearPunishMoney + Convert.ToInt32(this.txtPunishMoney.Text.Trim())).ToString(); - } - else - { - this.txtYearPunishMoney.Text = this.txtPunishMoney.Text.Trim(); - } - } - else - { - this.txtYearRewardNum.Text = this.txtRewardNum.Text.Trim(); - this.txtYearRewardMoney.Text = this.txtRewardMoney.Text.Trim(); - this.txtYearPunishNum.Text = this.txtPunishNum.Text.Trim(); - this.txtYearPunishMoney.Text = this.txtPunishMoney.Text.Trim(); - } + GetTrainSort();//培训数据统计 + GetCheckSort();//现场HSE绩效数据统计 + GetRewardAndPunishSort();//HSE奖励与处罚 } } } @@ -543,62 +571,62 @@ namespace FineUIPro.Web.HSSE.Manager /// /// /// - protected void btnNewHazardSort_Click(object sender, EventArgs e) - { - jerqueSaveHazardList(); - Model.Manager_HazardSortC hazardSort = new Model.Manager_HazardSortC - { - HazardSortId = SQLHelper.GetNewID(typeof(Model.Manager_HazardSortC)) - }; - hazardSorts.Add(hazardSort); - this.gvHazardSort.DataSource = hazardSorts; - this.gvHazardSort.DataBind(); - } + //protected void btnNewHazardSort_Click(object sender, EventArgs e) + //{ + // jerqueSaveHazardList(); + // Model.Manager_HazardSortC hazardSort = new Model.Manager_HazardSortC + // { + // HazardSortId = SQLHelper.GetNewID(typeof(Model.Manager_HazardSortC)) + // }; + // hazardSorts.Add(hazardSort); + // this.gvHazardSort.DataSource = hazardSorts; + // this.gvHazardSort.DataBind(); + //} /// /// 检查并保存危险源集合 /// - private void jerqueSaveHazardList() - { - hazardSorts.Clear(); - JArray mergedData = gvHazardSort.GetMergedData(); - foreach (JObject mergedRow in mergedData) - { - string status = mergedRow.Value("status"); - JObject values = mergedRow.Value("values"); - int i = mergedRow.Value("index"); - Model.Manager_HazardSortC hazardSort = new Model.Manager_HazardSortC - { - HazardSortId = this.gvHazardSort.Rows[i].DataKeys[0].ToString(), - SortIndex = i, - HazardName = values.Value("HazardName").ToString(), - UnitAndArea = values.Value("UnitAndArea").ToString(), - StationDef = values.Value("StationDef").ToString(), - HandleWay = values.Value("HandleWay").ToString() - }; - hazardSorts.Add(hazardSort); - } - } + //private void jerqueSaveHazardList() + //{ + // hazardSorts.Clear(); + // JArray mergedData = gvHazardSort.GetMergedData(); + // foreach (JObject mergedRow in mergedData) + // { + // string status = mergedRow.Value("status"); + // JObject values = mergedRow.Value("values"); + // int i = mergedRow.Value("index"); + // Model.Manager_HazardSortC hazardSort = new Model.Manager_HazardSortC + // { + // HazardSortId = this.gvHazardSort.Rows[i].DataKeys[0].ToString(), + // SortIndex = i, + // HazardName = values.Value("HazardName").ToString(), + // UnitAndArea = values.Value("UnitAndArea").ToString(), + // StationDef = values.Value("StationDef").ToString(), + // HandleWay = values.Value("HandleWay").ToString() + // }; + // hazardSorts.Add(hazardSort); + // } + //} - protected void gvHazardSort_RowCommand(object sender, GridCommandEventArgs e) - { - jerqueSaveHazardList(); - string rowID = this.gvHazardSort.DataKeys[e.RowIndex][0].ToString(); - if (e.CommandName == "Delete") - { - foreach (var item in hazardSorts) - { - if (item.HazardSortId == rowID) - { - hazardSorts.Remove(item); - break; - } - } - gvHazardSort.DataSource = hazardSorts; - gvHazardSort.DataBind(); - ShowNotify("删除数据成功!", MessageBoxIcon.Success); - } - } + //protected void gvHazardSort_RowCommand(object sender, GridCommandEventArgs e) + //{ + // jerqueSaveHazardList(); + // string rowID = this.gvHazardSort.DataKeys[e.RowIndex][0].ToString(); + // if (e.CommandName == "Delete") + // { + // foreach (var item in hazardSorts) + // { + // if (item.HazardSortId == rowID) + // { + // hazardSorts.Remove(item); + // break; + // } + // } + // gvHazardSort.DataSource = hazardSorts; + // gvHazardSort.DataBind(); + // ShowNotify("删除数据成功!", MessageBoxIcon.Success); + // } + //} #endregion #region HSE培训 @@ -621,8 +649,9 @@ namespace FineUIPro.Web.HSSE.Manager Model.Base_TrainType trainType = BLL.TrainTypeService.GetTrainTypeById(t.TrainTypeId); if (trainType != null) { - trainSort.TrainContent = trainType.TrainTypeName; + trainSort.TrainType = trainType.TrainTypeName; } + trainSort.TrainContent = t.TrainContent; trainSort.TeachHour = t.TeachHour; trainSort.TeachMan = t.TeachMan; List unitIds = t.UnitIds.Split(',').ToList(); @@ -643,6 +672,9 @@ namespace FineUIPro.Web.HSSE.Manager } } trainSort.PersonNum = BLL.EduTrain_TrainRecordDetailService.GetTrainRecordDetailByTrainingId(t.TrainingId).Count(); + DateTime startTime = Convert.ToDateTime(DateTime.Now.ToString()).AddDays(1 - DateTime.Now.Day);//本月第一天 + DateTime endTime = Convert.ToDateTime(DateTime.Now.ToString()).AddDays(1 - DateTime.Now.Day).AddMonths(1).AddDays(-1); + trainSort.TotalPersonNum = BLL.EduTrain_TrainRecordService.GetTrainPersonCount(startTime, endTime, ProjectId); trainSorts.Add(trainSort); i++; } @@ -650,23 +682,23 @@ namespace FineUIPro.Web.HSSE.Manager this.gvTrainSort.DataSource = trainSorts; this.gvTrainSort.DataBind(); } - + /// /// 增加HSE培训 /// /// /// - protected void btnNewTrainSort_Click(object sender, EventArgs e) - { - jerqueSaveTrainList(); - Model.Manager_TrainSortC trainSort = new Model.Manager_TrainSortC - { - TrainSortId = SQLHelper.GetNewID(typeof(Model.Manager_TrainSortC)) - }; - trainSorts.Add(trainSort); - this.gvTrainSort.DataSource = trainSorts; - this.gvTrainSort.DataBind(); - } + //protected void btnNewTrainSort_Click(object sender, EventArgs e) + //{ + // jerqueSaveTrainList(); + // Model.Manager_TrainSortC trainSort = new Model.Manager_TrainSortC + // { + // TrainSortId = SQLHelper.GetNewID(typeof(Model.Manager_TrainSortC)) + // }; + // trainSorts.Add(trainSort); + // this.gvTrainSort.DataSource = trainSorts; + // this.gvTrainSort.DataBind(); + //} /// /// 检查并保存HSE培训集合 @@ -684,11 +716,13 @@ namespace FineUIPro.Web.HSSE.Manager { TrainSortId = this.gvTrainSort.Rows[i].DataKeys[0].ToString(), SortIndex = i, - TrainContent = values.Value("TrainContent").ToString(), + TrainType= values.Value("TrainType").ToString(), + //TrainContent = values.Value("TrainContent").ToString(), TeachHour = Funs.GetNewDecimalOrZero(values.Value("TeachHour").ToString()), - TeachMan = values.Value("TeachMan").ToString(), + //TeachMan = values.Value("TeachMan").ToString(), UnitName = values.Value("UnitName").ToString(), - PersonNum = Funs.GetNewIntOrZero(values.Value("PersonNum").ToString()) + PersonNum = Funs.GetNewIntOrZero(values.Value("PersonNum").ToString()), + TotalPersonNum = Funs.GetNewIntOrZero(values.Value("TotalPersonNum").ToString()) }; trainSorts.Add(trainSort); } @@ -696,22 +730,22 @@ namespace FineUIPro.Web.HSSE.Manager protected void gvTrainSort_RowCommand(object sender, GridCommandEventArgs e) { - jerqueSaveTrainList(); - string rowID = this.gvTrainSort.DataKeys[e.RowIndex][0].ToString(); - if (e.CommandName == "Delete") - { - foreach (var item in trainSorts) - { - if (item.TrainSortId == rowID) - { - trainSorts.Remove(item); - break; - } - } - gvTrainSort.DataSource = trainSorts; - gvTrainSort.DataBind(); - ShowNotify("删除数据成功!", MessageBoxIcon.Success); - } + //jerqueSaveTrainList(); + //string rowID = this.gvTrainSort.DataKeys[e.RowIndex][0].ToString(); + //if (e.CommandName == "Delete") + //{ + // foreach (var item in trainSorts) + // { + // if (item.TrainSortId == rowID) + // { + // trainSorts.Remove(item); + // break; + // } + // } + // gvTrainSort.DataSource = trainSorts; + // gvTrainSort.DataBind(); + // ShowNotify("删除数据成功!", MessageBoxIcon.Success); + //} } /// @@ -719,61 +753,61 @@ namespace FineUIPro.Web.HSSE.Manager /// /// /// - protected void btnNewTrainActivitySort_Click(object sender, EventArgs e) - { - jerqueSaveTrainActivityList(); - Model.Manager_TrainActivitySortC trainActivitySort = new Model.Manager_TrainActivitySortC - { - TrainActivitySortId = SQLHelper.GetNewID(typeof(Model.Manager_TrainActivitySortC)) - }; - trainActivitySorts.Add(trainActivitySort); - this.gvTrainActivitySort.DataSource = trainActivitySorts; - this.gvTrainActivitySort.DataBind(); - } + //protected void btnNewTrainActivitySort_Click(object sender, EventArgs e) + //{ + // jerqueSaveTrainActivityList(); + // Model.Manager_TrainActivitySortC trainActivitySort = new Model.Manager_TrainActivitySortC + // { + // TrainActivitySortId = SQLHelper.GetNewID(typeof(Model.Manager_TrainActivitySortC)) + // }; + // trainActivitySorts.Add(trainActivitySort); + // this.gvTrainActivitySort.DataSource = trainActivitySorts; + // this.gvTrainActivitySort.DataBind(); + //} /// /// 检查并保存HSE培训活动集合 /// - private void jerqueSaveTrainActivityList() - { - trainActivitySorts.Clear(); - JArray mergedData = gvTrainActivitySort.GetMergedData(); - foreach (JObject mergedRow in mergedData) - { - string status = mergedRow.Value("status"); - JObject values = mergedRow.Value("values"); - int i = mergedRow.Value("index"); - Model.Manager_TrainActivitySortC trainActivitySort = new Model.Manager_TrainActivitySortC - { - TrainActivitySortId = this.gvTrainActivitySort.Rows[i].DataKeys[0].ToString(), - SortIndex = i, - ActivityName = values.Value("ActivityName").ToString(), - TrainDate = values.Value("TrainDate").ToString(), - TrainEffect = values.Value("TrainEffect").ToString() - }; - trainActivitySorts.Add(trainActivitySort); - } - } + //private void jerqueSaveTrainActivityList() + //{ + // trainActivitySorts.Clear(); + // JArray mergedData = gvTrainActivitySort.GetMergedData(); + // foreach (JObject mergedRow in mergedData) + // { + // string status = mergedRow.Value("status"); + // JObject values = mergedRow.Value("values"); + // int i = mergedRow.Value("index"); + // Model.Manager_TrainActivitySortC trainActivitySort = new Model.Manager_TrainActivitySortC + // { + // TrainActivitySortId = this.gvTrainActivitySort.Rows[i].DataKeys[0].ToString(), + // SortIndex = i, + // ActivityName = values.Value("ActivityName").ToString(), + // TrainDate = values.Value("TrainDate").ToString(), + // TrainEffect = values.Value("TrainEffect").ToString() + // }; + // trainActivitySorts.Add(trainActivitySort); + // } + //} - protected void gvTrainActivitySort_RowCommand(object sender, GridCommandEventArgs e) - { - jerqueSaveTrainActivityList(); - string rowID = this.gvTrainActivitySort.DataKeys[e.RowIndex][0].ToString(); - if (e.CommandName == "Delete") - { - foreach (var item in trainActivitySorts) - { - if (item.TrainActivitySortId == rowID) - { - trainActivitySorts.Remove(item); - break; - } - } - gvTrainActivitySort.DataSource = trainActivitySorts; - gvTrainActivitySort.DataBind(); - ShowNotify("删除数据成功!", MessageBoxIcon.Success); - } - } + //protected void gvTrainActivitySort_RowCommand(object sender, GridCommandEventArgs e) + //{ + // jerqueSaveTrainActivityList(); + // string rowID = this.gvTrainActivitySort.DataKeys[e.RowIndex][0].ToString(); + // if (e.CommandName == "Delete") + // { + // foreach (var item in trainActivitySorts) + // { + // if (item.TrainActivitySortId == rowID) + // { + // trainActivitySorts.Remove(item); + // break; + // } + // } + // gvTrainActivitySort.DataSource = trainActivitySorts; + // gvTrainActivitySort.DataBind(); + // ShowNotify("删除数据成功!", MessageBoxIcon.Success); + // } + //} #endregion #region HSE检查 @@ -783,7 +817,59 @@ namespace FineUIPro.Web.HSSE.Manager private void GetCheckSort() { int i = 0; + + #region HSE会议 本月开展次数 + int safetyLeaderGroup = BLL.SafetyLeaderGroupMeetingService.GetCountByTime(startTime, endTime, this.ProjectId);//安全领导小组会议 + int weekMeeting = BLL.WeekMeetingService.GetCountByTime(startTime, endTime, this.ProjectId);//周例会 + int monthMeeting = BLL.MonthMeetingService.GetCountByTime(startTime, endTime, this.ProjectId);//月例会 + int specialMeeting = BLL.SpecialMeetingService.GetCountByTime(startTime, endTime, this.ProjectId);//专题例会 + int attendMeeting = BLL.AttendMeetingService.GetCountByTime(startTime, endTime, this.ProjectId);//其他会议 + int classMeeting = BLL.ClassMeetingService.GetCountByTime(startTime, endTime, this.ProjectId);//班前会 + #endregion + #region HSE会议 年度累计次数 + int yearSafetyLeaderGroup = BLL.SafetyLeaderGroupMeetingService.GetCountByTime(yearStartTime, endTime, this.ProjectId);//安全领导小组会议 + int yearWeekMeeting = BLL.WeekMeetingService.GetCountByTime(yearStartTime, endTime, this.ProjectId);//周例会 + int yearMonthMeeting = BLL.MonthMeetingService.GetCountByTime(yearStartTime, endTime, this.ProjectId);//月例会 + int yearSpecialMeeting = BLL.SpecialMeetingService.GetCountByTime(yearStartTime, endTime, this.ProjectId);//专题例会 + int yearAttendMeeting = BLL.AttendMeetingService.GetCountByTime(yearStartTime, endTime, this.ProjectId);//其他会议 + int yearClassMeeting = BLL.ClassMeetingService.GetCountByTime(yearStartTime, endTime, this.ProjectId);//班前会 + #endregion + #region HSE会议 项目总累计数 + int projectSafetyLeaderGroup = BLL.SafetyLeaderGroupMeetingService.GetCountByTime(projectStartTime, endTime, this.ProjectId);//安全领导小组会议 + int projectWeekMeeting = BLL.WeekMeetingService.GetCountByTime(projectStartTime, endTime, this.ProjectId);//周例会 + int projectMonthMeeting = BLL.MonthMeetingService.GetCountByTime(projectStartTime, endTime, this.ProjectId);//月例会 + int projectSpecialMeeting = BLL.SpecialMeetingService.GetCountByTime(projectStartTime, endTime, this.ProjectId);//专题例会 + int projectAttendMeeting = BLL.AttendMeetingService.GetCountByTime(projectStartTime, endTime, this.ProjectId);//其他会议 + int projectClassMeeting = BLL.ClassMeetingService.GetCountByTime(projectStartTime, endTime, this.ProjectId);//班前会 + #endregion + Model.Manager_CheckSortC checkSort1 = new Model.Manager_CheckSortC + { + CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)), + SortIndex = i, + CheckType = "HSE会议", + CheckNumber = safetyLeaderGroup + weekMeeting + monthMeeting + specialMeeting + attendMeeting + classMeeting, + YearCheckNum = yearSafetyLeaderGroup + yearWeekMeeting + yearMonthMeeting + yearSpecialMeeting + yearSpecialMeeting + yearAttendMeeting + yearClassMeeting, + TotalCheckNum = projectSafetyLeaderGroup + projectWeekMeeting + projectMonthMeeting + projectSpecialMeeting + projectSpecialMeeting + projectAttendMeeting + projectClassMeeting, + ViolationNumber = null, + YearViolationNum = null + }; + checkSorts.Add(checkSort1); + i++; + Model.Manager_CheckSortC checkSort2 = new Model.Manager_CheckSortC + { + CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)), + SortIndex = i, + CheckType = "开工前HSE检查", + CheckNumber = BLL.Check_CheckWorkService.GetCountByCheckTime(startTime, endTime, this.ProjectId), + YearCheckNum = BLL.Check_CheckWorkService.GetCountByCheckTime(yearStartTime, endTime, this.ProjectId), + TotalCheckNum = BLL.Check_CheckWorkService.GetCountByCheckTime(projectStartTime, endTime, this.ProjectId), + ViolationNumber = BLL.Check_CheckWorkService.GetIsOKViolationCountByCheckTime(startTime, endTime, this.ProjectId), + YearViolationNum = BLL.Check_CheckWorkService.GetIsOKViolationCountByCheckTime(yearStartTime, endTime, this.ProjectId) + }; + checkSorts.Add(checkSort2); + i++; + Model.Manager_CheckSortC checkSort3 = new Model.Manager_CheckSortC { CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)), SortIndex = i, @@ -794,22 +880,10 @@ namespace FineUIPro.Web.HSSE.Manager ViolationNumber = BLL.Check_CheckDayService.GetIsOKViolationCountByCheckTime(startTime, endTime, this.ProjectId), YearViolationNum = BLL.Check_CheckDayService.GetIsOKViolationCountByCheckTime(yearStartTime, endTime, this.ProjectId) }; - checkSorts.Add(checkSort1); + checkSorts.Add(checkSort3); i++; - Model.Manager_CheckSortC checkSort2 = new Model.Manager_CheckSortC - { - CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)), - SortIndex = i, - CheckType = "联合检查", - CheckNumber = BLL.Check_CheckColligationService.GetCountByCheckTime(startTime, endTime, this.ProjectId), - YearCheckNum = BLL.Check_CheckColligationService.GetCountByCheckTime(yearStartTime, endTime, this.ProjectId), - TotalCheckNum = BLL.Check_CheckColligationService.GetCountByCheckTime(projectStartTime, endTime, this.ProjectId), - ViolationNumber = BLL.Check_CheckColligationService.GetIsOKViolationCountByCheckTime(startTime, endTime, this.ProjectId), - YearViolationNum = BLL.Check_CheckColligationService.GetIsOKViolationCountByCheckTime(yearStartTime, endTime, this.ProjectId) - }; - checkSorts.Add(checkSort2); - i++; - Model.Manager_CheckSortC checkSort3 = new Model.Manager_CheckSortC + + Model.Manager_CheckSortC checkSort4 = new Model.Manager_CheckSortC { CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)), SortIndex = i, @@ -820,26 +894,13 @@ namespace FineUIPro.Web.HSSE.Manager ViolationNumber = BLL.Check_CheckSpecialService.GetIsOKViolationCountByCheckTime(startTime, endTime, this.ProjectId), YearViolationNum = BLL.Check_CheckSpecialService.GetIsOKViolationCountByCheckTime(yearStartTime, endTime, this.ProjectId) }; - checkSorts.Add(checkSort3); - i++; - Model.Manager_CheckSortC checkSort4 = new Model.Manager_CheckSortC - { - CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)), - SortIndex = i, - CheckType = "开工前检查", - CheckNumber = BLL.Check_CheckWorkService.GetCountByCheckTime(startTime, endTime, this.ProjectId), - YearCheckNum = BLL.Check_CheckWorkService.GetCountByCheckTime(yearStartTime, endTime, this.ProjectId), - TotalCheckNum = BLL.Check_CheckWorkService.GetCountByCheckTime(projectStartTime, endTime, this.ProjectId), - ViolationNumber = BLL.Check_CheckWorkService.GetIsOKViolationCountByCheckTime(startTime, endTime, this.ProjectId), - YearViolationNum = BLL.Check_CheckWorkService.GetIsOKViolationCountByCheckTime(yearStartTime, endTime, this.ProjectId) - }; checkSorts.Add(checkSort4); i++; Model.Manager_CheckSortC checkSort5 = new Model.Manager_CheckSortC { CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)), SortIndex = i, - CheckType = "季节性/节假日检查", + CheckType = "节假日前安全检查", CheckNumber = BLL.Check_CheckHolidayService.GetCountByCheckTime(startTime, endTime, this.ProjectId), YearCheckNum = BLL.Check_CheckHolidayService.GetCountByCheckTime(yearStartTime, endTime, this.ProjectId), TotalCheckNum = BLL.Check_CheckHolidayService.GetCountByCheckTime(projectStartTime, endTime, this.ProjectId), @@ -847,6 +908,100 @@ namespace FineUIPro.Web.HSSE.Manager YearViolationNum = BLL.Check_CheckHolidayService.GetIsOKViolationCountByCheckTime(yearStartTime, endTime, this.ProjectId) }; checkSorts.Add(checkSort5); + i++; + + Model.Manager_CheckSortC checkSort6 = new Model.Manager_CheckSortC + { + CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)), + SortIndex = i, + CheckType = "文明施工检查", + CheckNumber = null, + YearCheckNum = null, + TotalCheckNum = null, + ViolationNumber = null, + YearViolationNum = null + }; + checkSorts.Add(checkSort6); + i++; + Model.Manager_CheckSortC checkSort7 = new Model.Manager_CheckSortC + { + CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)), + SortIndex = i, + CheckType = "联合检查", + CheckNumber = BLL.Check_CheckColligationService.GetCountByCheckTime(startTime, endTime, this.ProjectId), + YearCheckNum = BLL.Check_CheckColligationService.GetCountByCheckTime(yearStartTime, endTime, this.ProjectId), + TotalCheckNum = BLL.Check_CheckColligationService.GetCountByCheckTime(projectStartTime, endTime, this.ProjectId), + ViolationNumber = BLL.Check_CheckColligationService.GetIsOKViolationCountByCheckTime(startTime, endTime, this.ProjectId), + YearViolationNum = BLL.Check_CheckColligationService.GetIsOKViolationCountByCheckTime(yearStartTime, endTime, this.ProjectId) + }; + checkSorts.Add(checkSort7); + i++; + Model.Manager_CheckSortC checkSort8 = new Model.Manager_CheckSortC + { + CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)), + SortIndex = i, + CheckType = "综合应急预案发布", + CheckNumber = null, + YearCheckNum = null, + TotalCheckNum = null, + ViolationNumber = null, + YearViolationNum = null, + }; + checkSorts.Add(checkSort8); + i++; + Model.Manager_CheckSortC checkSort9 = new Model.Manager_CheckSortC + { + CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)), + SortIndex = i, + CheckType = "专项应急预案发布", + CheckNumber = null, + YearCheckNum = null, + TotalCheckNum = null, + ViolationNumber = null, + YearViolationNum = null, + }; + checkSorts.Add(checkSort9); + i++; + Model.Manager_CheckSortC checkSort10 = new Model.Manager_CheckSortC + { + CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)), + SortIndex = i, + CheckType = "应急演练活动次数", + CheckNumber = BLL.DrillRecordListService.GetCountByDate(startTime,endTime,this.ProjectId), + YearCheckNum = BLL.DrillRecordListService.GetCountByDate(yearStartTime, endTime, this.ProjectId), + TotalCheckNum = BLL.DrillRecordListService.GetCountByDate(projectStartTime, endTime, this.ProjectId), + ViolationNumber = null, + YearViolationNum = null, + }; + checkSorts.Add(checkSort10); + i++; + Model.Manager_CheckSortC checkSort11 = new Model.Manager_CheckSortC + { + CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)), + SortIndex = i, + CheckType = "HSE管理文件/方案发布", + CheckNumber = BLL.ConstructSolutionService.GetConstructSolutionCountByDate(this.ProjectId,startTime,endTime), + YearCheckNum = BLL.ConstructSolutionService.GetConstructSolutionCountByDate(this.ProjectId, yearStartTime, endTime), + TotalCheckNum = BLL.ConstructSolutionService.GetConstructSolutionCountByDate(this.ProjectId, projectStartTime, endTime), + ViolationNumber = null, + YearViolationNum = null, + }; + checkSorts.Add(checkSort11); + i++; + + Model.Manager_CheckSortC checkSort12 = new Model.Manager_CheckSortC + { + CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)), + SortIndex = i, + CheckType = "作业许可证", + CheckNumber = BLL.LicenseManagerService.GetCountByDate(startTime,endTime,this.ProjectId), + YearCheckNum = BLL.LicenseManagerService.GetCountByDate(yearStartTime, endTime, this.ProjectId), + TotalCheckNum = BLL.LicenseManagerService.GetCountByDate(projectStartTime, endTime, this.ProjectId), + ViolationNumber = null, + YearViolationNum = null, + }; + checkSorts.Add(checkSort12); + this.gvCheckSort.DataSource = checkSorts; this.gvCheckSort.DataBind(); } @@ -885,11 +1040,11 @@ namespace FineUIPro.Web.HSSE.Manager CheckSortId = this.gvCheckSort.Rows[i].DataKeys[0].ToString(), SortIndex = i, CheckType = values.Value("CheckType").ToString(), - CheckNumber = Funs.GetNewIntOrZero(values.Value("CheckNumber").ToString()), - YearCheckNum = Funs.GetNewIntOrZero(values.Value("YearCheckNum").ToString()), - TotalCheckNum = Funs.GetNewIntOrZero(values.Value("TotalCheckNum").ToString()), - ViolationNumber = Funs.GetNewIntOrZero(values.Value("ViolationNumber").ToString()), - YearViolationNum = Funs.GetNewIntOrZero(values.Value("YearViolationNum").ToString()) + CheckNumber = Funs.GetNewInt(values.Value("CheckNumber").ToString()), + YearCheckNum = Funs.GetNewInt(values.Value("YearCheckNum").ToString()), + TotalCheckNum = Funs.GetNewInt(values.Value("TotalCheckNum").ToString()), + ViolationNumber = Funs.GetNewInt(values.Value("ViolationNumber").ToString()), + YearViolationNum = Funs.GetNewInt(values.Value("YearViolationNum").ToString()) }; checkSorts.Add(checkSort); } @@ -918,538 +1073,581 @@ namespace FineUIPro.Web.HSSE.Manager /// /// 显示月报告HSE检查明细情况 /// - private void GetCheckDetailSort() - { - int i = 0; - Model.Manager_CheckDetailSortC checkDetailSort1 = new Model.Manager_CheckDetailSortC - { - CheckDetailSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckDetailSortC)), - SortIndex = i, - CheckType = "日巡检" - }; - checkDetailSorts.Add(checkDetailSort1); - i++; - Model.Manager_CheckDetailSortC checkDetailSort2 = new Model.Manager_CheckDetailSortC - { - CheckDetailSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckDetailSortC)), - SortIndex = i, - CheckType = "周检/月检" - }; - checkDetailSorts.Add(checkDetailSort2); - i++; - List checkSpecials = BLL.Check_CheckSpecialService.GetListByCheckTime(startTime, endTime, this.ProjectId); - if (checkSpecials.Count > 0) - { - foreach (Model.Check_CheckSpecial checkSpecial in checkSpecials) - { - Model.Manager_CheckDetailSortC checkDetailSort = new Model.Manager_CheckDetailSortC - { - CheckDetailSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckDetailSortC)), - SortIndex = i - }; - List details = BLL.Check_CheckSpecialDetailService.GetCheckSpecialDetailByCheckSpecialId(checkSpecial.CheckSpecialId); - string str = string.Empty; - string checkStation = string.Empty; - if (details.Count > 0) - { - foreach (Model.Check_CheckSpecialDetail detail in details) - { - str += BLL.Check_ProjectCheckItemSetService.ConvertCheckItemType(detail.CheckItem) + ","; - checkStation += "隐患：" + detail.Unqualified + ";整改：" + detail.Suggestions + "。"; - } - } - if (!string.IsNullOrEmpty(str)) - { - str = str.Substring(0, str.LastIndexOf(',')); - } - checkDetailSort.CheckType = "专项检查(" + str + ")"; - if (checkSpecial.CheckTime != null) - { - checkDetailSort.CheckTime = string.Format("{0:yyyy-MM-dd}", checkSpecial.CheckTime); - } - string unitNames = string.Empty; - if (!string.IsNullOrEmpty(checkSpecial.PartInUnits)) - { - string[] strs = checkSpecial.PartInUnits.Split(','); - foreach (var item in strs) - { - Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(item); - if (unit != null) - { - unitNames += unit.UnitName + ","; - } - } - if (!string.IsNullOrEmpty(unitNames)) - { - unitNames = unitNames.Substring(0, unitNames.LastIndexOf(",")); - } - } - checkDetailSort.JoinUnit = unitNames; - checkDetailSort.StateDef = checkStation; - checkDetailSorts.Add(checkDetailSort); - i++; - } - } - this.gvCheckDetailSort.DataSource = checkDetailSorts; - this.gvCheckDetailSort.DataBind(); - } + //private void GetCheckDetailSort() + //{ + // int i = 0; + // Model.Manager_CheckDetailSortC checkDetailSort1 = new Model.Manager_CheckDetailSortC + // { + // CheckDetailSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckDetailSortC)), + // SortIndex = i, + // CheckType = "日巡检" + // }; + // checkDetailSorts.Add(checkDetailSort1); + // i++; + // Model.Manager_CheckDetailSortC checkDetailSort2 = new Model.Manager_CheckDetailSortC + // { + // CheckDetailSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckDetailSortC)), + // SortIndex = i, + // CheckType = "周检/月检" + // }; + // checkDetailSorts.Add(checkDetailSort2); + // i++; + // List checkSpecials = BLL.Check_CheckSpecialService.GetListByCheckTime(startTime, endTime, this.ProjectId); + // if (checkSpecials.Count > 0) + // { + // foreach (Model.Check_CheckSpecial checkSpecial in checkSpecials) + // { + // Model.Manager_CheckDetailSortC checkDetailSort = new Model.Manager_CheckDetailSortC + // { + // CheckDetailSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckDetailSortC)), + // SortIndex = i + // }; + // List details = BLL.Check_CheckSpecialDetailService.GetCheckSpecialDetailByCheckSpecialId(checkSpecial.CheckSpecialId); + // string str = string.Empty; + // string checkStation = string.Empty; + // if (details.Count > 0) + // { + // foreach (Model.Check_CheckSpecialDetail detail in details) + // { + // str += BLL.Check_ProjectCheckItemSetService.ConvertCheckItemType(detail.CheckItem) + ","; + // checkStation += "隐患：" + detail.Unqualified + ";整改：" + detail.Suggestions + "。"; + // } + // } + // if (!string.IsNullOrEmpty(str)) + // { + // str = str.Substring(0, str.LastIndexOf(',')); + // } + // checkDetailSort.CheckType = "专项检查(" + str + ")"; + // if (checkSpecial.CheckTime != null) + // { + // checkDetailSort.CheckTime = string.Format("{0:yyyy-MM-dd}", checkSpecial.CheckTime); + // } + // string unitNames = string.Empty; + // if (!string.IsNullOrEmpty(checkSpecial.PartInUnits)) + // { + // string[] strs = checkSpecial.PartInUnits.Split(','); + // foreach (var item in strs) + // { + // Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(item); + // if (unit != null) + // { + // unitNames += unit.UnitName + ","; + // } + // } + // if (!string.IsNullOrEmpty(unitNames)) + // { + // unitNames = unitNames.Substring(0, unitNames.LastIndexOf(",")); + // } + // } + // checkDetailSort.JoinUnit = unitNames; + // checkDetailSort.StateDef = checkStation; + // checkDetailSorts.Add(checkDetailSort); + // i++; + // } + // } + // this.gvCheckDetailSort.DataSource = checkDetailSorts; + // this.gvCheckDetailSort.DataBind(); + //} /// /// 增加HSE检查 /// /// /// - protected void btnNewCheckDetailSort_Click(object sender, EventArgs e) - { - jerqueSaveCheckDetailList(); - Model.Manager_CheckDetailSortC checkDetailSort = new Model.Manager_CheckDetailSortC - { - CheckDetailSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckDetailSortC)) - }; - checkDetailSorts.Add(checkDetailSort); - this.gvCheckDetailSort.DataSource = checkDetailSorts; - this.gvCheckDetailSort.DataBind(); - } + //protected void btnNewCheckDetailSort_Click(object sender, EventArgs e) + //{ + // jerqueSaveCheckDetailList(); + // Model.Manager_CheckDetailSortC checkDetailSort = new Model.Manager_CheckDetailSortC + // { + // CheckDetailSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckDetailSortC)) + // }; + // checkDetailSorts.Add(checkDetailSort); + // this.gvCheckDetailSort.DataSource = checkDetailSorts; + // this.gvCheckDetailSort.DataBind(); + //} /// /// 检查并保存HSE检查集合 /// - private void jerqueSaveCheckDetailList() - { - checkDetailSorts.Clear(); - JArray mergedData = gvCheckDetailSort.GetMergedData(); - foreach (JObject mergedRow in mergedData) - { - string status = mergedRow.Value("status"); - JObject values = mergedRow.Value("values"); - int i = mergedRow.Value("index"); - Model.Manager_CheckDetailSortC checkDetailSort = new Model.Manager_CheckDetailSortC - { - CheckDetailSortId = this.gvCheckDetailSort.Rows[i].DataKeys[0].ToString(), - SortIndex = i, - CheckType = values.Value("CheckType").ToString(), - CheckTime = values.Value("CheckTime").ToString(), - JoinUnit = values.Value("JoinUnit").ToString(), - StateDef = values.Value("StateDef").ToString() - }; - checkDetailSorts.Add(checkDetailSort); - } - } + //private void jerqueSaveCheckDetailList() + //{ + // checkDetailSorts.Clear(); + // JArray mergedData = gvCheckDetailSort.GetMergedData(); + // foreach (JObject mergedRow in mergedData) + // { + // string status = mergedRow.Value("status"); + // JObject values = mergedRow.Value("values"); + // int i = mergedRow.Value("index"); + // Model.Manager_CheckDetailSortC checkDetailSort = new Model.Manager_CheckDetailSortC + // { + // CheckDetailSortId = this.gvCheckDetailSort.Rows[i].DataKeys[0].ToString(), + // SortIndex = i, + // CheckType = values.Value("CheckType").ToString(), + // CheckTime = values.Value("CheckTime").ToString(), + // JoinUnit = values.Value("JoinUnit").ToString(), + // StateDef = values.Value("StateDef").ToString() + // }; + // checkDetailSorts.Add(checkDetailSort); + // } + //} - protected void gvCheckDetailSort_RowCommand(object sender, GridCommandEventArgs e) - { - jerqueSaveCheckDetailList(); - string rowID = this.gvCheckDetailSort.DataKeys[e.RowIndex][0].ToString(); - if (e.CommandName == "Delete") - { - foreach (var item in checkDetailSorts) - { - if (item.CheckDetailSortId == rowID) - { - checkDetailSorts.Remove(item); - break; - } - } - gvCheckDetailSort.DataSource = checkDetailSorts; - gvCheckDetailSort.DataBind(); - ShowNotify("删除数据成功!", MessageBoxIcon.Success); - } - } + //protected void gvCheckDetailSort_RowCommand(object sender, GridCommandEventArgs e) + //{ + // jerqueSaveCheckDetailList(); + // string rowID = this.gvCheckDetailSort.DataKeys[e.RowIndex][0].ToString(); + // if (e.CommandName == "Delete") + // { + // foreach (var item in checkDetailSorts) + // { + // if (item.CheckDetailSortId == rowID) + // { + // checkDetailSorts.Remove(item); + // break; + // } + // } + // gvCheckDetailSort.DataSource = checkDetailSorts; + // gvCheckDetailSort.DataBind(); + // ShowNotify("删除数据成功!", MessageBoxIcon.Success); + // } + //} #endregion #region HSE会议 /// /// 显示月报告HSE会议情况 /// - private void GetMeetingSort() - { - int i = 0; - List weekMeetings = BLL.WeekMeetingService.GetMeetingListsByDate(startTime, endTime, this.ProjectId); - if (weekMeetings.Count > 0) - { - Model.Manager_MeetingSortC meetingSort = new Model.Manager_MeetingSortC - { - MeetingSortId = SQLHelper.GetNewID(typeof(Model.Manager_MeetingSortC)), - SortIndex = i, - MeetingType = "HSE周例会", - MeetingHours = weekMeetings.First().MeetingHours, - MeetingHostMan = weekMeetings.First().MeetingHostMan - }; - string date = string.Empty; - foreach (Model.Meeting_WeekMeeting m in weekMeetings) - { - if (m.WeekMeetingDate != null) - { - DateTime d = Convert.ToDateTime(m.WeekMeetingDate); - date += d.Month + "." + d.Day + "/"; - } - } - if (!string.IsNullOrEmpty(date)) - { - date = date.Substring(0, date.LastIndexOf('/')); - } - meetingSort.MeetingDate = date; - meetingSort.AttentPerson = weekMeetings.First().AttentPerson; - meetingSorts.Add(meetingSort); - } - i++; - List monthMeetings = BLL.MonthMeetingService.GetMeetingListsByDate(startTime, endTime, this.ProjectId); - if (monthMeetings.Count > 0) - { - Model.Manager_MeetingSortC meetingSort = new Model.Manager_MeetingSortC - { - MeetingSortId = SQLHelper.GetNewID(typeof(Model.Manager_MeetingSortC)), - SortIndex = i, - MeetingType = "HSE月例会", - MeetingHours = monthMeetings.First().MeetingHours, - MeetingHostMan = monthMeetings.First().MeetingHostMan - }; - string date = string.Empty; - if (monthMeetings.First().MonthMeetingDate != null) - { - DateTime d = Convert.ToDateTime(monthMeetings.First().MonthMeetingDate); - date += d.Month + "." + d.Day; - } - meetingSort.MeetingDate = date; - meetingSort.AttentPerson = monthMeetings.First().AttentPerson; - meetingSorts.Add(meetingSort); - } - i++; - List specialMeetings = BLL.SpecialMeetingService.GetMeetingListsByDate(startTime, endTime, this.ProjectId); - if (specialMeetings.Count > 0) - { - foreach (Model.Meeting_SpecialMeeting item in specialMeetings) - { - Model.Manager_MeetingSortC meetingSort = new Model.Manager_MeetingSortC - { - MeetingSortId = SQLHelper.GetNewID(typeof(Model.Manager_MeetingSortC)), - SortIndex = i, - MeetingType = "专题会议", - MeetingHours = item.MeetingHours, - MeetingHostMan = item.MeetingHostMan - }; - string date = string.Empty; - if (item.SpecialMeetingDate != null) - { - DateTime d = Convert.ToDateTime(item.SpecialMeetingDate); - date += d.Month + "." + d.Day; - } - meetingSort.MeetingDate = date; - meetingSort.AttentPerson = item.AttentPerson; - meetingSorts.Add(meetingSort); - i++; - } - } - List attendMeetings = BLL.AttendMeetingService.GetMeetingListsByDate(startTime, endTime, this.ProjectId); - if (attendMeetings.Count > 0) - { - foreach (Model.Meeting_AttendMeeting item in attendMeetings) - { - Model.Manager_MeetingSortC meetingSort = new Model.Manager_MeetingSortC - { - MeetingSortId = SQLHelper.GetNewID(typeof(Model.Manager_MeetingSortC)), - SortIndex = i, - MeetingType = item.AttendMeetingName, - MeetingHours = item.MeetingHours, - MeetingHostMan = item.MeetingHostMan - }; - string date = string.Empty; - if (item.AttendMeetingDate != null) - { - DateTime d = Convert.ToDateTime(item.AttendMeetingDate); - date += d.Month + "." + d.Day; - } - meetingSort.MeetingDate = date; - meetingSorts.Add(meetingSort); - i++; - } - } - this.gvMeetingSort.DataSource = meetingSorts; - this.gvMeetingSort.DataBind(); - } + //private void GetMeetingSort() + //{ + // int i = 0; + // List weekMeetings = BLL.WeekMeetingService.GetMeetingListsByDate(startTime, endTime, this.ProjectId); + // if (weekMeetings.Count > 0) + // { + // Model.Manager_MeetingSortC meetingSort = new Model.Manager_MeetingSortC + // { + // MeetingSortId = SQLHelper.GetNewID(typeof(Model.Manager_MeetingSortC)), + // SortIndex = i, + // MeetingType = "HSE周例会", + // MeetingHours = weekMeetings.First().MeetingHours, + // MeetingHostMan = weekMeetings.First().MeetingHostMan + // }; + // string date = string.Empty; + // foreach (Model.Meeting_WeekMeeting m in weekMeetings) + // { + // if (m.WeekMeetingDate != null) + // { + // DateTime d = Convert.ToDateTime(m.WeekMeetingDate); + // date += d.Month + "." + d.Day + "/"; + // } + // } + // if (!string.IsNullOrEmpty(date)) + // { + // date = date.Substring(0, date.LastIndexOf('/')); + // } + // meetingSort.MeetingDate = date; + // meetingSort.AttentPerson = weekMeetings.First().AttentPerson; + // meetingSorts.Add(meetingSort); + // } + // i++; + // List monthMeetings = BLL.MonthMeetingService.GetMeetingListsByDate(startTime, endTime, this.ProjectId); + // if (monthMeetings.Count > 0) + // { + // Model.Manager_MeetingSortC meetingSort = new Model.Manager_MeetingSortC + // { + // MeetingSortId = SQLHelper.GetNewID(typeof(Model.Manager_MeetingSortC)), + // SortIndex = i, + // MeetingType = "HSE月例会", + // MeetingHours = monthMeetings.First().MeetingHours, + // MeetingHostMan = monthMeetings.First().MeetingHostMan + // }; + // string date = string.Empty; + // if (monthMeetings.First().MonthMeetingDate != null) + // { + // DateTime d = Convert.ToDateTime(monthMeetings.First().MonthMeetingDate); + // date += d.Month + "." + d.Day; + // } + // meetingSort.MeetingDate = date; + // meetingSort.AttentPerson = monthMeetings.First().AttentPerson; + // meetingSorts.Add(meetingSort); + // } + // i++; + // List specialMeetings = BLL.SpecialMeetingService.GetMeetingListsByDate(startTime, endTime, this.ProjectId); + // if (specialMeetings.Count > 0) + // { + // foreach (Model.Meeting_SpecialMeeting item in specialMeetings) + // { + // Model.Manager_MeetingSortC meetingSort = new Model.Manager_MeetingSortC + // { + // MeetingSortId = SQLHelper.GetNewID(typeof(Model.Manager_MeetingSortC)), + // SortIndex = i, + // MeetingType = "专题会议", + // MeetingHours = item.MeetingHours, + // MeetingHostMan = item.MeetingHostMan + // }; + // string date = string.Empty; + // if (item.SpecialMeetingDate != null) + // { + // DateTime d = Convert.ToDateTime(item.SpecialMeetingDate); + // date += d.Month + "." + d.Day; + // } + // meetingSort.MeetingDate = date; + // meetingSort.AttentPerson = item.AttentPerson; + // meetingSorts.Add(meetingSort); + // i++; + // } + // } + // List attendMeetings = BLL.AttendMeetingService.GetMeetingListsByDate(startTime, endTime, this.ProjectId); + // if (attendMeetings.Count > 0) + // { + // foreach (Model.Meeting_AttendMeeting item in attendMeetings) + // { + // Model.Manager_MeetingSortC meetingSort = new Model.Manager_MeetingSortC + // { + // MeetingSortId = SQLHelper.GetNewID(typeof(Model.Manager_MeetingSortC)), + // SortIndex = i, + // MeetingType = item.AttendMeetingName, + // MeetingHours = item.MeetingHours, + // MeetingHostMan = item.MeetingHostMan + // }; + // string date = string.Empty; + // if (item.AttendMeetingDate != null) + // { + // DateTime d = Convert.ToDateTime(item.AttendMeetingDate); + // date += d.Month + "." + d.Day; + // } + // meetingSort.MeetingDate = date; + // meetingSorts.Add(meetingSort); + // i++; + // } + // } + // this.gvMeetingSort.DataSource = meetingSorts; + // this.gvMeetingSort.DataBind(); + //} /// /// 增加HSE会议 /// /// /// - protected void btnNewMeetingSort_Click(object sender, EventArgs e) - { - jerqueSaveMeetingList(); - Model.Manager_MeetingSortC meetingSort = new Model.Manager_MeetingSortC - { - MeetingSortId = SQLHelper.GetNewID(typeof(Model.Manager_MeetingSortC)) - }; - meetingSorts.Add(meetingSort); - this.gvMeetingSort.DataSource = meetingSorts; - this.gvMeetingSort.DataBind(); - } + //protected void btnNewMeetingSort_Click(object sender, EventArgs e) + //{ + // jerqueSaveMeetingList(); + // Model.Manager_MeetingSortC meetingSort = new Model.Manager_MeetingSortC + // { + // MeetingSortId = SQLHelper.GetNewID(typeof(Model.Manager_MeetingSortC)) + // }; + // meetingSorts.Add(meetingSort); + // this.gvMeetingSort.DataSource = meetingSorts; + // this.gvMeetingSort.DataBind(); + //} /// /// 检查并保存HSE会议集合 /// - private void jerqueSaveMeetingList() - { - meetingSorts.Clear(); - JArray mergedData = gvMeetingSort.GetMergedData(); - foreach (JObject mergedRow in mergedData) - { - string status = mergedRow.Value("status"); - JObject values = mergedRow.Value("values"); - int i = mergedRow.Value("index"); - Model.Manager_MeetingSortC meetingSort = new Model.Manager_MeetingSortC - { - MeetingSortId = this.gvMeetingSort.Rows[i].DataKeys[0].ToString(), - SortIndex = i, - MeetingType = values.Value("MeetingType").ToString(), - MeetingHours = Funs.GetNewDecimalOrZero(values.Value("MeetingHours").ToString()), - MeetingHostMan = values.Value("MeetingHostMan").ToString(), - MeetingDate = values.Value("MeetingDate").ToString(), - AttentPerson = values.Value("AttentPerson").ToString(), - MainContent = values.Value("MainContent").ToString() - }; - meetingSorts.Add(meetingSort); - } - } + //private void jerqueSaveMeetingList() + //{ + // meetingSorts.Clear(); + // JArray mergedData = gvMeetingSort.GetMergedData(); + // foreach (JObject mergedRow in mergedData) + // { + // string status = mergedRow.Value("status"); + // JObject values = mergedRow.Value("values"); + // int i = mergedRow.Value("index"); + // Model.Manager_MeetingSortC meetingSort = new Model.Manager_MeetingSortC + // { + // MeetingSortId = this.gvMeetingSort.Rows[i].DataKeys[0].ToString(), + // SortIndex = i, + // MeetingType = values.Value("MeetingType").ToString(), + // MeetingHours = Funs.GetNewDecimalOrZero(values.Value("MeetingHours").ToString()), + // MeetingHostMan = values.Value("MeetingHostMan").ToString(), + // MeetingDate = values.Value("MeetingDate").ToString(), + // AttentPerson = values.Value("AttentPerson").ToString(), + // MainContent = values.Value("MainContent").ToString() + // }; + // meetingSorts.Add(meetingSort); + // } + //} - protected void gvMeetingSort_RowCommand(object sender, GridCommandEventArgs e) - { - jerqueSaveMeetingList(); - string rowID = this.gvMeetingSort.DataKeys[e.RowIndex][0].ToString(); - if (e.CommandName == "Delete") - { - foreach (var item in meetingSorts) - { - if (item.MeetingSortId == rowID) - { - meetingSorts.Remove(item); - break; - } - } - gvMeetingSort.DataSource = meetingSorts; - gvMeetingSort.DataBind(); - ShowNotify("删除数据成功!", MessageBoxIcon.Success); - } - } + //protected void gvMeetingSort_RowCommand(object sender, GridCommandEventArgs e) + //{ + // jerqueSaveMeetingList(); + // string rowID = this.gvMeetingSort.DataKeys[e.RowIndex][0].ToString(); + // if (e.CommandName == "Delete") + // { + // foreach (var item in meetingSorts) + // { + // if (item.MeetingSortId == rowID) + // { + // meetingSorts.Remove(item); + // break; + // } + // } + // gvMeetingSort.DataSource = meetingSorts; + // gvMeetingSort.DataBind(); + // ShowNotify("删除数据成功!", MessageBoxIcon.Success); + // } + //} #endregion #region HSE宣传活动 - private string StripHT(string strHtml) - { - Regex regex = new Regex("<.+?>", RegexOptions.IgnoreCase); - string strOutput = regex.Replace(strHtml, ""); - return strOutput; - } + //private string StripHT(string strHtml) + //{ + // Regex regex = new Regex("<.+?>", RegexOptions.IgnoreCase); + // string strOutput = regex.Replace(strHtml, ""); + // return strOutput; + //} #endregion #region HSE奖励 /// /// 显示月报告HSE奖励情况 /// - private void GetRewardSort() - { - List rewardNoticeList = BLL.IncentiveNoticeService.GetIncentiveNoticeListsByDate(startTime, endTime, this.ProjectId); - if (rewardNoticeList.Count > 0) - { - int i = 0; - foreach (Model.Check_IncentiveNotice r in rewardNoticeList) - { - Model.Manager_IncentiveSortC rewardSort = new Model.Manager_IncentiveSortC - { - IncentiveSortId = SQLHelper.GetNewID(typeof(Model.Manager_IncentiveSortC)), - SortIndex = i, - BigType = "1" - }; - Model.Base_Unit u = BLL.UnitService.GetUnitByUnitId(r.UnitId); - if (u != null) - { - rewardSort.IncentiveUnit = u.UnitName; - } - rewardSort.IncentiveType = "现金"; - if (r.IncentiveDate != null) - { - rewardSort.IncentiveDate = string.Format("{0:yyyy-MM-dd}", r.IncentiveDate); - } - if (r.IncentiveMoney != null) - { - rewardSort.IncentiveMoney = Convert.ToInt32(r.IncentiveMoney); - } - rewardSorts.Add(rewardSort); - i++; - } - } - this.gvRewardSort.DataSource = rewardSorts; - this.gvRewardSort.DataBind(); - } + //private void GetRewardSort() + //{ + // List rewardNoticeList = BLL.IncentiveNoticeService.GetIncentiveNoticeListsByDate(startTime, endTime, this.ProjectId); + // if (rewardNoticeList.Count > 0) + // { + // int i = 0; + // foreach (Model.Check_IncentiveNotice r in rewardNoticeList) + // { + // Model.Manager_IncentiveSortC rewardSort = new Model.Manager_IncentiveSortC + // { + // IncentiveSortId = SQLHelper.GetNewID(typeof(Model.Manager_IncentiveSortC)), + // SortIndex = i, + // BigType = "1" + // }; + // Model.Base_Unit u = BLL.UnitService.GetUnitByUnitId(r.UnitId); + // if (u != null) + // { + // rewardSort.IncentiveUnit = u.UnitName; + // } + // rewardSort.IncentiveType = "现金"; + // if (r.IncentiveDate != null) + // { + // rewardSort.IncentiveDate = string.Format("{0:yyyy-MM-dd}", r.IncentiveDate); + // } + // if (r.IncentiveMoney != null) + // { + // rewardSort.IncentiveMoney = Convert.ToInt32(r.IncentiveMoney); + // } + // rewardSorts.Add(rewardSort); + // i++; + // } + // } + // this.gvRewardSort.DataSource = rewardSorts; + // this.gvRewardSort.DataBind(); + //} /// /// 增加HSE奖励 /// /// /// - protected void btnNewRewardSort_Click(object sender, EventArgs e) - { - jerqueSaveRewardList(); - Model.Manager_IncentiveSortC rewardSort = new Model.Manager_IncentiveSortC - { - IncentiveSortId = SQLHelper.GetNewID(typeof(Model.Manager_IncentiveSortC)) - }; - rewardSorts.Add(rewardSort); - this.gvRewardSort.DataSource = rewardSorts; - this.gvRewardSort.DataBind(); - } + //protected void btnNewRewardSort_Click(object sender, EventArgs e) + //{ + // jerqueSaveRewardList(); + // Model.Manager_IncentiveSortC rewardSort = new Model.Manager_IncentiveSortC + // { + // IncentiveSortId = SQLHelper.GetNewID(typeof(Model.Manager_IncentiveSortC)) + // }; + // rewardSorts.Add(rewardSort); + // this.gvRewardSort.DataSource = rewardSorts; + // this.gvRewardSort.DataBind(); + //} /// /// 检查并保存HSE奖励集合 /// - private void jerqueSaveRewardList() - { - rewardSorts.Clear(); - JArray mergedData = gvRewardSort.GetMergedData(); - foreach (JObject mergedRow in mergedData) - { - string status = mergedRow.Value("status"); - JObject values = mergedRow.Value("values"); - int i = mergedRow.Value("index"); - Model.Manager_IncentiveSortC rewardSort = new Model.Manager_IncentiveSortC - { - IncentiveSortId = this.gvRewardSort.Rows[i].DataKeys[0].ToString(), - SortIndex = i, - BigType = "1", - IncentiveUnit = values.Value("IncentiveUnit").ToString(), - IncentiveType = values.Value("IncentiveType").ToString(), - IncentiveDate = values.Value("IncentiveDate").ToString(), - IncentiveMoney = Funs.GetNewIntOrZero(values.Value("IncentiveMoney").ToString()) - }; - rewardSorts.Add(rewardSort); - } - } + //private void jerqueSaveRewardList() + //{ + // rewardSorts.Clear(); + // JArray mergedData = gvRewardSort.GetMergedData(); + // foreach (JObject mergedRow in mergedData) + // { + // string status = mergedRow.Value("status"); + // JObject values = mergedRow.Value("values"); + // int i = mergedRow.Value("index"); + // Model.Manager_IncentiveSortC rewardSort = new Model.Manager_IncentiveSortC + // { + // IncentiveSortId = this.gvRewardSort.Rows[i].DataKeys[0].ToString(), + // SortIndex = i, + // BigType = "1", + // IncentiveUnit = values.Value("IncentiveUnit").ToString(), + // IncentiveType = values.Value("IncentiveType").ToString(), + // IncentiveDate = values.Value("IncentiveDate").ToString(), + // IncentiveMoney = Funs.GetNewIntOrZero(values.Value("IncentiveMoney").ToString()) + // }; + // rewardSorts.Add(rewardSort); + // } + //} - protected void gvRewardSort_RowCommand(object sender, GridCommandEventArgs e) - { - jerqueSaveRewardList(); - string rowID = this.gvRewardSort.DataKeys[e.RowIndex][0].ToString(); - if (e.CommandName == "Delete") - { - foreach (var item in rewardSorts) - { - if (item.IncentiveSortId == rowID) - { - rewardSorts.Remove(item); - break; - } - } - gvRewardSort.DataSource = rewardSorts; - gvRewardSort.DataBind(); - ShowNotify("删除数据成功!", MessageBoxIcon.Success); - } - } + //protected void gvRewardSort_RowCommand(object sender, GridCommandEventArgs e) + //{ + // jerqueSaveRewardList(); + // string rowID = this.gvRewardSort.DataKeys[e.RowIndex][0].ToString(); + // if (e.CommandName == "Delete") + // { + // foreach (var item in rewardSorts) + // { + // if (item.IncentiveSortId == rowID) + // { + // rewardSorts.Remove(item); + // break; + // } + // } + // gvRewardSort.DataSource = rewardSorts; + // gvRewardSort.DataBind(); + // ShowNotify("删除数据成功!", MessageBoxIcon.Success); + // } + //} #endregion #region HSE处罚 /// /// 显示月报告HSE处罚情况 /// - private void GetPunishSort() - { - List punishNoticeList = BLL.PunishNoticeService.GetPunishNoticeListsByDate(startTime, endTime, this.ProjectId); - if (punishNoticeList.Count > 0) - { - int i = 0; - foreach (Model.Check_PunishNotice p in punishNoticeList) - { - Model.Manager_IncentiveSortC punishSort = new Model.Manager_IncentiveSortC - { - IncentiveSortId = SQLHelper.GetNewID(typeof(Model.Manager_IncentiveSortC)), - SortIndex = i, - BigType = "2" - }; - Model.Base_Unit u = BLL.UnitService.GetUnitByUnitId(p.UnitId); - if (u != null) - { - punishSort.IncentiveUnit = u.UnitName; - } - if (p.PunishNoticeDate != null) - { - punishSort.IncentiveDate = string.Format("{0:yyyy-MM-dd}", p.PunishNoticeDate); - } - if (p.PunishMoney != null) - { - punishSort.IncentiveMoney = Convert.ToInt32(p.PunishMoney); - } - punishSort.IncentiveReason = p.IncentiveReason; - punishSort.IncentiveBasis = p.BasicItem; - punishSorts.Add(punishSort); - i++; - } - } - this.gvPunishSort.DataSource = punishSorts; - this.gvPunishSort.DataBind(); - } + //private void GetPunishSort() + //{ + // List punishNoticeList = BLL.PunishNoticeService.GetPunishNoticeListsByDate(startTime, endTime, this.ProjectId); + // if (punishNoticeList.Count > 0) + // { + // int i = 0; + // foreach (Model.Check_PunishNotice p in punishNoticeList) + // { + // Model.Manager_IncentiveSortC punishSort = new Model.Manager_IncentiveSortC + // { + // IncentiveSortId = SQLHelper.GetNewID(typeof(Model.Manager_IncentiveSortC)), + // SortIndex = i, + // BigType = "2" + // }; + // Model.Base_Unit u = BLL.UnitService.GetUnitByUnitId(p.UnitId); + // if (u != null) + // { + // punishSort.IncentiveUnit = u.UnitName; + // } + // if (p.PunishNoticeDate != null) + // { + // punishSort.IncentiveDate = string.Format("{0:yyyy-MM-dd}", p.PunishNoticeDate); + // } + // if (p.PunishMoney != null) + // { + // punishSort.IncentiveMoney = Convert.ToInt32(p.PunishMoney); + // } + // punishSort.IncentiveReason = p.IncentiveReason; + // punishSort.IncentiveBasis = p.BasicItem; + // punishSorts.Add(punishSort); + // i++; + // } + // } + // this.gvPunishSort.DataSource = punishSorts; + // this.gvPunishSort.DataBind(); + //} /// /// 增加HSE处罚 /// /// /// - protected void btnNewPunishSort_Click(object sender, EventArgs e) - { - jerqueSavePunishList(); - Model.Manager_IncentiveSortC punishSort = new Model.Manager_IncentiveSortC - { - IncentiveSortId = SQLHelper.GetNewID(typeof(Model.Manager_IncentiveSortC)) - }; - punishSorts.Add(punishSort); - this.gvPunishSort.DataSource = punishSorts; - this.gvPunishSort.DataBind(); - } + //protected void btnNewPunishSort_Click(object sender, EventArgs e) + //{ + // jerqueSavePunishList(); + // Model.Manager_IncentiveSortC punishSort = new Model.Manager_IncentiveSortC + // { + // IncentiveSortId = SQLHelper.GetNewID(typeof(Model.Manager_IncentiveSortC)) + // }; + // punishSorts.Add(punishSort); + // this.gvPunishSort.DataSource = punishSorts; + // this.gvPunishSort.DataBind(); + //} /// /// 检查并保存HSE处罚集合 /// + //private void jerqueSavePunishList() + //{ + // punishSorts.Clear(); + // JArray mergedData = gvPunishSort.GetMergedData(); + // foreach (JObject mergedRow in mergedData) + // { + // string status = mergedRow.Value("status"); + // JObject values = mergedRow.Value("values"); + // int i = mergedRow.Value("index"); + // Model.Manager_IncentiveSortC punishSort = new Model.Manager_IncentiveSortC + // { + // IncentiveSortId = this.gvPunishSort.Rows[i].DataKeys[0].ToString(), + // SortIndex = i, + // BigType = "2", + // IncentiveUnit = values.Value("IncentiveUnit").ToString(), + // IncentiveDate = values.Value("IncentiveDate").ToString(), + // IncentiveMoney = Funs.GetNewIntOrZero(values.Value("IncentiveMoney").ToString()), + // IncentiveReason = values.Value("IncentiveReason").ToString(), + // IncentiveBasis = values.Value("IncentiveBasis").ToString() + // }; + // punishSorts.Add(punishSort); + // } + //} + + //protected void gvPunishSort_RowCommand(object sender, GridCommandEventArgs e) + //{ + // jerqueSavePunishList(); + // string rowID = this.gvPunishSort.DataKeys[e.RowIndex][0].ToString(); + // if (e.CommandName == "Delete") + // { + // foreach (var item in punishSorts) + // { + // if (item.IncentiveSortId == rowID) + // { + // punishSorts.Remove(item); + // break; + // } + // } + // gvPunishSort.DataSource = punishSorts; + // gvPunishSort.DataBind(); + // ShowNotify("删除数据成功!", MessageBoxIcon.Success); + // } + //} + #endregion + + #region HSE奖励与处罚 + private void GetRewardAndPunishSort() + { + Model.Manager_RewardAndPunishSortC sortC = new Model.Manager_RewardAndPunishSortC + { + RewardAndPunishId = SQLHelper.GetNewID(typeof(Model.Manager_RewardAndPunishSortC)), + RewardNum = BLL.IncentiveNoticeService.GetCountByDate(startTime, endTime, this.ProjectId), + RewardMoney = BLL.IncentiveNoticeService.GetSumMoneyByDate(startTime, endTime, this.ProjectId), + ProjectRewardMoney = BLL.IncentiveNoticeService.GetSumMoneyByDate(projectStartTime, endTime, this.ProjectId), + PunishNum = BLL.PunishNoticeService.GetCountByDate(startTime, endTime, this.ProjectId), + PunishMoney = BLL.PunishNoticeService.GetSumMoneyByDate(startTime, endTime, this.ProjectId), + ProjectPunishMoney = BLL.PunishNoticeService.GetSumMoneyByDate(projectStartTime, endTime, this.ProjectId), + }; + rewardAndPunishSortCs.Add(sortC); + + this.gvRewardSortAndPunish.DataSource = rewardAndPunishSortCs; + this.gvRewardSortAndPunish.DataBind(); + } + private void jerqueSavePunishList() { - punishSorts.Clear(); - JArray mergedData = gvPunishSort.GetMergedData(); + rewardAndPunishSortCs.Clear(); + JArray mergedData = gvRewardSortAndPunish.GetMergedData(); foreach (JObject mergedRow in mergedData) { string status = mergedRow.Value("status"); JObject values = mergedRow.Value("values"); int i = mergedRow.Value("index"); - Model.Manager_IncentiveSortC punishSort = new Model.Manager_IncentiveSortC + Model.Manager_RewardAndPunishSortC punishSort = new Model.Manager_RewardAndPunishSortC { - IncentiveSortId = this.gvPunishSort.Rows[i].DataKeys[0].ToString(), - SortIndex = i, - BigType = "2", - IncentiveUnit = values.Value("IncentiveUnit").ToString(), - IncentiveDate = values.Value("IncentiveDate").ToString(), - IncentiveMoney = Funs.GetNewIntOrZero(values.Value("IncentiveMoney").ToString()), - IncentiveReason = values.Value("IncentiveReason").ToString(), - IncentiveBasis = values.Value("IncentiveBasis").ToString() + RewardAndPunishId = this.gvRewardSortAndPunish.Rows[i].DataKeys[0].ToString(), + RewardNum = Funs.GetNewInt(values.Value("RewardNum").ToString()), + RewardMoney = Funs.GetNewDecimal(values.Value("RewardMoney").ToString()), + ProjectRewardMoney = Funs.GetNewDecimal(values.Value("ProjectRewardMoney").ToString()), + PunishNum = Funs.GetNewInt(values.Value("PunishNum").ToString()), + PunishMoney = Funs.GetNewDecimal(values.Value("PunishMoney").ToString()), + ProjectPunishMoney = Funs.GetNewDecimal(values.Value("ProjectPunishMoney").ToString()) }; - punishSorts.Add(punishSort); - } - } - - protected void gvPunishSort_RowCommand(object sender, GridCommandEventArgs e) - { - jerqueSavePunishList(); - string rowID = this.gvPunishSort.DataKeys[e.RowIndex][0].ToString(); - if (e.CommandName == "Delete") - { - foreach (var item in punishSorts) - { - if (item.IncentiveSortId == rowID) - { - punishSorts.Remove(item); - break; - } - } - gvPunishSort.DataSource = punishSorts; - gvPunishSort.DataBind(); - ShowNotify("删除数据成功!", MessageBoxIcon.Success); + rewardAndPunishSortCs.Add(punishSort); } } #endregion @@ -1526,96 +1724,97 @@ namespace FineUIPro.Web.HSSE.Manager Model.Manager_MonthReportC oldMonthReport = BLL.MonthReportCService.GetMonthReportByMonths(Convert.ToDateTime(Request.Params["months"]), this.CurrUser.LoginProjectId); if (oldMonthReport != null) { - oldMonthReport.MainActivitiesDef = this.txtMainActivitiesDef.Text.Trim(); - if (!string.IsNullOrEmpty(this.txtMeetingNum.Text.Trim())) - { - oldMonthReport.MeetingNum = Convert.ToInt32(this.txtMeetingNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearMeetingNum.Text.Trim())) - { - oldMonthReport.YearMeetingNum = Convert.ToInt32(this.txtYearMeetingNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtComplexEmergencyNum.Text.Trim())) - { - oldMonthReport.ComplexEmergencyNum = Convert.ToInt32(this.txtComplexEmergencyNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearComplexEmergencyNum.Text.Trim())) - { - oldMonthReport.YearComplexEmergencyNum = Convert.ToInt32(this.txtYearComplexEmergencyNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtTotalComplexEmergencyNum.Text.Trim())) - { - oldMonthReport.TotalComplexEmergencyNum = Convert.ToInt32(this.txtTotalComplexEmergencyNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtSpecialEmergencyNum.Text.Trim())) - { - oldMonthReport.SpecialEmergencyNum = Convert.ToInt32(this.txtSpecialEmergencyNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearSpecialEmergencyNum.Text.Trim())) - { - oldMonthReport.YearSpecialEmergencyNum = Convert.ToInt32(this.txtYearSpecialEmergencyNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtTotalSpecialEmergencyNum.Text.Trim())) - { - oldMonthReport.TotalSpecialEmergencyNum = Convert.ToInt32(this.txtTotalSpecialEmergencyNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtDrillRecordNum.Text.Trim())) - { - oldMonthReport.DrillRecordNum = Convert.ToInt32(this.txtDrillRecordNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearDrillRecordNum.Text.Trim())) - { - oldMonthReport.YearDrillRecordNum = Convert.ToInt32(this.txtYearDrillRecordNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtTotalDrillRecordNum.Text.Trim())) - { - oldMonthReport.TotalDrillRecordNum = Convert.ToInt32(this.txtTotalDrillRecordNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtRewardNum.Text.Trim())) - { - oldMonthReport.RewardNum = Convert.ToInt32(this.txtRewardNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearRewardNum.Text.Trim())) - { - oldMonthReport.YearRewardNum = Convert.ToInt32(this.txtYearRewardNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtRewardMoney.Text.Trim())) - { - oldMonthReport.RewardMoney = Convert.ToInt32(this.txtRewardMoney.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearRewardMoney.Text.Trim())) - { - oldMonthReport.YearRewardMoney = Convert.ToInt32(this.txtYearRewardMoney.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtPunishNum.Text.Trim())) - { - oldMonthReport.PunishNum = Convert.ToInt32(this.txtPunishNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearPunishNum.Text.Trim())) - { - oldMonthReport.YearPunishNum = Convert.ToInt32(this.txtYearPunishNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtPunishMoney.Text.Trim())) - { - oldMonthReport.PunishMoney = Convert.ToInt32(this.txtPunishMoney.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearPunishMoney.Text.Trim())) - { - oldMonthReport.YearPunishMoney = Convert.ToInt32(this.txtYearPunishMoney.Text.Trim()); - } - oldMonthReport.LicenseRemark = this.txtLicenseRemark.Text.Trim(); - oldMonthReport.EmergencyManagementWorkDef = this.txtEmergencyManagementWorkDef.Text.Trim(); - oldMonthReport.EquipmentRemark = this.txtEquipmentRemark.Text.Trim(); + //oldMonthReport.MainActivitiesDef = this.txtMainActivitiesDef.Text.Trim(); + //if (!string.IsNullOrEmpty(this.txtMeetingNum.Text.Trim())) + //{ + // oldMonthReport.MeetingNum = Convert.ToInt32(this.txtMeetingNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearMeetingNum.Text.Trim())) + //{ + // oldMonthReport.YearMeetingNum = Convert.ToInt32(this.txtYearMeetingNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtComplexEmergencyNum.Text.Trim())) + //{ + // oldMonthReport.ComplexEmergencyNum = Convert.ToInt32(this.txtComplexEmergencyNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearComplexEmergencyNum.Text.Trim())) + //{ + // oldMonthReport.YearComplexEmergencyNum = Convert.ToInt32(this.txtYearComplexEmergencyNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtTotalComplexEmergencyNum.Text.Trim())) + //{ + // oldMonthReport.TotalComplexEmergencyNum = Convert.ToInt32(this.txtTotalComplexEmergencyNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtSpecialEmergencyNum.Text.Trim())) + //{ + // oldMonthReport.SpecialEmergencyNum = Convert.ToInt32(this.txtSpecialEmergencyNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearSpecialEmergencyNum.Text.Trim())) + //{ + // oldMonthReport.YearSpecialEmergencyNum = Convert.ToInt32(this.txtYearSpecialEmergencyNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtTotalSpecialEmergencyNum.Text.Trim())) + //{ + // oldMonthReport.TotalSpecialEmergencyNum = Convert.ToInt32(this.txtTotalSpecialEmergencyNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtDrillRecordNum.Text.Trim())) + //{ + // oldMonthReport.DrillRecordNum = Convert.ToInt32(this.txtDrillRecordNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearDrillRecordNum.Text.Trim())) + //{ + // oldMonthReport.YearDrillRecordNum = Convert.ToInt32(this.txtYearDrillRecordNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtTotalDrillRecordNum.Text.Trim())) + //{ + // oldMonthReport.TotalDrillRecordNum = Convert.ToInt32(this.txtTotalDrillRecordNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtRewardNum.Text.Trim())) + //{ + // oldMonthReport.RewardNum = Convert.ToInt32(this.txtRewardNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearRewardNum.Text.Trim())) + //{ + // oldMonthReport.YearRewardNum = Convert.ToInt32(this.txtYearRewardNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtRewardMoney.Text.Trim())) + //{ + // oldMonthReport.RewardMoney = Convert.ToInt32(this.txtRewardMoney.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearRewardMoney.Text.Trim())) + //{ + // oldMonthReport.YearRewardMoney = Convert.ToInt32(this.txtYearRewardMoney.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtPunishNum.Text.Trim())) + //{ + // oldMonthReport.PunishNum = Convert.ToInt32(this.txtPunishNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearPunishNum.Text.Trim())) + //{ + // oldMonthReport.YearPunishNum = Convert.ToInt32(this.txtYearPunishNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtPunishMoney.Text.Trim())) + //{ + // oldMonthReport.PunishMoney = Convert.ToInt32(this.txtPunishMoney.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearPunishMoney.Text.Trim())) + //{ + // oldMonthReport.YearPunishMoney = Convert.ToInt32(this.txtYearPunishMoney.Text.Trim()); + //} + oldMonthReport.LicenseRemark = this.txtWorkDef.Text.Trim();//应急演练工作情况说明 + oldMonthReport.EmergencyManagementWorkDef = this.txtEmergencyManagementWorkDef.Text.Trim();//其他应急管理工作描述（本月如有） + //oldMonthReport.EquipmentRemark = this.txtEquipmentRemark.Text.Trim(); BLL.MonthReportCService.UpdateMonthReport(oldMonthReport); - OperateHazardSort(MonthReportId); + //OperateHazardSort(MonthReportId); OperateTrainSort(MonthReportId); - OperateTrainActivitySort(MonthReportId); + //OperateTrainActivitySort(MonthReportId); OperateCheckSort(MonthReportId); - OperateCheckDetailSort(MonthReportId); - OperateMeetingSort(MonthReportId); - BLL.IncentiveSortCService.DeleteIncentiveSortsByMonthReportId(MonthReportId); - OperateRewardSort(MonthReportId); - OperatePunishSort(MonthReportId); + //OperateCheckDetailSort(MonthReportId); + //OperateMeetingSort(MonthReportId); + //BLL.IncentiveSortCService.DeleteIncentiveSortsByMonthReportId(MonthReportId); + //OperateRewardSort(MonthReportId); + //OperatePunishSort(MonthReportId); + OperateRewardAndPunishSort(MonthReportId); OperateOtherManagementSort(MonthReportId); BLL.LogService.AddSys_Log(this.CurrUser, oldMonthReport.MonthReportCode, oldMonthReport.MonthReportId, BLL.Const.ProjectManagerMonthCMenuId, BLL.Const.BtnModify); } @@ -1630,96 +1829,97 @@ namespace FineUIPro.Web.HSSE.Manager monthReport.Months = Funs.GetNewDateTime(Request.Params["months"]); monthReport.ReportMan = this.CurrUser.UserId; monthReport.MonthReportDate = DateTime.Now; - monthReport.MainActivitiesDef = this.txtMainActivitiesDef.Text.Trim(); - if (!string.IsNullOrEmpty(this.txtMeetingNum.Text.Trim())) - { - monthReport.MeetingNum = Convert.ToInt32(this.txtMeetingNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearMeetingNum.Text.Trim())) - { - monthReport.YearMeetingNum = Convert.ToInt32(this.txtYearMeetingNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtComplexEmergencyNum.Text.Trim())) - { - monthReport.ComplexEmergencyNum = Convert.ToInt32(this.txtComplexEmergencyNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearComplexEmergencyNum.Text.Trim())) - { - monthReport.YearComplexEmergencyNum = Convert.ToInt32(this.txtYearComplexEmergencyNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtTotalComplexEmergencyNum.Text.Trim())) - { - monthReport.TotalComplexEmergencyNum = Convert.ToInt32(this.txtTotalComplexEmergencyNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtSpecialEmergencyNum.Text.Trim())) - { - monthReport.SpecialEmergencyNum = Convert.ToInt32(this.txtSpecialEmergencyNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearSpecialEmergencyNum.Text.Trim())) - { - monthReport.YearSpecialEmergencyNum = Convert.ToInt32(this.txtYearSpecialEmergencyNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtTotalSpecialEmergencyNum.Text.Trim())) - { - monthReport.TotalSpecialEmergencyNum = Convert.ToInt32(this.txtTotalSpecialEmergencyNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtDrillRecordNum.Text.Trim())) - { - monthReport.DrillRecordNum = Convert.ToInt32(this.txtDrillRecordNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearDrillRecordNum.Text.Trim())) - { - monthReport.YearDrillRecordNum = Convert.ToInt32(this.txtYearDrillRecordNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtTotalDrillRecordNum.Text.Trim())) - { - monthReport.TotalDrillRecordNum = Convert.ToInt32(this.txtTotalDrillRecordNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtRewardNum.Text.Trim())) - { - monthReport.RewardNum = Convert.ToInt32(this.txtRewardNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearRewardNum.Text.Trim())) - { - monthReport.YearRewardNum = Convert.ToInt32(this.txtYearRewardNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtRewardMoney.Text.Trim())) - { - monthReport.RewardMoney = Convert.ToInt32(this.txtRewardMoney.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearRewardMoney.Text.Trim())) - { - monthReport.YearRewardMoney = Convert.ToInt32(this.txtYearRewardMoney.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtPunishNum.Text.Trim())) - { - monthReport.PunishNum = Convert.ToInt32(this.txtPunishNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearPunishNum.Text.Trim())) - { - monthReport.YearPunishNum = Convert.ToInt32(this.txtYearPunishNum.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtPunishMoney.Text.Trim())) - { - monthReport.PunishMoney = Convert.ToInt32(this.txtPunishMoney.Text.Trim()); - } - if (!string.IsNullOrEmpty(this.txtYearPunishMoney.Text.Trim())) - { - monthReport.YearPunishMoney = Convert.ToInt32(this.txtYearPunishMoney.Text.Trim()); - } - monthReport.EmergencyManagementWorkDef = this.txtEmergencyManagementWorkDef.Text.Trim(); - monthReport.LicenseRemark = this.txtLicenseRemark.Text.Trim(); - monthReport.EquipmentRemark = this.txtEquipmentRemark.Text.Trim(); + //monthReport.MainActivitiesDef = this.txtMainActivitiesDef.Text.Trim(); + //if (!string.IsNullOrEmpty(this.txtMeetingNum.Text.Trim())) + //{ + // monthReport.MeetingNum = Convert.ToInt32(this.txtMeetingNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearMeetingNum.Text.Trim())) + //{ + // monthReport.YearMeetingNum = Convert.ToInt32(this.txtYearMeetingNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtComplexEmergencyNum.Text.Trim())) + //{ + // monthReport.ComplexEmergencyNum = Convert.ToInt32(this.txtComplexEmergencyNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearComplexEmergencyNum.Text.Trim())) + //{ + // monthReport.YearComplexEmergencyNum = Convert.ToInt32(this.txtYearComplexEmergencyNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtTotalComplexEmergencyNum.Text.Trim())) + //{ + // monthReport.TotalComplexEmergencyNum = Convert.ToInt32(this.txtTotalComplexEmergencyNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtSpecialEmergencyNum.Text.Trim())) + //{ + // monthReport.SpecialEmergencyNum = Convert.ToInt32(this.txtSpecialEmergencyNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearSpecialEmergencyNum.Text.Trim())) + //{ + // monthReport.YearSpecialEmergencyNum = Convert.ToInt32(this.txtYearSpecialEmergencyNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtTotalSpecialEmergencyNum.Text.Trim())) + //{ + // monthReport.TotalSpecialEmergencyNum = Convert.ToInt32(this.txtTotalSpecialEmergencyNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtDrillRecordNum.Text.Trim())) + //{ + // monthReport.DrillRecordNum = Convert.ToInt32(this.txtDrillRecordNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearDrillRecordNum.Text.Trim())) + //{ + // monthReport.YearDrillRecordNum = Convert.ToInt32(this.txtYearDrillRecordNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtTotalDrillRecordNum.Text.Trim())) + //{ + // monthReport.TotalDrillRecordNum = Convert.ToInt32(this.txtTotalDrillRecordNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtRewardNum.Text.Trim())) + //{ + // monthReport.RewardNum = Convert.ToInt32(this.txtRewardNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearRewardNum.Text.Trim())) + //{ + // monthReport.YearRewardNum = Convert.ToInt32(this.txtYearRewardNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtRewardMoney.Text.Trim())) + //{ + // monthReport.RewardMoney = Convert.ToInt32(this.txtRewardMoney.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearRewardMoney.Text.Trim())) + //{ + // monthReport.YearRewardMoney = Convert.ToInt32(this.txtYearRewardMoney.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtPunishNum.Text.Trim())) + //{ + // monthReport.PunishNum = Convert.ToInt32(this.txtPunishNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearPunishNum.Text.Trim())) + //{ + // monthReport.YearPunishNum = Convert.ToInt32(this.txtYearPunishNum.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtPunishMoney.Text.Trim())) + //{ + // monthReport.PunishMoney = Convert.ToInt32(this.txtPunishMoney.Text.Trim()); + //} + //if (!string.IsNullOrEmpty(this.txtYearPunishMoney.Text.Trim())) + //{ + // monthReport.YearPunishMoney = Convert.ToInt32(this.txtYearPunishMoney.Text.Trim()); + //} + monthReport.EmergencyManagementWorkDef = this.txtEmergencyManagementWorkDef.Text.Trim();//其他应急管理工作描述（本月如有） + monthReport.LicenseRemark = this.txtWorkDef.Text.Trim();//应急演练工作情况说明 + //monthReport.EquipmentRemark = this.txtEquipmentRemark.Text.Trim(); BLL.MonthReportCService.AddMonthReport(monthReport); - OperateHazardSort(newKeyID); + //OperateHazardSort(newKeyID); OperateTrainSort(newKeyID); - OperateTrainActivitySort(newKeyID); + //OperateTrainActivitySort(newKeyID); OperateCheckSort(newKeyID); - OperateCheckDetailSort(newKeyID); - OperateMeetingSort(newKeyID); - BLL.IncentiveSortCService.DeleteIncentiveSortsByMonthReportId(newKeyID); - OperateRewardSort(newKeyID); - OperatePunishSort(newKeyID); + //OperateCheckDetailSort(newKeyID); + //OperateMeetingSort(newKeyID); + //BLL.IncentiveSortCService.DeleteIncentiveSortsByMonthReportId(newKeyID); + //OperateRewardSort(newKeyID); + //OperatePunishSort(newKeyID); + OperateRewardAndPunishSort(newKeyID); OperateOtherManagementSort(newKeyID); BLL.LogService.AddSys_Log(this.CurrUser, monthReport.MonthReportCode, monthReport.MonthReportId, BLL.Const.ProjectManagerMonthCMenuId, BLL.Const.BtnAdd); } @@ -1730,16 +1930,16 @@ namespace FineUIPro.Web.HSSE.Manager /// /// 操作月报告危险源情况 /// - private void OperateHazardSort(string monthReportId) - { - BLL.HazardSortCService.DeleteHazardSortsByMonthReportId(monthReportId); - jerqueSaveHazardList(); - foreach (Model.Manager_HazardSortC hazardSort in hazardSorts) - { - hazardSort.MonthReportId = monthReportId; - BLL.HazardSortCService.AddHazardSort(hazardSort); - } - } + //private void OperateHazardSort(string monthReportId) + //{ + // BLL.HazardSortCService.DeleteHazardSortsByMonthReportId(monthReportId); + // jerqueSaveHazardList(); + // foreach (Model.Manager_HazardSortC hazardSort in hazardSorts) + // { + // hazardSort.MonthReportId = monthReportId; + // BLL.HazardSortCService.AddHazardSort(hazardSort); + // } + //} /// /// 操作月报告HSE培训情况 @@ -1758,16 +1958,16 @@ namespace FineUIPro.Web.HSSE.Manager /// /// 操作月报告HSE培训活动情况 /// - private void OperateTrainActivitySort(string monthReportId) - { - BLL.TrainActivitySortCService.DeleteTrainActivitySortsByMonthReportId(monthReportId); - jerqueSaveTrainActivityList(); - foreach (Model.Manager_TrainActivitySortC trainActivitySort in trainActivitySorts) - { - trainActivitySort.MonthReportId = monthReportId; - BLL.TrainActivitySortCService.AddTrainActivitySort(trainActivitySort); - } - } + //private void OperateTrainActivitySort(string monthReportId) + //{ + // BLL.TrainActivitySortCService.DeleteTrainActivitySortsByMonthReportId(monthReportId); + // jerqueSaveTrainActivityList(); + // foreach (Model.Manager_TrainActivitySortC trainActivitySort in trainActivitySorts) + // { + // trainActivitySort.MonthReportId = monthReportId; + // BLL.TrainActivitySortCService.AddTrainActivitySort(trainActivitySort); + // } + //} /// /// 操作月报告HSE检查情况 @@ -1786,54 +1986,66 @@ namespace FineUIPro.Web.HSSE.Manager /// /// 操作月报告HSE检查明细情况 /// - private void OperateCheckDetailSort(string monthReportId) - { - BLL.CheckDetailSortCService.DeleteCheckDetailSortsByMonthReportId(monthReportId); - jerqueSaveCheckDetailList(); - foreach (Model.Manager_CheckDetailSortC checkDetailSort in checkDetailSorts) - { - checkDetailSort.MonthReportId = monthReportId; - BLL.CheckDetailSortCService.AddCheckDetailSort(checkDetailSort); - } - } + //private void OperateCheckDetailSort(string monthReportId) + //{ + // BLL.CheckDetailSortCService.DeleteCheckDetailSortsByMonthReportId(monthReportId); + // jerqueSaveCheckDetailList(); + // foreach (Model.Manager_CheckDetailSortC checkDetailSort in checkDetailSorts) + // { + // checkDetailSort.MonthReportId = monthReportId; + // BLL.CheckDetailSortCService.AddCheckDetailSort(checkDetailSort); + // } + //} /// /// 操作月报告HSE会议情况 /// - private void OperateMeetingSort(string monthReportId) - { - BLL.MeetingSortCService.DeleteMeetingSortsByMonthReportId(monthReportId); - jerqueSaveMeetingList(); - foreach (Model.Manager_MeetingSortC meetingSort in meetingSorts) - { - meetingSort.MonthReportId = monthReportId; - BLL.MeetingSortCService.AddMeetingSort(meetingSort); - } - } + //private void OperateMeetingSort(string monthReportId) + //{ + // BLL.MeetingSortCService.DeleteMeetingSortsByMonthReportId(monthReportId); + // jerqueSaveMeetingList(); + // foreach (Model.Manager_MeetingSortC meetingSort in meetingSorts) + // { + // meetingSort.MonthReportId = monthReportId; + // BLL.MeetingSortCService.AddMeetingSort(meetingSort); + // } + //} /// /// 操作月报告HSE奖励情况 /// - private void OperateRewardSort(string monthReportId) - { - jerqueSaveRewardList(); - foreach (Model.Manager_IncentiveSortC rewardSort in rewardSorts) - { - rewardSort.MonthReportId = monthReportId; - BLL.IncentiveSortCService.AddIncentiveSort(rewardSort); - } - } + //private void OperateRewardSort(string monthReportId) + //{ + // jerqueSaveRewardList(); + // foreach (Model.Manager_IncentiveSortC rewardSort in rewardSorts) + // { + // rewardSort.MonthReportId = monthReportId; + // BLL.IncentiveSortCService.AddIncentiveSort(rewardSort); + // } + //} /// /// 操作月报告HSE处罚情况 /// - private void OperatePunishSort(string monthReportId) + //private void OperatePunishSort(string monthReportId) + //{ + // jerqueSavePunishList(); + // foreach (Model.Manager_IncentiveSortC punishSort in punishSorts) + // { + // punishSort.MonthReportId = monthReportId; + // BLL.IncentiveSortCService.AddIncentiveSort(punishSort); + // } + //} + + /// + private void OperateRewardAndPunishSort(string monthReportId) { + BLL.RewardAndPunishSortCService.DeleteRewardAndPunishSortCByMonthReportId(monthReportId); jerqueSavePunishList(); - foreach (Model.Manager_IncentiveSortC punishSort in punishSorts) + foreach (Model.Manager_RewardAndPunishSortC rewardAndPunishSortC in rewardAndPunishSortCs) { - punishSort.MonthReportId = monthReportId; - BLL.IncentiveSortCService.AddIncentiveSort(punishSort); + rewardAndPunishSortC.MonthReportId = monthReportId; + BLL.RewardAndPunishSortCService.AddRewardAndPunishSortC(rewardAndPunishSortC); } } diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit4.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit4.aspx.designer.cs index 4cbb293f..7aec52c3 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit4.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit4.aspx.designer.cs @@ -48,33 +48,6 @@ namespace FineUIPro.Web.HSSE.Manager { /// protected global::FineUIPro.GroupPanel GroupPanel11; - /// - /// GroupPanel12 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.GroupPanel GroupPanel12; - - /// - /// Form2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form Form2; - - /// - /// txtMainActivitiesDef 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtMainActivitiesDef; - /// /// GroupPanel1 控件。 /// @@ -84,87 +57,6 @@ namespace FineUIPro.Web.HSSE.Manager { /// protected global::FineUIPro.GroupPanel GroupPanel1; - /// - /// gvHazardSort 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Grid gvHazardSort; - - /// - /// Toolbar2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Toolbar Toolbar2; - - /// - /// btnNewHazardSort 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnNewHazardSort; - - /// - /// txtHazardName 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtHazardName; - - /// - /// txtUnitAndArea 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtUnitAndArea; - - /// - /// txtStationDef 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtStationDef; - - /// - /// txtHandleWay 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtHandleWay; - - /// - /// GroupPanel2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.GroupPanel GroupPanel2; - - /// - /// GroupPanel3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.GroupPanel GroupPanel3; - /// /// gvTrainSort 控件。 /// @@ -175,31 +67,13 @@ namespace FineUIPro.Web.HSSE.Manager { protected global::FineUIPro.Grid gvTrainSort; /// - /// Toolbar3 控件。 + /// txtTrainType 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Toolbar Toolbar3; - - /// - /// btnNewTrainSort 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnNewTrainSort; - - /// - /// txtTrainContent 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtTrainContent; + protected global::FineUIPro.TextBox txtTrainType; /// /// nbTeachHour 控件。 @@ -210,15 +84,6 @@ namespace FineUIPro.Web.HSSE.Manager { /// protected global::FineUIPro.NumberBox nbTeachHour; - /// - /// txtTeachMan 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtTeachMan; - /// /// TextBox4 控件。 /// @@ -238,85 +103,22 @@ namespace FineUIPro.Web.HSSE.Manager { protected global::FineUIPro.NumberBox nbPersonNum; /// - /// GroupPanel4 控件。 + /// NumberBox1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.GroupPanel GroupPanel4; + protected global::FineUIPro.NumberBox NumberBox1; /// - /// gvTrainActivitySort 控件。 + /// GroupPanel2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Grid gvTrainActivitySort; - - /// - /// Toolbar4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Toolbar Toolbar4; - - /// - /// btnNewTrainActivitySort 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnNewTrainActivitySort; - - /// - /// txtActivityName 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtActivityName; - - /// - /// txtTrainDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtTrainDate; - - /// - /// txtTrainEffect 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtTrainEffect; - - /// - /// GroupPanel5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.GroupPanel GroupPanel5; - - /// - /// GroupPanel6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.GroupPanel GroupPanel6; + protected global::FineUIPro.GroupPanel GroupPanel2; /// /// gvCheckSort 控件。 @@ -408,213 +210,6 @@ namespace FineUIPro.Web.HSSE.Manager { /// protected global::FineUIPro.Label lb111; - /// - /// GroupPanel7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.GroupPanel GroupPanel7; - - /// - /// gvCheckDetailSort 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Grid gvCheckDetailSort; - - /// - /// Toolbar6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Toolbar Toolbar6; - - /// - /// btnNewCheckDetailSort 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnNewCheckDetailSort; - - /// - /// checktype 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox checktype; - - /// - /// txtCheckTime 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtCheckTime; - - /// - /// TextBox3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox3; - - /// - /// TextBox1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox1; - - /// - /// GroupPanel8 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.GroupPanel GroupPanel8; - - /// - /// GroupPanel15 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.GroupPanel GroupPanel15; - - /// - /// Form3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form Form3; - - /// - /// txtMeetingNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtMeetingNum; - - /// - /// txtYearMeetingNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtYearMeetingNum; - - /// - /// GroupPanel16 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.GroupPanel GroupPanel16; - - /// - /// gvMeetingSort 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Grid gvMeetingSort; - - /// - /// Toolbar7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Toolbar Toolbar7; - - /// - /// btnNewMeetingSort 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnNewMeetingSort; - - /// - /// TextBox2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox2; - - /// - /// NumberBox1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox NumberBox1; - - /// - /// TextBox5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox5; - - /// - /// TextBox6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox6; - - /// - /// TextBox7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox7; - - /// - /// TextBox8 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox8; - /// /// GroupPanel20 控件。 /// @@ -634,157 +229,13 @@ namespace FineUIPro.Web.HSSE.Manager { protected global::FineUIPro.GroupPanel GroupPanel21; /// - /// Form5 控件。 + /// txtWorkDef 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Form Form5; - - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label1; - - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label2; - - /// - /// Label3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label3; - - /// - /// Label4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label4; - - /// - /// Label5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label5; - - /// - /// txtComplexEmergencyNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtComplexEmergencyNum; - - /// - /// txtYearComplexEmergencyNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtYearComplexEmergencyNum; - - /// - /// txtTotalComplexEmergencyNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtTotalComplexEmergencyNum; - - /// - /// Label6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label6; - - /// - /// txtSpecialEmergencyNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtSpecialEmergencyNum; - - /// - /// txtYearSpecialEmergencyNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtYearSpecialEmergencyNum; - - /// - /// txtTotalSpecialEmergencyNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtTotalSpecialEmergencyNum; - - /// - /// Label7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label7; - - /// - /// txtDrillRecordNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtDrillRecordNum; - - /// - /// txtYearDrillRecordNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtYearDrillRecordNum; - - /// - /// txtTotalDrillRecordNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtTotalDrillRecordNum; + protected global::FineUIPro.TextArea txtWorkDef; /// /// GroupPanel22 控件。 @@ -804,33 +255,6 @@ namespace FineUIPro.Web.HSSE.Manager { /// protected global::FineUIPro.TextArea txtEmergencyManagementWorkDef; - /// - /// GroupPanel24 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.GroupPanel GroupPanel24; - - /// - /// txtLicenseRemark 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtLicenseRemark; - - /// - /// txtEquipmentRemark 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtEquipmentRemark; - /// /// GroupPanel27 控件。 /// @@ -841,175 +265,31 @@ namespace FineUIPro.Web.HSSE.Manager { protected global::FineUIPro.GroupPanel GroupPanel27; /// - /// GroupPanel28 控件。 + /// gvRewardSortAndPunish 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.GroupPanel GroupPanel28; + protected global::FineUIPro.Grid gvRewardSortAndPunish; /// - /// gvRewardSort 控件。 + /// NumberBox5 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Grid gvRewardSort; + protected global::FineUIPro.NumberBox NumberBox5; /// - /// Toolbar11 控件。 + /// NumberBox4 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Toolbar Toolbar11; - - /// - /// btnNewRewardSort 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnNewRewardSort; - - /// - /// TextBox21 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox21; - - /// - /// TextBox22 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox22; - - /// - /// TextBox23 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox23; - - /// - /// NumberBox2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox NumberBox2; - - /// - /// Form7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form Form7; - - /// - /// txtRewardNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtRewardNum; - - /// - /// txtYearRewardNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtYearRewardNum; - - /// - /// txtRewardMoney 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtRewardMoney; - - /// - /// txtYearRewardMoney 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtYearRewardMoney; - - /// - /// GroupPanel29 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.GroupPanel GroupPanel29; - - /// - /// gvPunishSort 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Grid gvPunishSort; - - /// - /// Toolbar12 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Toolbar Toolbar12; - - /// - /// btnNewPunishSort 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnNewPunishSort; - - /// - /// TextBox24 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox24; - - /// - /// TextBox26 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox26; + protected global::FineUIPro.NumberBox NumberBox4; /// /// NumberBox3 控件。 @@ -1021,67 +301,31 @@ namespace FineUIPro.Web.HSSE.Manager { protected global::FineUIPro.NumberBox NumberBox3; /// - /// TextBox27 控件。 + /// NumberBox2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox27; + protected global::FineUIPro.NumberBox NumberBox2; /// - /// TextBox28 控件。 + /// NumberBox6 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox28; + protected global::FineUIPro.NumberBox NumberBox6; /// - /// Form8 控件。 + /// NumberBox7 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Form Form8; - - /// - /// txtPunishNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtPunishNum; - - /// - /// txtYearPunishNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtYearPunishNum; - - /// - /// txtPunishMoney 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtPunishMoney; - - /// - /// txtYearPunishMoney 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox txtYearPunishMoney; + protected global::FineUIPro.NumberBox NumberBox7; /// /// GroupPanel33 控件。 diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx index 528e6b18..e412b25a 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx @@ -1,127 +1,134 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthReportCEdit5.aspx.cs" - Inherits="FineUIPro.Web.HSSE.Manager.MonthReportCEdit5" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthReportCEdit5.aspx.cs" Inherits="FineUIPro.Web.HSSE.Manager.MonthReportCEdit5" %> + - + 本月项目HSE费用管理 +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx.cs index a60bb170..a127abbb 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx.cs @@ -1,11 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using BLL; +using BLL; using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; namespace FineUIPro.Web.HSSE.Manager { @@ -15,7 +13,7 @@ namespace FineUIPro.Web.HSSE.Manager /// /// 月报告查主键 /// - public string MonthReportId + public string newKeyID { get { @@ -52,19 +50,14 @@ namespace FineUIPro.Web.HSSE.Manager #region 定义集合 /// - /// 5.1.2 本月文件、方案修编情况说明集合 + /// 6.1 五环HSE费用投入集合 /// - private static List plans = new List(); + private static List fiveExpenses = new List(); /// - /// 5.2.2 详细审查记录集合 + /// 6.2 分包商HSE费用投入集合 /// - private static List reviewRecords = new List(); - - /// - /// 5.3 HSSE文件管理集合 - /// - private static List fileManages = new List(); + private static List subExpenses = new List(); #endregion @@ -75,10 +68,9 @@ namespace FineUIPro.Web.HSSE.Manager { if (!IsPostBack) { - plans.Clear(); - reviewRecords.Clear(); - fileManages.Clear(); - this.MonthReportId = Request.Params["monthReportId"]; + fiveExpenses.Clear(); + subExpenses.Clear(); + this.newKeyID = Request.Params["monthReportId"]; this.ProjectId = this.CurrUser.LoginProjectId; DateTime months = Convert.ToDateTime(Request.Params["months"]); startTime = Convert.ToDateTime(Request.Params["startTime"]); @@ -93,408 +85,320 @@ namespace FineUIPro.Web.HSSE.Manager } if (monthReport != null) { - this.MonthReportId = monthReport.MonthReportId; + this.newKeyID = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; months = Convert.ToDateTime(monthReport.Months); - Model.SGGLDB db = Funs.DB; - //5.1.2 本月文件、方案修编情况说明 - plans = (from x in db.Manager_Month_PlanC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); - if (plans.Count > 0) + + fiveExpenses = BLL.FiveExpenseCService.GetFiveExpenseByMonthReportId(this.newKeyID); + if (fiveExpenses.Count > 0) { - this.gvMonthPlan.DataSource = plans; - this.gvMonthPlan.DataBind(); + this.gvFiveExpenseC.DataSource = fiveExpenses; + this.gvFiveExpenseC.DataBind(); + OutputSummaryData(); } else { - GetPlanSort(); + GetFiveExpenseList(); } - //5.2.2 详细审查记录 - reviewRecords = (from x in db.Manager_Month_ReviewRecordC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); - if (reviewRecords.Count > 0) + + subExpenses = BLL.SubExpenseCService.GetSubExpenseByMonthReportId(this.newKeyID); + if (subExpenses.Count>0) { - this.gvReviewRecord.DataSource = reviewRecords; - this.gvReviewRecord.DataBind(); + this.gvSubExpenseC.DataSource = subExpenses; + this.gvSubExpenseC.DataBind(); + OutputSubSummaryData(); } else { - GetReviewRecordSort(); + GetSubExpenseList(); } } else { - //施工HSE实施计划数量 - //List actionPlans = BLL.ActionPlanListService.GetActionPlanListsByDate(startTime, endTime, this.ProjectId); - //int actionPlanNum = actionPlans.Count; - ////HSE管理规定数量 - //List hSERules = BLL.ActionPlan_ManagerRuleService.GetManagerRuleListsByDate(startTime, endTime, this.ProjectId); - //int hSERuleNum = hSERules.Count; - //int constructSolutionNum = BLL.ConstructSolutionService.GetConstructSolutionCountByDate(this.ProjectId, startTime, endTime); - //int subUnitQualityAuditDetailNum = BLL.SubUnitQualityAuditDetailService.GetCountByDate(this.ProjectId, startTime, endTime); - //int equipmentQualityAuditDetailNum = BLL.EquipmentQualityAuditDetailService.GetCountByDate(this.ProjectId, startTime, endTime); - //int personQualityAuditDetailNum = BLL.PersonQualityService.GetCountByDate(this.ProjectId, startTime, endTime); - //int generalEquipmentQualityNum = BLL.GeneralEquipmentQualityService.GetSumCountByDate(this.ProjectId, startTime, endTime); - GetPlanSort(); - GetReviewRecordSort(); + GetFiveExpenseList(); //费用投入 + GetSubExpenseList(); //本月项目分包商HSE费用支付统计 } } } #endregion - #region HSE管理文件、方案修编 + #region 本月项目分包商HSE费用支付统计 /// - /// 显示本月文件、方案修编情况说明 + /// 费用投入 /// - private void GetPlanSort() + private void GetFiveExpenseList() { - List actionList = BLL.ActionPlanListService.GetActionPlanListsByDate(startTime, endTime, this.ProjectId); - //施工计划 - if (actionList.Count > 0) + #region 五环（本月） + decimal? sMonthType1 = 0, sMonthType2 = 0, sMonthType3 = 0, sMonthType4 = 0, sMonthType5 = 0, sMonthType6 = 0; + decimal? tMonthType1 = 0; + List payRegistrations = BLL.PayRegistrationService.GetPayRegistrationByPayDate(startTime, endTime, this.ProjectId, BLL.Const.UnitId_CWCEC); + if (payRegistrations != null) { - foreach (Model.ActionPlan_ActionPlanList item in actionList) + foreach (var item in payRegistrations) { - Model.Manager_Month_PlanC plan = new Model.Manager_Month_PlanC - { - PlanId = item.ActionPlanListId, - PlanName = item.ActionPlanListName - }; - List userSelect = (from x in Funs.DB.Sys_User - join y in Funs.DB.Sys_FlowOperate - on x.UserId equals y.OperaterId - join z in Funs.DB.Project_ProjectUser - on y.OperaterId equals z.UserId - where (z.RoleId.Contains(BLL.Const.HSSEEngineer) || z.RoleId.Contains(BLL.Const.HSSEManager)) && y.MenuId == BLL.Const.ProjectActionPlanListMenuId && y.DataId == item.ActionPlanListId - select x).Distinct().ToList(); - if (userSelect.Count() > 0) - { - List users = userSelect.Distinct().ToList(); - string names = string.Empty; - foreach (var user in users) - { - names += user.UserName + ","; - } - if (!string.IsNullOrEmpty(names)) - { - names = names.Substring(0, names.LastIndexOf(",")); - } - plan.CompileMan = names; - } - if (item.CompileDate != null) - { - plan.CompileDate = string.Format("{0:yyyy-MM-dd}", item.CompileDate); - } - plans.Add(plan); + sMonthType1 += item.SMonthType1_1 + item.SMonthType1_2 + item.SMonthType1_3 + item.SMonthType1_4 + item.SMonthType1_5 + item.SMonthType1_6 + item.SMonthType1_7 + item.SMonthType1_8 + item.SMonthType1_9 + item.SMonthType1_10 + item.SMonthType1_11 + item.SMonthType1_12 + item.SMonthType1_13 + item.SMonthType1_14 + item.SMonthType1_15 + item.SMonthType1_16; + sMonthType2 += item.SMonthType2_1 + item.SMonthType2_2 + item.SMonthType2_3 + item.SMonthType2_4; + sMonthType3 += item.SMonthType3_1 + item.SMonthType3_2 + item.SMonthType3_3 + item.SMonthType3_4 + item.SMonthType3_5 + item.SMonthType3_6; + sMonthType4 += item.SMonthType4_1 + item.SMonthType4_2 + item.SMonthType4_3 + item.SMonthType4_4 + item.SMonthType4_5 + item.SMonthType4_6 + item.SMonthType4_7 + item.SMonthType4_8 + item.SMonthType4_9 + item.SMonthType4_10 + item.SMonthType4_11 + item.SMonthType4_12 + item.SMonthType4_13 + item.SMonthType4_14 + item.SMonthType4_15 + item.SMonthType4_16 + item.SMonthType4_17 + item.SMonthType4_18 + item.SMonthType4_19 + item.SMonthType4_20 + item.SMonthType4_21 + item.SMonthType4_22 + item.SMonthType4_23 + item.SMonthType4_24 + item.SMonthType4_25 + item.SMonthType4_26 + item.SMonthType4_27 + item.SMonthType4_28 + item.SMonthType4_29 + item.SMonthType4_30 + item.SMonthType4_31 + item.SMonthType4_32 + item.SMonthType4_33 + item.SMonthType4_34 + item.SMonthType4_35 + item.SMonthType4_35 + item.SMonthType4_36 + item.SMonthType4_37 + item.SMonthType4_38 + item.SMonthType4_39 + item.SMonthType4_40; + sMonthType5 += item.SMonthType5_1 + item.SMonthType5_2 + item.SMonthType5_3 + item.SMonthType5_4 + item.SMonthType5_5 + item.SMonthType5_6; + sMonthType6 += item.SMonthType6_1 + item.SMonthType6_2 + item.SMonthType6_3; + tMonthType1 += item.TMonthType1_1 + item.TMonthType1_2 + item.TMonthType1_3 + item.TMonthType1_4 + item.TMonthType1_5 + item.TMonthType1_6 + item.TMonthType1_7 + item.TMonthType1_8 + item.TMonthType1_9 + item.TMonthType1_10 + item.TMonthType1_11; } } - //管理规定 - List hseRuleList = BLL.ActionPlan_ManagerRuleService.GetManagerRuleListsByDate(startTime, endTime, this.ProjectId); - if (hseRuleList.Count > 0) - { - foreach (Model.ActionPlan_ManagerRule rule in hseRuleList) - { - Model.Manager_Month_PlanC plan = new Model.Manager_Month_PlanC - { - PlanId = rule.ManagerRuleId, - PlanName = rule.ManageRuleName - }; - List users = (from x in Funs.DB.Sys_User - join y in Funs.DB.Sys_FlowOperate - on x.UserId equals y.OperaterId - join z in Funs.DB.Project_ProjectUser - on y.OperaterId equals z.UserId - where (z.RoleId.Contains(BLL.Const.HSSEEngineer) || z.RoleId.Contains(BLL.Const.HSSEManager)) && y.MenuId == BLL.Const.ActionPlan_ManagerRuleMenuId && y.DataId == rule.ManagerRuleId - select x).Distinct().ToList(); - if (users.Count() > 0) - { - string names = string.Empty; - foreach (var user in users) - { - names += user.UserName + ","; - } - if (!string.IsNullOrEmpty(names)) - { - names = names.Substring(0, names.LastIndexOf(",")); - } - plan.CompileMan = names; - } - if (rule.CompileDate != null) - { - plan.CompileDate = string.Format("{0:yyyy-MM-dd}", rule.CompileDate); - } - plans.Add(plan); - } - } - this.gvMonthPlan.DataSource = plans; - this.gvMonthPlan.DataBind(); - } + #endregion - /// - /// 增加本月文件、方案修编情况说明 - /// - /// - /// - protected void btnNewMonthPlan_Click(object sender, EventArgs e) - { - jerqueSaveMonthPlanList(); - Model.Manager_Month_PlanC monthPlanSort = new Model.Manager_Month_PlanC + #region 五环（项目） + decimal? sProjectType1 = 0, sProjectType2 = 0, sProjectType3 = 0, sProjectType4 = 0, sProjectType5 = 0, sProjectType6 = 0; + decimal? tProjectType1 = 0; + List payRegistrationsPro = BLL.PayRegistrationService.GetPayRegistrationByPayDate(projectStartTime, endTime, this.ProjectId, BLL.Const.UnitId_CWCEC); + if (payRegistrationsPro != null) { - PlanId = SQLHelper.GetNewID(typeof(Model.Manager_Month_PlanC)) + foreach (var item in payRegistrationsPro) + { + sProjectType1 += item.SMonthType1_1 + item.SMonthType1_2 + item.SMonthType1_3 + item.SMonthType1_4 + item.SMonthType1_5 + item.SMonthType1_6 + item.SMonthType1_7 + item.SMonthType1_8 + item.SMonthType1_9 + item.SMonthType1_10 + item.SMonthType1_11 + item.SMonthType1_12 + item.SMonthType1_13 + item.SMonthType1_14 + item.SMonthType1_15 + item.SMonthType1_16; + sProjectType2 += item.SMonthType2_1 + item.SMonthType2_2 + item.SMonthType2_3 + item.SMonthType2_4; + sProjectType3 += item.SMonthType3_1 + item.SMonthType3_2 + item.SMonthType3_3 + item.SMonthType3_4 + item.SMonthType3_5 + item.SMonthType3_6; + sProjectType4 += item.SMonthType4_1 + item.SMonthType4_2 + item.SMonthType4_3 + item.SMonthType4_4 + item.SMonthType4_5 + item.SMonthType4_6 + item.SMonthType4_7 + item.SMonthType4_8 + item.SMonthType4_9 + item.SMonthType4_10 + item.SMonthType4_11 + item.SMonthType4_12 + item.SMonthType4_13 + item.SMonthType4_14 + item.SMonthType4_15 + item.SMonthType4_16 + item.SMonthType4_17 + item.SMonthType4_18 + item.SMonthType4_19 + item.SMonthType4_20 + item.SMonthType4_21 + item.SMonthType4_22 + item.SMonthType4_23 + item.SMonthType4_24 + item.SMonthType4_25 + item.SMonthType4_26 + item.SMonthType4_27 + item.SMonthType4_28 + item.SMonthType4_29 + item.SMonthType4_30 + item.SMonthType4_31 + item.SMonthType4_32 + item.SMonthType4_33 + item.SMonthType4_34 + item.SMonthType4_35 + item.SMonthType4_35 + item.SMonthType4_36 + item.SMonthType4_37 + item.SMonthType4_38 + item.SMonthType4_39 + item.SMonthType4_40; + sProjectType5 += item.SMonthType5_1 + item.SMonthType5_2 + item.SMonthType5_3 + item.SMonthType5_4 + item.SMonthType5_5 + item.SMonthType5_6; + sProjectType6 += item.SMonthType6_1 + item.SMonthType6_2 + item.SMonthType6_3; + tProjectType1 += item.TMonthType1_1 + item.TMonthType1_2 + item.TMonthType1_3 + item.TMonthType1_4 + item.TMonthType1_5 + item.TMonthType1_6 + item.TMonthType1_7 + item.TMonthType1_8 + item.TMonthType1_9 + item.TMonthType1_10 + item.TMonthType1_11; + } + } + #endregion + + #region 施工分包（本月） + decimal? sConMonthType1 = 0, sConMonthType2 = 0, sConMonthType3 = 0, sConMonthType4 = 0, sConMonthType5 = 0, sConMonthType6 = 0; + decimal? tConMonthType1 = 0; + List payRegistrationsConMonth = BLL.PayRegistrationService.GetConPayRegistrationByPayDate(startTime, endTime, this.ProjectId); + if (payRegistrationsConMonth != null) + { + foreach (var item in payRegistrationsConMonth) + { + sConMonthType1 += item.SMonthType1_1 + item.SMonthType1_2 + item.SMonthType1_3 + item.SMonthType1_4 + item.SMonthType1_5 + item.SMonthType1_6 + item.SMonthType1_7 + item.SMonthType1_8 + item.SMonthType1_9 + item.SMonthType1_10 + item.SMonthType1_11 + item.SMonthType1_12 + item.SMonthType1_13 + item.SMonthType1_14 + item.SMonthType1_15 + item.SMonthType1_16; + sConMonthType2 += item.SMonthType2_1 + item.SMonthType2_2 + item.SMonthType2_3 + item.SMonthType2_4; + sConMonthType3 += item.SMonthType3_1 + item.SMonthType3_2 + item.SMonthType3_3 + item.SMonthType3_4 + item.SMonthType3_5 + item.SMonthType3_6; + sConMonthType4 += item.SMonthType4_1 + item.SMonthType4_2 + item.SMonthType4_3 + item.SMonthType4_4 + item.SMonthType4_5 + item.SMonthType4_6 + item.SMonthType4_7 + item.SMonthType4_8 + item.SMonthType4_9 + item.SMonthType4_10 + item.SMonthType4_11 + item.SMonthType4_12 + item.SMonthType4_13 + item.SMonthType4_14 + item.SMonthType4_15 + item.SMonthType4_16 + item.SMonthType4_17 + item.SMonthType4_18 + item.SMonthType4_19 + item.SMonthType4_20 + item.SMonthType4_21 + item.SMonthType4_22 + item.SMonthType4_23 + item.SMonthType4_24 + item.SMonthType4_25 + item.SMonthType4_26 + item.SMonthType4_27 + item.SMonthType4_28 + item.SMonthType4_29 + item.SMonthType4_30 + item.SMonthType4_31 + item.SMonthType4_32 + item.SMonthType4_33 + item.SMonthType4_34 + item.SMonthType4_35 + item.SMonthType4_35 + item.SMonthType4_36 + item.SMonthType4_37 + item.SMonthType4_38 + item.SMonthType4_39 + item.SMonthType4_40; + sConMonthType5 += item.SMonthType5_1 + item.SMonthType5_2 + item.SMonthType5_3 + item.SMonthType5_4 + item.SMonthType5_5 + item.SMonthType5_6; + sConMonthType6 += item.SMonthType6_1 + item.SMonthType6_2 + item.SMonthType6_3; + tConMonthType1 += item.TMonthType1_1 + item.TMonthType1_2 + item.TMonthType1_3 + item.TMonthType1_4 + item.TMonthType1_5 + item.TMonthType1_6 + item.TMonthType1_7 + item.TMonthType1_8 + item.TMonthType1_9 + item.TMonthType1_10 + item.TMonthType1_11; + } + } + #endregion + + #region 施工分包（项目） + decimal? sConProjectType1 = 0, sConProjectType2 = 0, sConProjectType3 = 0, sConProjectType4 = 0, sConProjectType5 = 0, sConProjectType6 = 0; + decimal? tConProjectType1 = 0; + List payRegistrationsConPro = BLL.PayRegistrationService.GetConPayRegistrationByPayDate(projectStartTime, endTime, this.ProjectId); + if (payRegistrationsConPro != null) + { + foreach (var item in payRegistrationsConPro) + { + sConProjectType1 += item.SMonthType1_1 + item.SMonthType1_2 + item.SMonthType1_3 + item.SMonthType1_4 + item.SMonthType1_5 + item.SMonthType1_6 + item.SMonthType1_7 + item.SMonthType1_8 + item.SMonthType1_9 + item.SMonthType1_10 + item.SMonthType1_11 + item.SMonthType1_12 + item.SMonthType1_13 + item.SMonthType1_14 + item.SMonthType1_15 + item.SMonthType1_16; + sConProjectType2 += item.SMonthType2_1 + item.SMonthType2_2 + item.SMonthType2_3 + item.SMonthType2_4; + sConProjectType3 += item.SMonthType3_1 + item.SMonthType3_2 + item.SMonthType3_3 + item.SMonthType3_4 + item.SMonthType3_5 + item.SMonthType3_6; + sConProjectType4 += item.SMonthType4_1 + item.SMonthType4_2 + item.SMonthType4_3 + item.SMonthType4_4 + item.SMonthType4_5 + item.SMonthType4_6 + item.SMonthType4_7 + item.SMonthType4_8 + item.SMonthType4_9 + item.SMonthType4_10 + item.SMonthType4_11 + item.SMonthType4_12 + item.SMonthType4_13 + item.SMonthType4_14 + item.SMonthType4_15 + item.SMonthType4_16 + item.SMonthType4_17 + item.SMonthType4_18 + item.SMonthType4_19 + item.SMonthType4_20 + item.SMonthType4_21 + item.SMonthType4_22 + item.SMonthType4_23 + item.SMonthType4_24 + item.SMonthType4_25 + item.SMonthType4_26 + item.SMonthType4_27 + item.SMonthType4_28 + item.SMonthType4_29 + item.SMonthType4_30 + item.SMonthType4_31 + item.SMonthType4_32 + item.SMonthType4_33 + item.SMonthType4_34 + item.SMonthType4_35 + item.SMonthType4_35 + item.SMonthType4_36 + item.SMonthType4_37 + item.SMonthType4_38 + item.SMonthType4_39 + item.SMonthType4_40; + sConProjectType5 += item.SMonthType5_1 + item.SMonthType5_2 + item.SMonthType5_3 + item.SMonthType5_4 + item.SMonthType5_5 + item.SMonthType5_6; + sConProjectType6 += item.SMonthType6_1 + item.SMonthType6_2 + item.SMonthType6_3; + tConProjectType1 += item.TMonthType1_1 + item.TMonthType1_2 + item.TMonthType1_3 + item.TMonthType1_4 + item.TMonthType1_5 + item.TMonthType1_6 + item.TMonthType1_7 + item.TMonthType1_8 + item.TMonthType1_9 + item.TMonthType1_10 + item.TMonthType1_11; + } + } + #endregion + + int i = 0; + Model.Manager_Month_FiveExpenseC fiveExpense1 = new Model.Manager_Month_FiveExpenseC + { + FiveExpenseId = SQLHelper.GetNewID(typeof(Model.Manager_Month_FiveExpenseC)), + SortIndex = i, + InvestmentProject = "基础管理", + PlanCostMonth = sMonthType1,//五环工程（本月） + PlanCostYear = sProjectType1, //五环工程（项目累计） + ActualCostMonth = sConMonthType1,//施工分包商（本月） + ActualCostYear = sConProjectType1//施工分包商（项目累计） }; - plans.Add(monthPlanSort); - this.gvMonthPlan.DataSource = plans; - this.gvMonthPlan.DataBind(); - } + fiveExpenses.Add(fiveExpense1); + i++; - /// - /// 检查并保存其他HSE管理活动集合 - /// - private void jerqueSaveMonthPlanList() - { - plans.Clear(); - JArray mergedData = gvMonthPlan.GetMergedData(); - foreach (JObject mergedRow in mergedData) + Model.Manager_Month_FiveExpenseC fiveExpense2 = new Model.Manager_Month_FiveExpenseC { - string status = mergedRow.Value("status"); - JObject values = mergedRow.Value("values"); - int i = mergedRow.Value("index"); - Model.Manager_Month_PlanC monthPlanSort = new Model.Manager_Month_PlanC - { - PlanId = this.gvMonthPlan.Rows[i].DataKeys[0].ToString(), - SortIndex = i, - PlanName = values.Value("PlanName").ToString(), - CompileMan = values.Value("CompileMan").ToString(), - CompileDate = values.Value("CompileDate").ToString() - }; - plans.Add(monthPlanSort); - } - } - - protected void gvMonthPlan_RowCommand(object sender, GridCommandEventArgs e) - { - jerqueSaveMonthPlanList(); - string rowID = this.gvMonthPlan.DataKeys[e.RowIndex][0].ToString(); - if (e.CommandName == "Delete") - { - foreach (var item in plans) - { - if (item.PlanId == rowID) - { - plans.Remove(item); - break; - } - } - gvMonthPlan.DataSource = plans; - gvMonthPlan.DataBind(); - ShowNotify("删除数据成功!", MessageBoxIcon.Success); - } - } - - /// - /// 审查记录修编情况修编、审核 - /// - private void GetReviewRecordSort() - { - //施工方案 - List constructSolution = BLL.ConstructSolutionService.GetConstructSolutionListByDate(this.ProjectId, startTime, endTime); - if (constructSolution.Count > 0) - { - foreach (Model.Solution_ConstructSolution item in constructSolution) - { - Model.Manager_Month_ReviewRecordC reviewRecord = new Model.Manager_Month_ReviewRecordC - { - ReviewRecordId = SQLHelper.GetNewID(typeof(Model.Manager_Month_ReviewRecordC)), - ReviewRecordName = item.ConstructSolutionName - }; - List users = (from x in Funs.DB.Sys_User - join y in Funs.DB.Sys_FlowOperate - on x.UserId equals y.OperaterId - join z in Funs.DB.Project_ProjectUser - on y.OperaterId equals z.UserId - where (z.RoleId.Contains(BLL.Const.HSSEEngineer) || z.RoleId.Contains(BLL.Const.HSSEManager)) && y.MenuId == BLL.Const.ProjectConstructSolutionMenuId && y.DataId == item.ConstructSolutionId - select x).Distinct().ToList(); - if (users.Count() > 0) - { - string names = string.Empty; - foreach (var user in users) - { - names += user.UserName + ","; - } - if (!string.IsNullOrEmpty(names)) - { - names = names.Substring(0, names.LastIndexOf(",")); - } - reviewRecord.ReviewMan = names; - } - - if (item.CompileDate != null) - { - reviewRecord.ReviewDate = string.Format("{0:yyyy-MM-dd}", item.CompileDate); - } - reviewRecords.Add(reviewRecord); - } - } - //分包商审核记录 - List subUnitDetails = BLL.SubUnitQualityAuditDetailService.GetListByDate(this.ProjectId, startTime, endTime); - if (subUnitDetails.Count > 0) - { - foreach (Model.QualityAudit_SubUnitQualityAuditDetail item in subUnitDetails) - { - Model.Manager_Month_ReviewRecordC reviewRecord = new Model.Manager_Month_ReviewRecordC - { - ReviewRecordId = SQLHelper.GetNewID(typeof(Model.Manager_Month_ReviewRecordC)), - ReviewRecordName = item.AuditContent - }; - Model.Sys_User user = BLL.UserService.GetUserByUserId(item.AuditMan); - if (user != null) - { - reviewRecord.ReviewMan = user.UserName; - } - if (item.AuditDate != null) - { - reviewRecord.ReviewDate = string.Format("{0:yyyy-MM-dd}", item.AuditDate); - } - reviewRecords.Add(reviewRecord); - } - } - //特种设备审核记录 - List equipmentDetails = BLL.EquipmentQualityAuditDetailService.GetListByDate(this.ProjectId, startTime, endTime); - if (equipmentDetails.Count > 0) - { - foreach (Model.QualityAudit_EquipmentQualityAuditDetail item in equipmentDetails) - { - Model.Manager_Month_ReviewRecordC reviewRecord = new Model.Manager_Month_ReviewRecordC - { - ReviewRecordId = SQLHelper.GetNewID(typeof(Model.Manager_Month_ReviewRecordC)), - ReviewRecordName = item.AuditContent - }; - Model.Sys_User user = BLL.UserService.GetUserByUserId(item.AuditMan); - if (user != null) - { - reviewRecord.ReviewMan = user.UserName; - } - if (item.AuditDate != null) - { - reviewRecord.ReviewDate = string.Format("{0:yyyy-MM-dd}", item.AuditDate); - } - reviewRecords.Add(reviewRecord); - } - } - //特岗人员资质 - List personDetails = BLL.PersonQualityService.GetListByDate(this.ProjectId, startTime, endTime); - if (personDetails.Count > 0) - { - foreach (Model.QualityAudit_PersonQuality item in personDetails) - { - Model.Manager_Month_ReviewRecordC reviewRecord = new Model.Manager_Month_ReviewRecordC - { - ReviewRecordId = SQLHelper.GetNewID(typeof(Model.Manager_Month_ReviewRecordC)) - }; - string personName = string.Empty; - Model.SitePerson_Person person = BLL.PersonService.GetPersonById(item.PersonId); - if (person != null) - { - personName = person.PersonName; - } - reviewRecord.ReviewRecordName = personName + "(" + item.CertificateName + ")"; - reviewRecord.ReviewMan = item.ApprovalPerson; - if (item.AuditDate != null) - { - reviewRecord.ReviewDate = string.Format("{0:yyyy-MM-dd}", item.AuditDate); - } - reviewRecords.Add(reviewRecord); - } - } - //一般机具资质 - List generalEquipmentDetails = BLL.GeneralEquipmentQualityService.GetListByDate(this.ProjectId, startTime, endTime); - if (generalEquipmentDetails.Count > 0) - { - foreach (Model.QualityAudit_GeneralEquipmentQuality item in generalEquipmentDetails) - { - Model.Manager_Month_ReviewRecordC reviewRecord = new Model.Manager_Month_ReviewRecordC - { - ReviewRecordId = SQLHelper.GetNewID(typeof(Model.Manager_Month_ReviewRecordC)) - }; - string generalEquipmentName = string.Empty; - Model.Base_SpecialEquipment specialEquipment = BLL.SpecialEquipmentService.GetSpecialEquipmentById(item.SpecialEquipmentId); - if (specialEquipment != null) - { - generalEquipmentName = specialEquipment.SpecialEquipmentName; - } - reviewRecord.ReviewRecordName = generalEquipmentName + "(" + item.EquipmentCount.ToString() + ")"; - Model.Sys_User user = BLL.UserService.GetUserByUserId(item.CompileMan); - if (user != null) - { - reviewRecord.ReviewMan = user.UserName; - } - if (item.InDate != null) - { - reviewRecord.ReviewDate = string.Format("{0:yyyy-MM-dd}", item.InDate); - } - reviewRecords.Add(reviewRecord); - } - } - this.gvReviewRecord.DataSource = reviewRecords; - this.gvReviewRecord.DataBind(); - } - - /// - /// 增加本月文件、方案修编情况说明 - /// - /// - /// - protected void btnNewReviewRecord_Click(object sender, EventArgs e) - { - jerqueSaveReviewRecordList(); - Model.Manager_Month_ReviewRecordC reviewRecordSort = new Model.Manager_Month_ReviewRecordC - { - ReviewRecordId = SQLHelper.GetNewID(typeof(Model.Manager_Month_ReviewRecordC)) + FiveExpenseId = SQLHelper.GetNewID(typeof(Model.Manager_Month_FiveExpenseC)), + SortIndex = i, + InvestmentProject = "安全技术", + PlanCostMonth = sMonthType2,//五环工程（本月） + PlanCostYear = sProjectType2, //五环工程（项目累计） + ActualCostMonth = sConMonthType2,//施工分包商（本月） + ActualCostYear = sConProjectType2//施工分包商（项目累计） }; - reviewRecords.Add(reviewRecordSort); - this.gvReviewRecord.DataSource = reviewRecords; - this.gvReviewRecord.DataBind(); - } + fiveExpenses.Add(fiveExpense2); + i++; + Model.Manager_Month_FiveExpenseC fiveExpense3 = new Model.Manager_Month_FiveExpenseC + { + FiveExpenseId = SQLHelper.GetNewID(typeof(Model.Manager_Month_FiveExpenseC)), + SortIndex = i, + InvestmentProject = "职业健康", + PlanCostMonth = sMonthType3,//五环工程（本月） + PlanCostYear = sProjectType3, //五环工程（项目累计） + ActualCostMonth = sConMonthType3,//施工分包商（本月） + ActualCostYear = sConProjectType3//施工分包商（项目累计） + }; + fiveExpenses.Add(fiveExpense3); + i++; + + Model.Manager_Month_FiveExpenseC fiveExpense4 = new Model.Manager_Month_FiveExpenseC + { + FiveExpenseId = SQLHelper.GetNewID(typeof(Model.Manager_Month_FiveExpenseC)), + SortIndex = i, + InvestmentProject = "安全防护", + PlanCostMonth = sMonthType4,//五环工程（本月） + PlanCostYear = sProjectType4, //五环工程（项目累计） + ActualCostMonth = sConMonthType4,//施工分包商（本月） + ActualCostYear = sConProjectType4//施工分包商（项目累计） + }; + fiveExpenses.Add(fiveExpense4); + i++; + + Model.Manager_Month_FiveExpenseC fiveExpense5 = new Model.Manager_Month_FiveExpenseC + { + FiveExpenseId = SQLHelper.GetNewID(typeof(Model.Manager_Month_FiveExpenseC)), + SortIndex = i, + InvestmentProject = "化工试车", + PlanCostMonth = sMonthType5,//五环工程（本月） + PlanCostYear = sProjectType5, //五环工程（项目累计） + ActualCostMonth = sConMonthType5,//施工分包商（本月） + ActualCostYear = sConProjectType5//施工分包商（项目累计） + }; + fiveExpenses.Add(fiveExpense5); + i++; + + Model.Manager_Month_FiveExpenseC fiveExpense6 = new Model.Manager_Month_FiveExpenseC + { + FiveExpenseId = SQLHelper.GetNewID(typeof(Model.Manager_Month_FiveExpenseC)), + SortIndex = i, + InvestmentProject = "教育培训", + PlanCostMonth = sMonthType6,//五环工程（本月） + PlanCostYear = sProjectType6, //五环工程（项目累计） + ActualCostMonth = sConMonthType6,//施工分包商（本月） + ActualCostYear = sConProjectType6//施工分包商（项目累计） + }; + fiveExpenses.Add(fiveExpense6); + i++; + + Model.Manager_Month_FiveExpenseC fiveExpense7 = new Model.Manager_Month_FiveExpenseC + { + FiveExpenseId = SQLHelper.GetNewID(typeof(Model.Manager_Month_FiveExpenseC)), + SortIndex = i, + InvestmentProject = "文明施工环境保护", + PlanCostMonth = tMonthType1,//五环工程（本月） + PlanCostYear = tMonthType1, //五环工程（项目累计） + ActualCostMonth = tConMonthType1,//施工分包商（本月） + ActualCostYear = tConProjectType1//施工分包商（项目累计） + }; + fiveExpenses.Add(fiveExpense7); + + this.gvFiveExpenseC.DataSource = fiveExpenses; + this.gvFiveExpenseC.DataBind(); + + OutputSummaryData(); + } /// - /// 检查并保存其他HSE管理活动集合 + /// 求和 /// - private void jerqueSaveReviewRecordList() + private void OutputSummaryData() { - reviewRecords.Clear(); - JArray mergedData = gvReviewRecord.GetMergedData(); - foreach (JObject mergedRow in mergedData) + JObject summary = new JObject(); + + decimal TotalPlanCostMonth = 0, TotalPlanCostYear = 0, TotalActualCostMonth = 0, TotalActualCostYear = 0; + foreach (JObject mergedRow in gvFiveExpenseC.GetMergedData()) { - string status = mergedRow.Value("status"); JObject values = mergedRow.Value("values"); - int i = mergedRow.Value("index"); - Model.Manager_Month_ReviewRecordC reviewRecordSort = new Model.Manager_Month_ReviewRecordC + if (!string.IsNullOrEmpty(values["PlanCostMonth"].ToString())) { - ReviewRecordId = this.gvReviewRecord.Rows[i].DataKeys[0].ToString(), - SortIndex = i, - ReviewRecordName = values.Value("ReviewRecordName").ToString(), - ReviewMan = values.Value("ReviewMan").ToString(), - ReviewDate = values.Value("ReviewDate").ToString() - }; - reviewRecords.Add(reviewRecordSort); + TotalPlanCostMonth += values.Value("PlanCostMonth"); + } + if (!string.IsNullOrEmpty(values["PlanCostYear"].ToString())) + { + TotalPlanCostYear += values.Value("PlanCostYear"); + } + if (!string.IsNullOrEmpty(values["ActualCostMonth"].ToString())) + { + TotalActualCostMonth += values.Value("ActualCostMonth"); + } + if (!string.IsNullOrEmpty(values["ActualCostYear"].ToString())) + { + TotalActualCostYear += values.Value("ActualCostYear"); + } } + summary.Add("InvestmentProject", "合计"); + summary.Add("PlanCostMonth", TotalPlanCostMonth.ToString("F2")); + summary.Add("PlanCostYear", TotalPlanCostYear.ToString("F2")); + summary.Add("ActualCostMonth", TotalActualCostMonth.ToString("F2")); + summary.Add("ActualCostYear", TotalActualCostYear.ToString("F2")); + + gvFiveExpenseC.SummaryData = summary; } - protected void gvReviewRecord_RowCommand(object sender, GridCommandEventArgs e) + #endregion + + #region 本月项目分包商HSE费用支付统计 + /// + /// 绑定数据 + /// + private void GetSubExpenseList() { - jerqueSaveReviewRecordList(); - string rowID = this.gvReviewRecord.DataKeys[e.RowIndex][0].ToString(); - if (e.CommandName == "Delete") + var units = from x in Funs.DB.Project_ProjectUnit + where x.ProjectId == this.ProjectId && x.UnitType == "2" + orderby x.UnitType + select x; + if (units.Count() > 0) { - foreach (var item in reviewRecords) + foreach (Model.Project_ProjectUnit u in units) { - if (item.ReviewRecordId == rowID) + Model.Manager_Month_SubExpenseC subExpense = new Model.Manager_Month_SubExpenseC { - reviewRecords.Remove(item); - break; - } + SubExpenseId = SQLHelper.GetNewID(typeof(Model.Manager_Month_SubExpenseC)), + SubUnit =BLL.UnitService.GetUnitNameByUnitId(u.UnitId), + ContractAmount = BLL.SubPayRegistrationService.GetSubPaySMonthTypeByUnitId(u.UnitId, startTime,endTime), + MonthApprovalAmount = BLL.SubPayRegistrationService.GetSubPayRegistrationByUnitId(u.UnitId, startTime, endTime), + ProjectApprovalAmount = BLL.SubPayRegistrationService.GetSubPayRegistrationByUnitId(u.UnitId, projectStartTime, endTime), + }; + + subExpenses.Add(subExpense); } - gvReviewRecord.DataSource = reviewRecords; - gvReviewRecord.DataBind(); - ShowNotify("删除数据成功!", MessageBoxIcon.Success); } + this.gvSubExpenseC.DataSource = subExpenses; + this.gvSubExpenseC.DataBind(); + OutputSubSummaryData(); + } + /// + /// 求和 + /// + private void OutputSubSummaryData() + { + JObject summary = new JObject(); + + decimal TotalContractAmount = 0, TotalMonthApprovalAmount = 0, TotalProjectApprovalAmount = 0; + foreach (JObject mergedRow in gvSubExpenseC.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + if (!string.IsNullOrEmpty(values["ContractAmount"].ToString())) + { + TotalContractAmount += values.Value("ContractAmount"); + } + if (!string.IsNullOrEmpty(values["MonthApprovalAmount"].ToString())) + { + TotalMonthApprovalAmount += values.Value("MonthApprovalAmount"); + } + if (!string.IsNullOrEmpty(values["ProjectApprovalAmount"].ToString())) + { + TotalProjectApprovalAmount += values.Value("ProjectApprovalAmount"); + } + } + summary.Add("SubUnit", "合计"); + summary.Add("ContractAmount", TotalContractAmount.ToString("F2")); + summary.Add("MonthApprovalAmount", TotalMonthApprovalAmount.ToString("F2")); + summary.Add("ProjectApprovalAmount", TotalProjectApprovalAmount.ToString("F2")); + + gvSubExpenseC.SummaryData = summary; } #endregion @@ -510,8 +414,8 @@ namespace FineUIPro.Web.HSSE.Manager if (oldMonthReport != null) { BLL.MonthReportCService.UpdateMonthReport(oldMonthReport); - OperatePlanSort(MonthReportId); - OperateReviewRecordSort(MonthReportId); + OperateFiveExpenseSort(oldMonthReport.MonthReportId); + OperateSubExpenseSort(oldMonthReport.MonthReportId); BLL.LogService.AddSys_Log(this.CurrUser, oldMonthReport.MonthReportCode, oldMonthReport.MonthReportId, BLL.Const.ProjectManagerMonthCMenuId, BLL.Const.BtnModify); } else @@ -520,49 +424,105 @@ namespace FineUIPro.Web.HSSE.Manager string newKeyID = SQLHelper.GetNewID(typeof(Model.Manager_MonthReportC)); monthReport.MonthReportId = newKeyID; monthReport.ProjectId = this.CurrUser.LoginProjectId; - this.MonthReportId = newKeyID; + this.newKeyID = newKeyID; monthReport.MonthReportCode = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(BLL.Const.ProjectManagerMonthCMenuId, this.ProjectId, this.CurrUser.UnitId); monthReport.Months = Funs.GetNewDateTime(Request.Params["months"]); monthReport.ReportMan = this.CurrUser.UserId; monthReport.MonthReportDate = DateTime.Now; BLL.MonthReportCService.AddMonthReport(monthReport); - OperatePlanSort(MonthReportId); - OperateReviewRecordSort(MonthReportId); + OperateFiveExpenseSort(newKeyID); + OperateSubExpenseSort(newKeyID); BLL.LogService.AddSys_Log(this.CurrUser, monthReport.MonthReportCode, monthReport.MonthReportId, BLL.Const.ProjectManagerMonthCMenuId, BLL.Const.BtnAdd); } ShowNotify("保存成功!", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); } + #region 保存本月项目HSE费用投入统计 /// - /// 5.1.2 本月文件、方案修编情况说明 + /// 本月项目HSE费用投入统计 /// /// - private void OperatePlanSort(string monthReportId) + private void OperateFiveExpenseSort(string monthReportId) { - BLL.PlanCService.DeletePlanByMonthReportId(monthReportId); - jerqueSaveMonthPlanList(); - foreach (Model.Manager_Month_PlanC plan in plans) + BLL.FiveExpenseCService.DeleteFiveExpenseByMonthReportId(monthReportId); + jerqueSaveFiveExpenseList(); + foreach (Model.Manager_Month_FiveExpenseC fiveExpendse in fiveExpenses) { - plan.MonthReportId = monthReportId; - BLL.PlanCService.AddPlan(plan); + fiveExpendse.MonthReportId = monthReportId; + BLL.FiveExpenseCService.AddFiveExpense(fiveExpendse); } } /// - /// 5.2.2 详细审查记录 + /// 保存本月项目HSE费用投入统计数据 /// - /// - private void OperateReviewRecordSort(string monthReportId) + private void jerqueSaveFiveExpenseList() { - BLL.ReviewRecordCService.DeleteReviewRecordByMonthReportId(monthReportId); - jerqueSaveReviewRecordList(); - foreach (Model.Manager_Month_ReviewRecordC reviewRecord in reviewRecords) + fiveExpenses.Clear(); + JArray mergedData = gvFiveExpenseC.GetMergedData(); + foreach (JObject mergedRow in mergedData) { - reviewRecord.MonthReportId = monthReportId; - BLL.ReviewRecordCService.AddReviewRecord(reviewRecord); + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + Model.Manager_Month_FiveExpenseC trainSort = new Model.Manager_Month_FiveExpenseC + { + FiveExpenseId = this.gvFiveExpenseC.Rows[i].DataKeys[0].ToString(), + SortIndex = i, + InvestmentProject = values.Value("InvestmentProject").ToString(), + PlanCostMonth = Funs.GetNewDecimal(values.Value("PlanCostMonth").ToString()), + PlanCostYear = Funs.GetNewDecimal(values.Value("PlanCostYear").ToString()), + ActualCostMonth = Funs.GetNewDecimal(values.Value("ActualCostMonth").ToString()), + ActualCostYear = Funs.GetNewDecimal(values.Value("ActualCostYear").ToString()) + }; + fiveExpenses.Add(trainSort); } } #endregion + + #region 保存本月项目分包商HSE费用支付统计 + /// + /// 本月项目分包商HSE费用支付统计 + /// + /// + private void OperateSubExpenseSort(string monthReportId) + { + BLL.SubExpenseCService.DeleteSubExpenseByMonthReportId(monthReportId); + jerqueSaveSubExpenseList(); + foreach (Model.Manager_Month_SubExpenseC subExpendse in subExpenses) + { + subExpendse.MonthReportId = monthReportId; + BLL.SubExpenseCService.AddSubExpense(subExpendse); + } + } + + /// + /// 保存本月项目分包商HSE费用支付统计数据 + /// + private void jerqueSaveSubExpenseList() + { + subExpenses.Clear(); + JArray mergedData = gvSubExpenseC.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + Model.Manager_Month_SubExpenseC trainSort = new Model.Manager_Month_SubExpenseC + { + SubExpenseId = this.gvSubExpenseC.Rows[i].DataKeys[0].ToString(), + SortIndex = i, + SubUnit = values.Value("SubUnit").ToString(), + ContractAmount = Funs.GetNewDecimal(values.Value("ContractAmount").ToString()), + MonthApprovalAmount = Funs.GetNewDecimal(values.Value("MonthApprovalAmount").ToString()), + ProjectApprovalAmount = Funs.GetNewDecimal(values.Value("ProjectApprovalAmount").ToString()) + }; + subExpenses.Add(trainSort); + } + } + #endregion + + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx.designer.cs index 2f2d76a1..0a099139 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit5.aspx.designer.cs @@ -40,139 +40,130 @@ namespace FineUIPro.Web.HSSE.Manager { protected global::FineUIPro.Form SimpleForm1; /// - /// GroupPanel34 控件。 + /// GroupPanel1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.GroupPanel GroupPanel34; + protected global::FineUIPro.GroupPanel GroupPanel1; /// - /// GroupPanel37 控件。 + /// GroupPanel2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.GroupPanel GroupPanel37; + protected global::FineUIPro.GroupPanel GroupPanel2; /// - /// gvMonthPlan 控件。 + /// gvFiveExpenseC 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Grid gvMonthPlan; + protected global::FineUIPro.Grid gvFiveExpenseC; /// - /// Toolbar15 控件。 + /// txtCheckType 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Toolbar Toolbar15; + protected global::FineUIPro.TextBox txtCheckType; /// - /// btnNewMonthPlan 控件。 + /// TextBox1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnNewMonthPlan; + protected global::FineUIPro.TextBox TextBox1; /// - /// TextBox36 控件。 + /// TextBox2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox36; + protected global::FineUIPro.TextBox TextBox2; /// - /// TextBox37 控件。 + /// TextBox3 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox37; + protected global::FineUIPro.TextBox TextBox3; /// - /// TextBox38 控件。 + /// TextBox4 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox38; + protected global::FineUIPro.TextBox TextBox4; /// - /// GroupPanel38 控件。 + /// GroupPanel27 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.GroupPanel GroupPanel38; + protected global::FineUIPro.GroupPanel GroupPanel27; /// - /// gvReviewRecord 控件。 + /// gvSubExpenseC 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Grid gvReviewRecord; + protected global::FineUIPro.Grid gvSubExpenseC; /// - /// Toolbar16 控件。 + /// TextBox5 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Toolbar Toolbar16; + protected global::FineUIPro.TextBox TextBox5; /// - /// btnNewReviewRecord 控件。 + /// NumberBox4 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnNewReviewRecord; + protected global::FineUIPro.NumberBox NumberBox4; /// - /// TextBox39 控件。 + /// NumberBox3 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox39; + protected global::FineUIPro.NumberBox NumberBox3; /// - /// TextBox40 控件。 + /// NumberBox2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox40; - - /// - /// TextBox41 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox41; + protected global::FineUIPro.NumberBox NumberBox2; /// /// Toolbar1 控件。 diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx index 4af6ad87..e4114ee9 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx @@ -1,353 +1,224 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthReportCEdit6.aspx.cs" Inherits="FineUIPro.Web.HSSE.Manager.MonthReportCEdit6" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthReportCEdit6.aspx.cs" + Inherits="FineUIPro.Web.HSSE.Manager.MonthReportCEdit6" %> - - 本月项目HSE费用管理 - - + HSE责任事故/事件描述
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 序号 - - 投入项目 - - 五环工程 - - 施工分包商 - - 建安产值 -
- 本月 - - 项目累计 - - 本月 - - 项目累计 - - 本月 - - 项目累计 -
- 1 - - 基础管理 - - - - - - - - - - - - - - - - - - -
- 2 - - 安全技术 - - - - - - - - - - - - -
- 3 - - 职业健康 - - - - - - - - - - - - -
- 4 - - 安全防护 - - - - - - - - - - - - -
- 5 - - 化工试车 - - - - - - - - - - - - -
- 6 - - 教育培训 - - - - - - - - - - - - -
- 7 - - 文明施工环境保护 - - - - - - - - - - - - -
- 合计 - - - - - - - - - - - - -
- - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + + + + + --%> + + <%----%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.cs index 30b4b966..59b66eee 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.cs @@ -52,14 +52,19 @@ namespace FineUIPro.Web.HSSE.Manager #region 定义集合 /// - /// 6.1 五环HSE费用投入集合 + /// 本月伤害事故统计 /// - private static List fiveExpenses = new List(); + private static List injuryAccidents = new List(); /// - /// 6.2 分包商HSE费用投入集合 + /// 无伤害事故统计 /// - private static List subExpenses = new List(); + private static List noInjuryAccidents = new List(); + + /// + /// HSE绩效指标 + /// + private static List performanceIndicators = new List(); #endregion @@ -70,8 +75,9 @@ namespace FineUIPro.Web.HSSE.Manager { if (!IsPostBack) { - fiveExpenses.Clear(); - subExpenses.Clear(); + injuryAccidents.Clear(); + noInjuryAccidents.Clear(); + performanceIndicators.Clear(); this.MonthReportId = Request.Params["monthReportId"]; this.ProjectId = this.CurrUser.LoginProjectId; DateTime months = Convert.ToDateTime(Request.Params["months"]); @@ -90,155 +96,326 @@ namespace FineUIPro.Web.HSSE.Manager this.MonthReportId = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; months = Convert.ToDateTime(monthReport.Months); - Model.SGGLDB db = Funs.DB; - this.nbMainCost1.Text = (monthReport.MainCost1 ?? 0).ToString(); - this.nbMainProjectCost1.Text = (monthReport.MainProjectCost1 ?? 0).ToString(); - this.nbSubCost1.Text = (monthReport.SubCost1 ?? 0).ToString(); - this.nbSubProjectCost1.Text = (monthReport.SubProjectCost1 ?? 0).ToString(); - this.nbMainCost2.Text = (monthReport.MainCost2 ?? 0).ToString(); - this.nbMainProjectCost2.Text = (monthReport.MainProjectCost2 ?? 0).ToString(); - this.nbSubCost2.Text = (monthReport.SubCost2 ?? 0).ToString(); - this.nbSubProjectCost2.Text = (monthReport.SubProjectCost2 ?? 0).ToString(); - this.nbMainCost3.Text = (monthReport.MainCost3 ?? 0).ToString(); - this.nbMainProjectCost3.Text = (monthReport.MainProjectCost3 ?? 0).ToString(); - this.nbSubCost3.Text = (monthReport.SubCost3 ?? 0).ToString(); - this.nbSubProjectCost3.Text = (monthReport.SubProjectCost3 ?? 0).ToString(); - this.nbMainCost4.Text = (monthReport.MainCost4 ?? 0).ToString(); - this.nbMainProjectCost4.Text = (monthReport.MainProjectCost4 ?? 0).ToString(); - this.nbSubCost4.Text = (monthReport.SubCost4 ?? 0).ToString(); - this.nbSubProjectCost4.Text = (monthReport.SubProjectCost4 ?? 0).ToString(); - this.nbMainCost5.Text = (monthReport.MainCost5 ?? 0).ToString(); - this.nbMainProjectCost5.Text = (monthReport.MainProjectCost5 ?? 0).ToString(); - this.nbSubCost5.Text = (monthReport.SubCost5 ?? 0).ToString(); - this.nbSubProjectCost5.Text = (monthReport.SubProjectCost5 ?? 0).ToString(); - this.nbMainCost6.Text = (monthReport.MainCost6 ?? 0).ToString(); - this.nbMainProjectCost6.Text = (monthReport.MainProjectCost6 ?? 0).ToString(); - this.nbSubCost6.Text = (monthReport.SubCost6 ?? 0).ToString(); - this.nbSubProjectCost6.Text = (monthReport.SubProjectCost6 ?? 0).ToString(); - this.nbMainCost7.Text = (monthReport.MainCost7 ?? 0).ToString(); - this.nbMainProjectCost7.Text = (monthReport.MainProjectCost7 ?? 0).ToString(); - this.nbSubCost7.Text = (monthReport.SubCost7 ?? 0).ToString(); - this.nbSubProjectCost7.Text = (monthReport.SubProjectCost7 ?? 0).ToString(); - this.nbMainCost.Text = (monthReport.MainCost ?? 0).ToString(); - this.nbMainProjectCost.Text = (monthReport.MainProjectCost ?? 0).ToString(); - this.nbSubCost.Text = (monthReport.SubCost ?? 0).ToString(); - this.nbSubProjectCost.Text = (monthReport.SubProjectCost ?? 0).ToString(); - this.nbJianAnCost.Text = (monthReport.JianAnCost ?? 0).ToString(); - this.nbJianAnProjectCost.Text = (monthReport.JianAnProjectCost ?? 0).ToString(); + txtDef.Text = monthReport.AccidentDef; + + #region 本月伤害事故统计 + injuryAccidents = BLL.InjuryAccidentCService.GetInjuryAccidentCByMonthReportId(this.MonthReportId); + if (injuryAccidents.Count > 0) + { + this.gvInjuryAccident.DataSource = injuryAccidents; + this.gvInjuryAccident.DataBind(); + OutputSummaryData(); + } + else + { + GetInjuryAccident(); + } + #endregion + + #region 本月无伤害事故统计 + noInjuryAccidents = BLL.NoInjuryAccidentCService.GetNoInjuryAccidentByMonthReportId(this.MonthReportId); + if (noInjuryAccidents.Count > 0) + { + this.gvNoInjuryAccident.DataSource = noInjuryAccidents; + this.gvNoInjuryAccident.DataBind(); + } + else + { + GetNoInjuryAccident(); + } + #endregion + + #region HSE绩效指标 + performanceIndicators = BLL.PerformanceIndicatorCService.GetPerformanceIndicatorByMonthReportId(this.MonthReportId); + if (performanceIndicators.Count > 0) + { + this.gvPerformanceIndicator.DataSource = performanceIndicators; + this.gvPerformanceIndicator.DataBind(); + } + else + { + GetPerformanceIndicator(); + } + #endregion } else { - GetFiveExpenseList(); //费用投入 + GetInjuryAccident(); + GetNoInjuryAccident(); + GetPerformanceIndicator(); } } } - #endregion - #region 费用投入 + #region 本月伤害事故统计 /// - /// 费用投入 + /// 本月伤害事故统计 /// - private void GetFiveExpenseList() + private void GetInjuryAccident() { - Model.Manager_MonthReportC mr = BLL.MonthReportCService.GetLastMonthReportByDate(endTime, this.ProjectId); - decimal? sMonthType1 = 0, sMonthType2 = 0, sMonthType3 = 0, sMonthType4 = 0, sMonthType5 = 0, sMonthType6 = 0; - decimal? tMonthType1 = 0, tMonthType2 = 0; - List payRegistrations = BLL.PayRegistrationService.GetPayRegistrationByPayDate(startTime, endTime, this.ProjectId); - if (payRegistrations != null) + List reports = AccidentReportService.GetAccidentReportsByAccidentTime(startTime, endTime, this.ProjectId); + List deathReports = AccidentReportService.GetAccidentReportsByAccidentType("1", startTime, endTime, this.ProjectId); + int i = 0; + Model.Manager_Month_InjuryAccidentC injury = new Model.Manager_Month_InjuryAccidentC { - foreach (var item in payRegistrations) - { - sMonthType1 += item.SMonthType1_1 + item.SMonthType1_2 + item.SMonthType1_3 + item.SMonthType1_4 + item.SMonthType1_5 + item.SMonthType1_6 + item.SMonthType1_7 + item.SMonthType1_8 + item.SMonthType1_9 + item.SMonthType1_10 + item.SMonthType1_11 + item.SMonthType1_12 + item.SMonthType1_13 + item.SMonthType1_14 + item.SMonthType1_15 + item.SMonthType1_16; - sMonthType2 += item.SMonthType2_1 + item.SMonthType2_2 + item.SMonthType2_3 + item.SMonthType2_4; - sMonthType3 += item.SMonthType3_1 + item.SMonthType3_2 + item.SMonthType3_3 + item.SMonthType3_4 + item.SMonthType3_5 + item.SMonthType3_6; - sMonthType4 += item.SMonthType4_1 + item.SMonthType4_2 + item.SMonthType4_3 + item.SMonthType4_4 + item.SMonthType4_5 + item.SMonthType4_6 + item.SMonthType4_7 + item.SMonthType4_8 + item.SMonthType4_9 + item.SMonthType4_10 + item.SMonthType4_11 + item.SMonthType4_12 + item.SMonthType4_13 + item.SMonthType4_14 + item.SMonthType4_15 + item.SMonthType4_16 + item.SMonthType4_17 + item.SMonthType4_18 + item.SMonthType4_19 + item.SMonthType4_20 + item.SMonthType4_21 + item.SMonthType4_22 + item.SMonthType4_23 + item.SMonthType4_24 + item.SMonthType4_25 + item.SMonthType4_26 + item.SMonthType4_27 + item.SMonthType4_28 + item.SMonthType4_29 + item.SMonthType4_30 + item.SMonthType4_31 + item.SMonthType4_32 + item.SMonthType4_33 + item.SMonthType4_34 + item.SMonthType4_35 + item.SMonthType4_35 + item.SMonthType4_36 + item.SMonthType4_37 + item.SMonthType4_38 + item.SMonthType4_39 + item.SMonthType4_40; - sMonthType5 += item.SMonthType5_1 + item.SMonthType5_2 + item.SMonthType5_3 + item.SMonthType5_4 + item.SMonthType5_5 + item.SMonthType5_6; - sMonthType6 += item.SMonthType6_1 + item.SMonthType6_2 + item.SMonthType6_3; - tMonthType1 += item.TMonthType1_1 + item.TMonthType1_2 + item.TMonthType1_3 + item.TMonthType1_4 + item.TMonthType1_5 + item.TMonthType1_6 + item.TMonthType1_7 + item.TMonthType1_8 + item.TMonthType1_9 + item.TMonthType1_10 + item.TMonthType1_11; - //tMonthType2 += item.TMonthType2_1 + item.TMonthType2_2 + item.TMonthType2_3 + item.TMonthType2_4 + item.TMonthType2_5 + item.TMonthType2_6 + item.TMonthType2_7 + item.TMonthType2_8 + item.TMonthType2_9; - } - this.nbMainCost1.Text = sMonthType1.ToString(); - this.nbMainCost2.Text = sMonthType2.ToString(); - this.nbMainCost3.Text = sMonthType3.ToString(); - this.nbMainCost4.Text = sMonthType4.ToString(); - this.nbMainCost5.Text = sMonthType5.ToString(); - this.nbMainCost6.Text = sMonthType6.ToString(); - this.nbMainCost7.Text = tMonthType1.ToString(); - this.nbMainCost.Text = (sMonthType1 + sMonthType2 + sMonthType3 + sMonthType4 + sMonthType5 + sMonthType6 + tMonthType1).ToString(); - } - if (mr != null) - { - this.nbMainProjectCost1.Text = ((mr.MainProjectCost1 ?? 0) + sMonthType1).ToString(); - this.nbMainProjectCost2.Text = ((mr.MainProjectCost2 ?? 0) + sMonthType2).ToString(); - this.nbMainProjectCost3.Text = ((mr.MainProjectCost3 ?? 0) + sMonthType3).ToString(); - this.nbMainProjectCost4.Text = ((mr.MainProjectCost4 ?? 0) + sMonthType4).ToString(); - this.nbMainProjectCost5.Text = ((mr.MainProjectCost5 ?? 0) + sMonthType5).ToString(); - this.nbMainProjectCost6.Text = ((mr.MainProjectCost6 ?? 0) + sMonthType6).ToString(); - this.nbMainProjectCost7.Text = ((mr.MainProjectCost7 ?? 0) + tMonthType1).ToString(); - this.nbMainProjectCost.Text = ((mr.MainProjectCost ?? 0) + (sMonthType1 + sMonthType2 + sMonthType3 + sMonthType4 + sMonthType5 + sMonthType6 + tMonthType1)).ToString(); - } - else + InjuryAccidentId = SQLHelper.GetNewID(typeof(Model.Manager_Month_InjuryAccidentC)), + UnitName = "五环", + AttemptedIncidents = BLL.AccidentHandleService.GetAccidentHandleByAccidentDate(startTime, endTime, this.ProjectId, BLL.Const.UnitId_CWCEC),//未遂事件起数 + FirstAidDressing = null, // + MedicalTreatment = null,// + WorkLimitation = null,// + LossPerson = (from x in reports where x.UnitId==Const.UnitId_CWCEC select x.PeopleNum).Sum(), + LossWorkTime = (from x in reports where x.UnitId == Const.UnitId_CWCEC select x.WorkingHoursLoss).Sum(), + LossEconomy = (from x in reports where x.UnitId == Const.UnitId_CWCEC select x.EconomicLoss).Sum() + (from x in reports where x.UnitId == Const.UnitId_CWCEC select x.EconomicOtherLoss).Sum(), + DeathPerson = (from x in deathReports where x.UnitId == Const.UnitId_CWCEC select x.PeopleNum).Sum(), + DeathWorkTime = (from x in deathReports where x.UnitId == Const.UnitId_CWCEC select x.WorkingHoursLoss).Sum(), + DeathEconomy = (from x in deathReports where x.UnitId == Const.UnitId_CWCEC select x.EconomicLoss).Sum() + (from x in deathReports where x.UnitId == Const.UnitId_CWCEC select x.EconomicOtherLoss).Sum(), + }; + injuryAccidents.Add(injury); + i++; + Model.Manager_Month_InjuryAccidentC injury2 = new Model.Manager_Month_InjuryAccidentC { + InjuryAccidentId = SQLHelper.GetNewID(typeof(Model.Manager_Month_InjuryAccidentC)), + UnitName = "分包商", + AttemptedIncidents = BLL.AccidentHandleService.GetAccidentHandleByAccidentDate(startTime, endTime, this.ProjectId, BLL.Const.UnitId_Con),//未遂事件起数,//未遂事件起数 + FirstAidDressing = null, // + MedicalTreatment = null,// + WorkLimitation = null,// + LossPerson = (from x in reports + join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId + where y.UnitType == Const.ProjectUnitType_2 select x.PeopleNum).Sum(), + LossWorkTime = (from x in reports + join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId + where y.UnitType == Const.ProjectUnitType_2 + select x.WorkingHoursLoss).Sum(), + LossEconomy = (from x in reports + join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId + where y.UnitType == Const.ProjectUnitType_2 + select x.EconomicLoss).Sum() + (from x in reports + join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId + where y.UnitType == Const.ProjectUnitType_2 + select x.EconomicOtherLoss).Sum(), + DeathPerson = (from x in deathReports + join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId + where y.UnitType == Const.ProjectUnitType_2 + select x.PeopleNum).Sum(), + DeathWorkTime = (from x in deathReports + join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId + where y.UnitType == Const.ProjectUnitType_2 + select x.WorkingHoursLoss).Sum(), + DeathEconomy = (from x in deathReports + join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId + where y.UnitType == Const.ProjectUnitType_2 + select x.EconomicLoss).Sum() + (from x in deathReports + join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId + where y.UnitType == Const.ProjectUnitType_2 + select x.EconomicOtherLoss).Sum(), + }; + injuryAccidents.Add(injury2); - this.nbMainProjectCost1.Text = sMonthType1.ToString(); - this.nbMainProjectCost2.Text = sMonthType2.ToString(); - this.nbMainProjectCost3.Text = sMonthType3.ToString(); - this.nbMainProjectCost4.Text = sMonthType4.ToString(); - this.nbMainProjectCost5.Text = sMonthType5.ToString(); - this.nbMainProjectCost6.Text = sMonthType6.ToString(); - this.nbMainProjectCost7.Text = tMonthType1.ToString(); - this.nbMainProjectCost.Text = (sMonthType1 + sMonthType2 + sMonthType3 + sMonthType4 + sMonthType5 + sMonthType6 + tMonthType1).ToString(); - } + this.gvInjuryAccident.DataSource = injuryAccidents; + this.gvInjuryAccident.DataBind(); - decimal? subMonthType1 = 0, subMonthType2 = 0, subMonthType3 = 0, subMonthType4 = 0, subMonthType5 = 0, subMonthType6 = 0, subMonthType7 = 0; - List subPayRegistrations = BLL.SubPayRegistrationService.GetSubPayRegistrationByPayDate(startTime, endTime, this.ProjectId); - if (subPayRegistrations != null) + OutputSummaryData(); + } + + /// + /// 求和 + /// + private void OutputSummaryData() + { + JObject summary = new JObject(); + + int TotalAttemptedIncidents = 0, TotalFirstAidDressing = 0, TotalMedicalTreatment = 0, TotalWorkLimitation = 0, TotalLossPerson = 0, TotalDeathPerson = 0; + decimal TotalLossWorkTime = 0, TotalLossEconomy = 0, TotalDeathWorkTime = 0, TotalDeathEconomy = 0; + foreach (JObject mergedRow in gvInjuryAccident.GetMergedData()) { - foreach (var item in subPayRegistrations) + JObject values = mergedRow.Value("values"); + if (!string.IsNullOrEmpty(values["AttemptedIncidents"].ToString())) { - subMonthType1 += item.SMainApproveType1 + item.SMainApproveType2 + item.SMainApproveType3 + item.SMainApproveType4 + item.SMainApproveType5; - subMonthType2 += item.SMainApproveType6; - subMonthType3 += item.SMainApproveType7; - subMonthType4 += item.SMainApproveType8 + item.SMainApproveType9 + item.SMainApproveType10 + item.SMainApproveType11 + item.SMainApproveType12 + item.SMainApproveType13 + item.SMainApproveType14 + item.SMainApproveType15 + item.SMainApproveType16 + item.SMainApproveType17 + item.SMainApproveType18 + item.SMainApproveType19 + item.SMainApproveType20 + item.SMainApproveType21; - subMonthType5 += item.SMainApproveType22 + item.SMainApproveType23 + item.SMainApproveType24 + item.SMainApproveType25 + item.SMainApproveType26 + item.SMainApproveType27; - subMonthType6 += item.SMainApproveType28; - subMonthType6 += item.SMainApproveType29; + TotalAttemptedIncidents += values.Value("AttemptedIncidents"); + } + if (!string.IsNullOrEmpty(values["FirstAidDressing"].ToString())) + { + TotalFirstAidDressing += values.Value("FirstAidDressing"); + } + if (!string.IsNullOrEmpty(values["MedicalTreatment"].ToString())) + { + TotalMedicalTreatment += values.Value("MedicalTreatment"); + } + if (!string.IsNullOrEmpty(values["WorkLimitation"].ToString())) + { + TotalWorkLimitation += values.Value("WorkLimitation"); + } + if (!string.IsNullOrEmpty(values["LossPerson"].ToString())) + { + TotalLossPerson += values.Value("LossPerson"); + } + if (!string.IsNullOrEmpty(values["LossWorkTime"].ToString())) + { + TotalLossWorkTime += values.Value("LossWorkTime"); + } + if (!string.IsNullOrEmpty(values["LossEconomy"].ToString())) + { + TotalLossEconomy += values.Value("LossEconomy"); + } + if (!string.IsNullOrEmpty(values["DeathPerson"].ToString())) + { + TotalDeathPerson += values.Value("DeathPerson"); + } + if (!string.IsNullOrEmpty(values["DeathWorkTime"].ToString())) + { + TotalDeathWorkTime += values.Value("DeathWorkTime"); + } + if (!string.IsNullOrEmpty(values["DeathEconomy"].ToString())) + { + TotalDeathEconomy += values.Value("DeathEconomy"); } - this.nbSubCost1.Text = subMonthType1.ToString(); - this.nbSubCost2.Text = subMonthType2.ToString(); - this.nbSubCost3.Text = subMonthType3.ToString(); - this.nbSubCost4.Text = subMonthType4.ToString(); - this.nbSubCost5.Text = subMonthType5.ToString(); - this.nbSubCost6.Text = subMonthType6.ToString(); - this.nbSubCost7.Text = subMonthType7.ToString(); - this.nbSubCost.Text = (subMonthType1 + subMonthType2 + subMonthType3 + subMonthType4 + subMonthType5 + subMonthType6 + subMonthType7).ToString(); - } - if (mr != null) - { - this.nbSubProjectCost1.Text = ((mr.SubProjectCost1 ?? 0) + subMonthType1).ToString(); - this.nbSubProjectCost2.Text = ((mr.SubProjectCost2 ?? 0) + subMonthType2).ToString(); - this.nbSubProjectCost3.Text = ((mr.SubProjectCost3 ?? 0) + subMonthType3).ToString(); - this.nbSubProjectCost4.Text = ((mr.SubProjectCost4 ?? 0) + subMonthType4).ToString(); - this.nbSubProjectCost5.Text = ((mr.SubProjectCost5 ?? 0) + subMonthType5).ToString(); - this.nbSubProjectCost6.Text = ((mr.SubProjectCost6 ?? 0) + subMonthType6).ToString(); - this.nbSubProjectCost7.Text = ((mr.SubProjectCost7 ?? 0) + subMonthType7).ToString(); - this.nbSubProjectCost.Text = ((mr.SubProjectCost ?? 0) + (subMonthType1 + subMonthType2 + subMonthType3 + subMonthType4 + subMonthType5 + subMonthType6 + subMonthType7)).ToString(); - this.nbJianAnProjectCost.Text = (mr.JianAnProjectCost ?? 0).ToString(); - } - else - { - this.nbSubProjectCost1.Text = subMonthType1.ToString(); - this.nbSubProjectCost2.Text = subMonthType2.ToString(); - this.nbSubProjectCost3.Text = subMonthType3.ToString(); - this.nbSubProjectCost4.Text = subMonthType4.ToString(); - this.nbSubProjectCost5.Text = subMonthType5.ToString(); - this.nbSubProjectCost6.Text = subMonthType6.ToString(); - this.nbSubProjectCost7.Text = subMonthType7.ToString(); - this.nbSubProjectCost.Text = (subMonthType1 + subMonthType2 + subMonthType3 + subMonthType4 + subMonthType5 + subMonthType6 + subMonthType7).ToString(); } + summary.Add("UnitName", "项目合计"); + summary.Add("AttemptedIncidents", TotalAttemptedIncidents.ToString("F2")); + summary.Add("FirstAidDressing", TotalFirstAidDressing.ToString("F2")); + summary.Add("MedicalTreatment", TotalMedicalTreatment.ToString("F2")); + summary.Add("WorkLimitation", TotalWorkLimitation.ToString("F2")); + summary.Add("LossPerson", TotalLossPerson.ToString("F2")); + summary.Add("LossWorkTime", TotalLossWorkTime.ToString("F2")); + summary.Add("LossEconomy", TotalLossEconomy.ToString("F2")); + summary.Add("DeathPerson", TotalDeathPerson.ToString("F2")); + summary.Add("DeathWorkTime", TotalDeathWorkTime.ToString("F2")); + summary.Add("DeathEconomy", TotalDeathEconomy.ToString("F2")); + + gvInjuryAccident.SummaryData = summary; } #endregion + #region 本月无伤害事故统计 + /// + /// 本月无伤害事故统计 + /// + private void GetNoInjuryAccident() + { + Model.Manager_Month_NoInjuryAccidentC noInjury = new Model.Manager_Month_NoInjuryAccidentC + { + NoInjuryAccidentId = SQLHelper.GetNewID(typeof(Model.Manager_Month_NoInjuryAccidentC)), + AccidentType = null, + EconomicLosses = null, + WHAccidentCount = null, + SubAccidentCount = null, + }; + noInjuryAccidents.Add(noInjury); + + this.gvNoInjuryAccident.DataSource = noInjuryAccidents; + this.gvNoInjuryAccident.DataBind(); + } + + #endregion + + #region HSE绩效指标 + /// + /// HSE绩效指标 + /// + private void GetPerformanceIndicator() + { + int i = 0; + Model.Manager_Month_PerformanceIndicatorC performanceIndicator = new Model.Manager_Month_PerformanceIndicatorC + { + PerformanceIndicatorId = SQLHelper.GetNewID(typeof(Model.Manager_Month_PerformanceIndicatorC)), + IndicatorType = "指导性指标", + IndicatorName = "不安全行为指数（不安全行为数/审核小时数）", + IndicatorValue = null, + SortIndex = 1, + }; + performanceIndicators.Add(performanceIndicator); + i++; + + var units = from x in Funs.DB.Project_ProjectUnit + where x.ProjectId == this.ProjectId && x.UnitType == "2" + orderby x.UnitType + select x; + if (units.Count() > 0) + { + foreach (Model.Project_ProjectUnit u in units) + { + Model.Manager_Month_PerformanceIndicatorC performanceIndicator2 = new Model.Manager_Month_PerformanceIndicatorC + { + PerformanceIndicatorId = SQLHelper.GetNewID(typeof(Model.Manager_Month_PerformanceIndicatorC)), + IndicatorType = "过程性指标", + IndicatorName = "HSE隐患按时整改率 | " + BLL.UnitService.GetUnitNameByUnitId(u.UnitId), + IndicatorValue = null, + SortIndex = 2, + }; + performanceIndicators.Add(performanceIndicator2); + } + i++; + } + + Model.Manager_Month_PerformanceIndicatorC performanceIndicator3 = new Model.Manager_Month_PerformanceIndicatorC + { + PerformanceIndicatorId = SQLHelper.GetNewID(typeof(Model.Manager_Month_PerformanceIndicatorC)), + IndicatorType = "结果性指标", + IndicatorName = "百万工时总可记录事件率（总可记录事件人数/总工时）*10^6", + IndicatorValue = null, + SortIndex = 3, + }; + performanceIndicators.Add(performanceIndicator3); + i++; + Model.Manager_Month_PerformanceIndicatorC performanceIndicator4 = new Model.Manager_Month_PerformanceIndicatorC + { + PerformanceIndicatorId = SQLHelper.GetNewID(typeof(Model.Manager_Month_PerformanceIndicatorC)), + IndicatorType = "结果性指标", + IndicatorName = "百万工时损失工时率（总损失工时/总工时）*10^6", + IndicatorValue = null, + SortIndex = 4, + }; + performanceIndicators.Add(performanceIndicator4); + i++; + Model.Manager_Month_PerformanceIndicatorC performanceIndicator5 = new Model.Manager_Month_PerformanceIndicatorC + { + PerformanceIndicatorId = SQLHelper.GetNewID(typeof(Model.Manager_Month_PerformanceIndicatorC)), + IndicatorType = "结果性指标", + IndicatorName = "百万工时损失工时伤害事故率（损失工时伤害事故人数/总工时）*10^6", + IndicatorValue = null, + SortIndex = 5, + }; + performanceIndicators.Add(performanceIndicator5); + i++; + Model.Manager_Month_PerformanceIndicatorC performanceIndicator6 = new Model.Manager_Month_PerformanceIndicatorC + { + PerformanceIndicatorId = SQLHelper.GetNewID(typeof(Model.Manager_Month_PerformanceIndicatorC)), + IndicatorType = "结果性指标", + IndicatorName = "百万工时事故发生频率（损失工时伤害事故起数/总工时）*10^6", + IndicatorValue = null, + SortIndex = 6, + }; + performanceIndicators.Add(performanceIndicator6); + i++; + Model.Manager_Month_PerformanceIndicatorC performanceIndicator7 = new Model.Manager_Month_PerformanceIndicatorC + { + PerformanceIndicatorId = SQLHelper.GetNewID(typeof(Model.Manager_Month_PerformanceIndicatorC)), + IndicatorType = "结果性指标", + IndicatorName = "百万工时死亡事故频率（死亡事故起数/总工时）*10^6", + IndicatorValue = null, + SortIndex = 7, + }; + performanceIndicators.Add(performanceIndicator7); + i++; + Model.Manager_Month_PerformanceIndicatorC performanceIndicator8 = new Model.Manager_Month_PerformanceIndicatorC + { + PerformanceIndicatorId = SQLHelper.GetNewID(typeof(Model.Manager_Month_PerformanceIndicatorC)), + IndicatorType = "结果性指标", + IndicatorName = "百万工时事故死亡率（死亡事故人数/总工时）*10^6", + IndicatorValue = null, + SortIndex = 8, + }; + performanceIndicators.Add(performanceIndicator8); + + this.gvPerformanceIndicator.DataSource = performanceIndicators; + this.gvPerformanceIndicator.DataBind(); + } + + #endregion + #endregion + #region 保存按钮 /// /// 保存按钮 @@ -250,42 +427,11 @@ namespace FineUIPro.Web.HSSE.Manager Model.Manager_MonthReportC oldMonthReport = BLL.MonthReportCService.GetMonthReportByMonths(Convert.ToDateTime(Request.Params["months"]), this.CurrUser.LoginProjectId); if (oldMonthReport != null) { - oldMonthReport.MainCost1 = Funs.GetNewDecimalOrZero(this.nbMainCost1.Text.Trim()); - oldMonthReport.MainProjectCost1 = Funs.GetNewDecimalOrZero(this.nbMainProjectCost1.Text.Trim()); - oldMonthReport.SubCost1 = Funs.GetNewDecimalOrZero(this.nbSubCost1.Text.Trim()); - oldMonthReport.SubProjectCost1 = Funs.GetNewDecimalOrZero(this.nbSubProjectCost1.Text.Trim()); - oldMonthReport.MainCost2 = Funs.GetNewDecimalOrZero(this.nbMainCost2.Text.Trim()); - oldMonthReport.MainProjectCost2 = Funs.GetNewDecimalOrZero(this.nbMainProjectCost2.Text.Trim()); - oldMonthReport.SubCost2 = Funs.GetNewDecimalOrZero(this.nbSubCost2.Text.Trim()); - oldMonthReport.SubProjectCost2 = Funs.GetNewDecimalOrZero(this.nbSubProjectCost2.Text.Trim()); - oldMonthReport.MainCost3 = Funs.GetNewDecimalOrZero(this.nbMainCost3.Text.Trim()); - oldMonthReport.MainProjectCost3 = Funs.GetNewDecimalOrZero(this.nbMainProjectCost3.Text.Trim()); - oldMonthReport.SubCost3 = Funs.GetNewDecimalOrZero(this.nbSubCost3.Text.Trim()); - oldMonthReport.SubProjectCost3 = Funs.GetNewDecimalOrZero(this.nbSubProjectCost3.Text.Trim()); - oldMonthReport.MainCost4 = Funs.GetNewDecimalOrZero(this.nbMainCost4.Text.Trim()); - oldMonthReport.MainProjectCost4 = Funs.GetNewDecimalOrZero(this.nbMainProjectCost4.Text.Trim()); - oldMonthReport.SubCost4 = Funs.GetNewDecimalOrZero(this.nbSubCost4.Text.Trim()); - oldMonthReport.SubProjectCost4 = Funs.GetNewDecimalOrZero(this.nbSubProjectCost4.Text.Trim()); - oldMonthReport.MainCost5 = Funs.GetNewDecimalOrZero(this.nbMainCost5.Text.Trim()); - oldMonthReport.MainProjectCost5 = Funs.GetNewDecimalOrZero(this.nbMainProjectCost5.Text.Trim()); - oldMonthReport.SubCost5 = Funs.GetNewDecimalOrZero(this.nbSubCost5.Text.Trim()); - oldMonthReport.SubProjectCost5 = Funs.GetNewDecimalOrZero(this.nbSubProjectCost5.Text.Trim()); - oldMonthReport.MainCost6 = Funs.GetNewDecimalOrZero(this.nbMainCost6.Text.Trim()); - oldMonthReport.MainProjectCost6 = Funs.GetNewDecimalOrZero(this.nbMainProjectCost6.Text.Trim()); - oldMonthReport.SubCost6 = Funs.GetNewDecimalOrZero(this.nbSubCost6.Text.Trim()); - oldMonthReport.SubProjectCost6 = Funs.GetNewDecimalOrZero(this.nbSubProjectCost6.Text.Trim()); - oldMonthReport.MainCost7 = Funs.GetNewDecimalOrZero(this.nbMainCost7.Text.Trim()); - oldMonthReport.MainProjectCost7 = Funs.GetNewDecimalOrZero(this.nbMainProjectCost7.Text.Trim()); - oldMonthReport.SubCost7 = Funs.GetNewDecimalOrZero(this.nbSubCost7.Text.Trim()); - oldMonthReport.SubProjectCost7 = Funs.GetNewDecimalOrZero(this.nbSubProjectCost7.Text.Trim()); - oldMonthReport.MainCost = Funs.GetNewDecimalOrZero(this.nbMainCost.Text.Trim()); - oldMonthReport.MainProjectCost = Funs.GetNewDecimalOrZero(this.nbMainProjectCost.Text.Trim()); - oldMonthReport.SubCost = Funs.GetNewDecimalOrZero(this.nbSubCost.Text.Trim()); - oldMonthReport.SubProjectCost = Funs.GetNewDecimalOrZero(this.nbSubProjectCost.Text.Trim()); - oldMonthReport.JianAnCost = Funs.GetNewDecimalOrZero(this.nbJianAnCost.Text.Trim()); - oldMonthReport.JianAnProjectCost = Funs.GetNewDecimalOrZero(this.nbJianAnProjectCost.Text.Trim()); + oldMonthReport.AccidentDef = this.txtDef.Text.Trim(); BLL.MonthReportCService.UpdateMonthReport(oldMonthReport); - + OperateInjuryAccidentSort(MonthReportId); + OperateNoInjuryAccidentSort(MonthReportId); + OperatePerformanceIndicatorSort(MonthReportId); BLL.LogService.AddSys_Log(this.CurrUser, oldMonthReport.MonthReportCode, oldMonthReport.MonthReportId, BLL.Const.ProjectManagerMonthCMenuId, BLL.Const.BtnModify); } else @@ -299,49 +445,146 @@ namespace FineUIPro.Web.HSSE.Manager monthReport.Months = Funs.GetNewDateTime(Request.Params["months"]); monthReport.ReportMan = this.CurrUser.UserId; monthReport.MonthReportDate = DateTime.Now; - monthReport.MainCost1 = Funs.GetNewDecimalOrZero(this.nbMainCost1.Text.Trim()); - monthReport.MainProjectCost1 = Funs.GetNewDecimalOrZero(this.nbMainProjectCost1.Text.Trim()); - monthReport.SubCost1 = Funs.GetNewDecimalOrZero(this.nbSubCost1.Text.Trim()); - monthReport.SubProjectCost1 = Funs.GetNewDecimalOrZero(this.nbSubProjectCost1.Text.Trim()); - monthReport.MainCost2 = Funs.GetNewDecimalOrZero(this.nbMainCost2.Text.Trim()); - monthReport.MainProjectCost2 = Funs.GetNewDecimalOrZero(this.nbMainProjectCost2.Text.Trim()); - monthReport.SubCost2 = Funs.GetNewDecimalOrZero(this.nbSubCost2.Text.Trim()); - monthReport.SubProjectCost2 = Funs.GetNewDecimalOrZero(this.nbSubProjectCost2.Text.Trim()); - monthReport.MainCost3 = Funs.GetNewDecimalOrZero(this.nbMainCost3.Text.Trim()); - monthReport.MainProjectCost3 = Funs.GetNewDecimalOrZero(this.nbMainProjectCost3.Text.Trim()); - monthReport.SubCost3 = Funs.GetNewDecimalOrZero(this.nbSubCost3.Text.Trim()); - monthReport.SubProjectCost3 = Funs.GetNewDecimalOrZero(this.nbSubProjectCost3.Text.Trim()); - monthReport.MainCost4 = Funs.GetNewDecimalOrZero(this.nbMainCost4.Text.Trim()); - monthReport.MainProjectCost4 = Funs.GetNewDecimalOrZero(this.nbMainProjectCost4.Text.Trim()); - monthReport.SubCost4 = Funs.GetNewDecimalOrZero(this.nbSubCost4.Text.Trim()); - monthReport.SubProjectCost4 = Funs.GetNewDecimalOrZero(this.nbSubProjectCost4.Text.Trim()); - monthReport.MainCost5 = Funs.GetNewDecimalOrZero(this.nbMainCost5.Text.Trim()); - monthReport.MainProjectCost5 = Funs.GetNewDecimalOrZero(this.nbMainProjectCost5.Text.Trim()); - monthReport.SubCost5 = Funs.GetNewDecimalOrZero(this.nbSubCost5.Text.Trim()); - monthReport.SubProjectCost5 = Funs.GetNewDecimalOrZero(this.nbSubProjectCost5.Text.Trim()); - monthReport.MainCost6 = Funs.GetNewDecimalOrZero(this.nbMainCost6.Text.Trim()); - monthReport.MainProjectCost6 = Funs.GetNewDecimalOrZero(this.nbMainProjectCost6.Text.Trim()); - monthReport.SubCost6 = Funs.GetNewDecimalOrZero(this.nbSubCost6.Text.Trim()); - monthReport.SubProjectCost6 = Funs.GetNewDecimalOrZero(this.nbSubProjectCost6.Text.Trim()); - monthReport.MainCost7 = Funs.GetNewDecimalOrZero(this.nbMainCost7.Text.Trim()); - monthReport.MainProjectCost7 = Funs.GetNewDecimalOrZero(this.nbMainProjectCost7.Text.Trim()); - monthReport.SubCost7 = Funs.GetNewDecimalOrZero(this.nbSubCost7.Text.Trim()); - monthReport.SubProjectCost7 = Funs.GetNewDecimalOrZero(this.nbSubProjectCost7.Text.Trim()); - monthReport.MainCost = Funs.GetNewDecimalOrZero(this.nbMainCost.Text.Trim()); - monthReport.MainProjectCost = Funs.GetNewDecimalOrZero(this.nbMainProjectCost.Text.Trim()); - monthReport.SubCost = Funs.GetNewDecimalOrZero(this.nbSubCost.Text.Trim()); - monthReport.SubProjectCost = Funs.GetNewDecimalOrZero(this.nbSubProjectCost.Text.Trim()); - monthReport.JianAnCost = Funs.GetNewDecimalOrZero(this.nbJianAnCost.Text.Trim()); - monthReport.JianAnProjectCost = Funs.GetNewDecimalOrZero(this.nbJianAnProjectCost.Text.Trim()); + monthReport.AccidentDef = this.txtDef.Text.Trim(); BLL.MonthReportCService.AddMonthReport(monthReport); - + OperateInjuryAccidentSort(this.MonthReportId); + OperateNoInjuryAccidentSort(this.MonthReportId); + OperatePerformanceIndicatorSort(this.MonthReportId); BLL.LogService.AddSys_Log(this.CurrUser, monthReport.MonthReportCode, monthReport.MonthReportId, BLL.Const.ProjectManagerMonthCMenuId, BLL.Const.BtnAdd); } ShowNotify("保存成功!", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); } + #region 本月伤害事故统计 + /// + /// 本月伤害事故统计 + /// + /// + private void OperateInjuryAccidentSort(string monthReportId) + { + BLL.InjuryAccidentCService.DeleteInjuryAccidengtByMonthReportId(monthReportId); + jerqueSaveInjuryAccidentCList(); + foreach (Model.Manager_Month_InjuryAccidentC injury in injuryAccidents) + { + injury.MonthReportId = monthReportId; + BLL.InjuryAccidentCService.AddInjuryAccidentC(injury); + } + } + /// + /// 检查并保存本月伤害事故统计 + /// + private void jerqueSaveInjuryAccidentCList() + { + injuryAccidents.Clear(); + JArray mergedData = gvInjuryAccident.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + Model.Manager_Month_InjuryAccidentC monthPlanSort = new Model.Manager_Month_InjuryAccidentC + { + InjuryAccidentId = this.gvInjuryAccident.Rows[i].DataKeys[0].ToString(), + UnitName = values.Value("UnitName").ToString(), + AttemptedIncidents = Funs.GetNewInt(values.Value("AttemptedIncidents").ToString()), + FirstAidDressing = Funs.GetNewInt(values.Value("FirstAidDressing").ToString()), + MedicalTreatment = Funs.GetNewInt(values.Value("MedicalTreatment").ToString()), + WorkLimitation = Funs.GetNewInt(values.Value("WorkLimitation").ToString()), + LossPerson = Funs.GetNewInt(values.Value("LossPerson").ToString()), + LossWorkTime = Funs.GetNewDecimal(values.Value("LossWorkTime").ToString()), + LossEconomy = Funs.GetNewDecimal(values.Value("LossEconomy").ToString()), + DeathPerson = Funs.GetNewInt(values.Value("DeathPerson").ToString()), + DeathWorkTime = Funs.GetNewDecimal(values.Value("DeathWorkTime").ToString()), + DeathEconomy = Funs.GetNewDecimal(values.Value("DeathEconomy").ToString()), + }; + injuryAccidents.Add(monthPlanSort); + } + } + #endregion + + #region 本月无伤害事故统计 + /// + /// 本月伤害事故统计 + /// + /// + private void OperateNoInjuryAccidentSort(string monthReportId) + { + BLL.NoInjuryAccidentCService.DeleteNoInjuryAccidentByMonthReportId(monthReportId); + jerqueSaveNoInjuryAccidentCList(); + foreach (Model.Manager_Month_NoInjuryAccidentC noInjury in noInjuryAccidents) + { + noInjury.MonthReportId = monthReportId; + BLL.NoInjuryAccidentCService.AddNoInjuryAccident(noInjury); + } + } + + /// + /// 检查并保存本月无伤害事故统计 + /// + private void jerqueSaveNoInjuryAccidentCList() + { + noInjuryAccidents.Clear(); + JArray mergedData = gvNoInjuryAccident.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + Model.Manager_Month_NoInjuryAccidentC noInjuryAccident = new Model.Manager_Month_NoInjuryAccidentC + { + NoInjuryAccidentId = this.gvNoInjuryAccident.Rows[i].DataKeys[0].ToString(), + AccidentType = values.Value("AccidentType").ToString(), + EconomicLosses = Funs.GetNewDecimal(values.Value("EconomicLosses").ToString()), + WHAccidentCount = Funs.GetNewInt(values.Value("WHAccidentCount").ToString()), + SubAccidentCount = Funs.GetNewInt(values.Value("SubAccidentCount").ToString()), + }; + noInjuryAccidents.Add(noInjuryAccident); + } + } + #endregion + + #region HSE绩效指标 + /// + /// HSE绩效指标 + /// + /// + private void OperatePerformanceIndicatorSort(string monthReportId) + { + BLL.PerformanceIndicatorCService.DeletePerformanceIndicatorByMonthReportId(monthReportId); + jerqueSavePerformanceIndicatorCList(); + foreach (Model.Manager_Month_PerformanceIndicatorC performanceIndicator in performanceIndicators) + { + performanceIndicator.MonthReportId = monthReportId; + BLL.PerformanceIndicatorCService.AddPerformanceIndicator(performanceIndicator); + } + } + + /// + /// 检查并保存HSE绩效指标 + /// + private void jerqueSavePerformanceIndicatorCList() + { + performanceIndicators.Clear(); + JArray mergedData = gvPerformanceIndicator.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + Model.Manager_Month_PerformanceIndicatorC performanceIndicator = new Model.Manager_Month_PerformanceIndicatorC + { + PerformanceIndicatorId = this.gvPerformanceIndicator.Rows[i].DataKeys[0].ToString(), + IndicatorType = values.Value("IndicatorType").ToString(), + IndicatorName = values.Value("IndicatorName").ToString(), + IndicatorValue = values.Value("IndicatorValue").ToString(), + SortIndex = Funs.GetNewInt(values.Value("SortIndex").ToString()), + }; + performanceIndicators.Add(performanceIndicator); + } + } + #endregion #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.designer.cs index f173a178..ecb001cf 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.designer.cs @@ -31,13 +31,238 @@ namespace FineUIPro.Web.HSSE.Manager { protected global::FineUIPro.PageManager PageManager1; /// - /// Panel1 控件。 + /// SimpleForm1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Panel Panel1; + protected global::FineUIPro.Form SimpleForm1; + + /// + /// GroupPanel34 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel34; + + /// + /// GroupPanel37 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel37; + + /// + /// GroupPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel1; + + /// + /// gvInjuryAccident 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvInjuryAccident; + + /// + /// NumberBox1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox1; + + /// + /// NumberBox2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox2; + + /// + /// NumberBox3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox3; + + /// + /// NumberBox4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox4; + + /// + /// NumberBox5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox5; + + /// + /// NumberBox6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox6; + + /// + /// NumberBox7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox7; + + /// + /// NumberBox8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox8; + + /// + /// NumberBox9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox9; + + /// + /// NumberBox10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox10; + + /// + /// GroupPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel2; + + /// + /// gvNoInjuryAccident 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvNoInjuryAccident; + + /// + /// TextBox1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox1; + + /// + /// NumberBox11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox11; + + /// + /// NumberBox12 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox12; + + /// + /// NumberBox13 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox NumberBox13; + + /// + /// GroupPanel3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel3; + + /// + /// txtDef 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtDef; + + /// + /// GroupPanel4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.GroupPanel GroupPanel4; + + /// + /// gvPerformanceIndicator 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvPerformanceIndicator; + + /// + /// TextBox4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox4; /// /// Toolbar1 控件。 @@ -56,320 +281,5 @@ namespace FineUIPro.Web.HSSE.Manager { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - - /// - /// ContentPanel1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.ContentPanel ContentPanel1; - - /// - /// nbMainCost1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainCost1; - - /// - /// nbMainProjectCost1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainProjectCost1; - - /// - /// nbSubCost1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubCost1; - - /// - /// nbSubProjectCost1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubProjectCost1; - - /// - /// nbJianAnCost 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbJianAnCost; - - /// - /// nbJianAnProjectCost 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbJianAnProjectCost; - - /// - /// nbMainCost2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainCost2; - - /// - /// nbMainProjectCost2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainProjectCost2; - - /// - /// nbSubCost2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubCost2; - - /// - /// nbSubProjectCost2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubProjectCost2; - - /// - /// nbMainCost3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainCost3; - - /// - /// nbMainProjectCost3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainProjectCost3; - - /// - /// nbSubCost3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubCost3; - - /// - /// nbSubProjectCost3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubProjectCost3; - - /// - /// nbMainCost4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainCost4; - - /// - /// nbMainProjectCost4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainProjectCost4; - - /// - /// nbSubCost4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubCost4; - - /// - /// nbSubProjectCost4 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubProjectCost4; - - /// - /// nbMainCost5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainCost5; - - /// - /// nbMainProjectCost5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainProjectCost5; - - /// - /// nbSubCost5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubCost5; - - /// - /// nbSubProjectCost5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubProjectCost5; - - /// - /// nbMainCost6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainCost6; - - /// - /// nbMainProjectCost6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainProjectCost6; - - /// - /// nbSubCost6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubCost6; - - /// - /// nbSubProjectCost6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubProjectCost6; - - /// - /// nbMainCost7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainCost7; - - /// - /// nbMainProjectCost7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainProjectCost7; - - /// - /// nbSubCost7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubCost7; - - /// - /// nbSubProjectCost7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubProjectCost7; - - /// - /// nbMainCost 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainCost; - - /// - /// nbMainProjectCost 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbMainProjectCost; - - /// - /// nbSubCost 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubCost; - - /// - /// nbSubProjectCost 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.NumberBox nbSubProjectCost; } } diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx index 700ca2be..fd59583e 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx @@ -4,102 +4,139 @@ - + 下月HSE工作计划
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx.cs index 0c692eb7..7ea50737 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using BLL; +using BLL; using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; namespace FineUIPro.Web.HSSE.Manager { @@ -42,24 +38,16 @@ namespace FineUIPro.Web.HSSE.Manager } } - private static DateTime startTime; - - private static DateTime endTime; - - private static DateTime yearStartTime; - - private static DateTime projectStartTime; - #region 定义集合 /// - /// 7.1 管理绩效数据统计集合(表一) + /// 新增危险源识别及控制 /// - private static List accidentDesciptions = new List(); + private static List hazardCs = new List(); /// - /// 7.2 管理绩效数据统计集合（表二） + /// 其他HSE工作计划 /// - private static List AccidentDesciptionItems = new List(); + private static List otherWorkPlanCs = new List(); #endregion @@ -70,295 +58,173 @@ namespace FineUIPro.Web.HSSE.Manager { if (!IsPostBack) { - accidentDesciptions.Clear(); - AccidentDesciptionItems.Clear(); + hazardCs.Clear(); + otherWorkPlanCs.Clear(); this.MonthReportId = Request.Params["monthReportId"]; this.ProjectId = this.CurrUser.LoginProjectId; DateTime months = Convert.ToDateTime(Request.Params["months"]); - startTime = Convert.ToDateTime(Request.Params["startTime"]); - endTime = Convert.ToDateTime(Request.Params["endTime"]); - yearStartTime = Convert.ToDateTime(Request.Params["yearStartTime"]); Model.Manager_MonthReportC monthReport = BLL.MonthReportCService.GetMonthReportByMonths(months, this.CurrUser.LoginProjectId); - Model.Manager_MonthReportC mr = BLL.MonthReportCService.GetLastMonthReportByDate(endTime, this.ProjectId); - Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(ProjectId); - if (project.StartDate != null) - { - projectStartTime = Convert.ToDateTime(project.StartDate); - } if (monthReport != null) { this.MonthReportId = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; - months = Convert.ToDateTime(monthReport.Months); - Model.SGGLDB db = Funs.DB; - //7.1 管理绩效数据统计(表一) - accidentDesciptions = (from x in db.Manager_Month_AccidentDesciptionC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); - if (accidentDesciptions.Count > 0) + //新增危险源识别及控制 + hazardCs = BLL.HazardCService.GetHazardByMonthReportId(this.MonthReportId); + if (hazardCs.Count > 0) { - this.gvAccidentDesciption.DataSource = accidentDesciptions; - this.gvAccidentDesciption.DataBind(); + this.gvHazardC.DataSource = hazardCs; + this.gvHazardC.DataBind(); } - else + //其他HSE工作计划 + otherWorkPlanCs = BLL.OtherWorkPlanCService.GetOtherWorkPlanByMonthReportId(this.MonthReportId); + if (otherWorkPlanCs.Count > 0) { - GetAccidentDesciption();//管理绩效数据统计（表一） + this.gvOtherWorkPlanC.DataSource = otherWorkPlanCs; + this.gvOtherWorkPlanC.DataBind(); } - //7.2 管理绩效数据统计（表二） - AccidentDesciptionItems = (from x in db.Manager_Month_AccidentDesciptionItemC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); - if (AccidentDesciptionItems.Count > 0) - { - this.gvAccidentDesciptionItem.DataSource = AccidentDesciptionItems; - this.gvAccidentDesciptionItem.DataBind(); - } - else - { - GetAccidentDesciptionItem();//管理绩效数据统计（表二） - } - this.txtAccidentDes.Text = monthReport.AccidentDes; - } - else - { - GetAccidentDesciption();//管理绩效数据统计（表一） - GetAccidentDesciptionItem();//管理绩效数据统计（表二） } } } #endregion - #region 事故 + #region 下月HSE工作计划 + #region 新增危险源识别及控制 /// - ///加载显示初始值 + /// 新增危险源识别及控制 /// - private void GetAccidentDesciption() + /// + /// + protected void btnNewHazardC_Click(object sender, EventArgs e) { - System.Web.UI.WebControls.ListItem[] list = BLL.AccidentDesciptionCService.GetAccidentDesciptionList(); - var accidentPersonRecords = from x in Funs.DB.Accident_AccidentPersonRecord - where x.ProjectId == this.CurrUser.LoginProjectId && x.AccidentDate >= startTime && x.AccidentDate < endTime - select x; - var yearAccidentPersonRecords = from x in Funs.DB.Accident_AccidentPersonRecord - where x.ProjectId == this.CurrUser.LoginProjectId && x.AccidentDate >= yearStartTime && x.AccidentDate < endTime - select x; - var accidentHandles = from x in Funs.DB.Accident_AccidentHandle - where x.ProjectId == this.CurrUser.LoginProjectId && x.AccidentDate >= startTime && x.AccidentDate < endTime - select x; - var yearAccidentHandles = from x in Funs.DB.Accident_AccidentHandle - where x.ProjectId == this.CurrUser.LoginProjectId && x.AccidentDate >= yearStartTime && x.AccidentDate < endTime - select x; - if (list.Count() > 0) + jerqueSaveHazardCList(); + Model.Manager_Month_HazardC hazardC = new Model.Manager_Month_HazardC { - for (int i = 0; i < list.Count(); i++) - { - Model.Manager_Month_AccidentDesciptionC des = new Model.Manager_Month_AccidentDesciptionC - { - AccidentDesId = SQLHelper.GetNewID(typeof(Model.Manager_Month_AccidentDesciptionC)), - Matter = list[i].Value - }; - if (des.Matter == "百万工时伤害率" || des.Matter == "伤害严重率") - { - //百万工时伤害率:轻重死总累计人数*1000000/累计总人工时（保留2位小数） - //伤害严重率:事故损失工时数/9*1000000/累计总人工时（保留2位小数） - if (accidentHandles.Count() > 0) - { - decimal totalHseManhours = 0; - Model.Manager_MonthReportC monthReport = BLL.MonthReportCService.GetMonthReportByMonths(Convert.ToDateTime(Request.Params["months"]), this.CurrUser.LoginProjectId); - if (monthReport != null) - { - if (monthReport.TotalHseManhours != null) - { - totalHseManhours = monthReport.TotalHseManhours ?? 0; - } - } - else - { - Model.SitePerson_MonthReport mReport = BLL.Funs.DB.SitePerson_MonthReport.FirstOrDefault(x => x.CompileDate == Convert.ToDateTime(Request.Params["months"])); //当月人工时月报 - if (mReport != null) - { - totalHseManhours = (from x in Funs.DB.SitePerson_MonthReportDetail - join y in Funs.DB.SitePerson_MonthReportUnitDetail - on x.MonthReportDetailId equals y.MonthReportDetailId - where x.MonthReportId == mReport.MonthReportId - select y.PersonWorkTime ?? 0).Sum(); - } - } - if (des.Matter == "百万工时伤害率") - { - int a = (from x in accidentHandles - select x.MinorInjuriesPersonNum ?? 0).Sum(); - int b = (from x in accidentHandles - select x.InjuriesPersonNum ?? 0).Sum(); - int c = (from x in accidentHandles - select x.DeathPersonNum ?? 0).Sum(); - if (totalHseManhours != 0) - { - des.MonthDataNum = decimal.Round((Convert.ToDecimal(a + b + c) * 1000000 / totalHseManhours), 2); - } - else - { - des.MonthDataNum = 0; - } - int ya = (from x in yearAccidentHandles - select x.MinorInjuriesPersonNum ?? 0).Sum(); - int yb = (from x in yearAccidentHandles - select x.InjuriesPersonNum ?? 0).Sum(); - int yc = (from x in yearAccidentHandles - select x.DeathPersonNum ?? 0).Sum(); - if (totalHseManhours != 0) - { - des.YearDataNum = decimal.Round((Convert.ToDecimal(ya + yb + yc) * 1000000 / totalHseManhours), 2); - } - else - { - des.YearDataNum = 0; - } - } - else if (des.Matter == "伤害严重率") - { - decimal workHoursLoss = (from x in accidentHandles - select x.WorkHoursLoss ?? 0).Sum(); - if (totalHseManhours != 0) - { - des.MonthDataNum = decimal.Round((Convert.ToDecimal(workHoursLoss) / 9 * 1000000 / totalHseManhours), 2); - } - else - { - des.MonthDataNum = 0; - } - decimal yearWorkHoursLoss = (from x in yearAccidentHandles - select x.WorkHoursLoss ?? 0).Sum(); - if (totalHseManhours != 0) - { - des.YearDataNum = decimal.Round((Convert.ToDecimal(yearWorkHoursLoss) / 9 * 1000000 / totalHseManhours), 2); - } - else - { - des.YearDataNum = 0; - } - } - } - } - else - { - des.MonthDataNum = (from x in accidentPersonRecords - join y in Funs.DB.Base_AccidentType - on x.AccidentTypeId equals y.AccidentTypeId - where y.AccidentTypeName.Contains(des.Matter) - select x).Count(); - des.YearDataNum = (from x in yearAccidentPersonRecords - join y in Funs.DB.Base_AccidentType - on x.AccidentTypeId equals y.AccidentTypeId - where y.AccidentTypeName.Contains(des.Matter) - select x).Count(); - } - accidentDesciptions.Add(des); - } - } - this.gvAccidentDesciption.DataSource = accidentDesciptions; - this.gvAccidentDesciption.DataBind(); + HazardId = SQLHelper.GetNewID(typeof(Model.Manager_Month_HazardC)) + }; + hazardCs.Add(hazardC); + this.gvHazardC.DataSource = hazardCs; + this.gvHazardC.DataBind(); } /// - /// 检查并保存事故（表一）集合 + /// 新增危险源识别及控制行点击事件 /// - private void jerqueSaveAccidentDesciptionList() + /// + /// + protected void gvHazardC_RowCommand(object sender, GridCommandEventArgs e) { - accidentDesciptions.Clear(); - JArray mergedData = gvAccidentDesciption.GetMergedData(); + jerqueSaveHazardCList(); + string rowID = this.gvHazardC.DataKeys[e.RowIndex][0].ToString(); + if (e.CommandName == "Delete") + { + foreach (var item in hazardCs) + { + if (item.HazardId == rowID) + { + hazardCs.Remove(item); + break; + } + } + gvHazardC.DataSource = hazardCs; + gvHazardC.DataBind(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + /// + /// 新增危险源识别及控制 + /// + private void jerqueSaveHazardCList() + { + hazardCs.Clear(); + JArray mergedData = gvHazardC.GetMergedData(); foreach (JObject mergedRow in mergedData) { string status = mergedRow.Value("status"); JObject values = mergedRow.Value("values"); int i = mergedRow.Value("index"); - Model.Manager_Month_AccidentDesciptionC accidentDesciptionSort = new Model.Manager_Month_AccidentDesciptionC + Model.Manager_Month_HazardC hazardC = new Model.Manager_Month_HazardC { - AccidentDesId = this.gvAccidentDesciption.Rows[i].DataKeys[0].ToString(), - SortIndex = i, - Matter = values.Value("Matter").ToString(), - MonthDataNum = Funs.GetNewDecimalOrZero(values.Value("MonthDataNum").ToString()), - YearDataNum = Funs.GetNewDecimalOrZero(values.Value("YearDataNum").ToString()) + HazardId = this.gvHazardC.Rows[i].DataKeys[0].ToString(), + WorkArea = values.Value("WorkArea").ToString(), + EnvironmentalFactors = values.Value("EnvironmentalFactors").ToString(), + Consequence = values.Value("Consequence").ToString(), + ControlMeasures = values.Value("ControlMeasures").ToString() }; - accidentDesciptions.Add(accidentDesciptionSort); - } - } - - /// - /// 加载显示初始值 - /// - private void GetAccidentDesciptionItem() - { - System.Web.UI.WebControls.ListItem[] list = BLL.AccidentDesciptionItemCService.GetMatterList(); - var accidentHandles = from x in Funs.DB.Accident_AccidentHandle - where x.ProjectId == this.CurrUser.LoginProjectId && x.AccidentDate >= startTime && x.AccidentDate < endTime - select x; - if (list.Count() > 0) - { - for (int i = 0; i < list.Count(); i++) + if (!string.IsNullOrEmpty(values.Value("IsMajor").ToString())) { - Model.Manager_Month_AccidentDesciptionItemC item = new Model.Manager_Month_AccidentDesciptionItemC - { - AccidentDesItemId = SQLHelper.GetNewID(typeof(Model.Manager_Month_AccidentDesciptionItemC)), - Matter = list[i].Value - }; - if (accidentHandles.Count() > 0) - { - if (item.Matter == "轻伤人数") - { - item.Datas = (from x in accidentHandles - select x.MinorInjuriesPersonNum ?? 0).Sum().ToString(); - } - else if (item.Matter == "重伤人数") - { - item.Datas = (from x in accidentHandles - select x.InjuriesPersonNum ?? 0).Sum().ToString(); - } - else if (item.Matter == "死亡人数") - { - item.Datas = (from x in accidentHandles - select x.DeathPersonNum ?? 0).Sum().ToString(); - } - else if (item.Matter == "直接经济损失") - { - item.Datas = (from x in accidentHandles - select x.MoneyLoss ?? 0).Sum().ToString(); - } - else if (item.Matter == "事故失时数") - { - item.Datas = (from x in accidentHandles - select x.WorkHoursLoss ?? 0).Sum().ToString(); - } - } - else - { - item.Datas = "无"; - } - AccidentDesciptionItems.Add(item); + hazardC.IsMajor = Convert.ToBoolean(values.Value("IsMajor").ToString()); } + hazardCs.Add(hazardC); } - this.gvAccidentDesciptionItem.DataSource = AccidentDesciptionItems; - this.gvAccidentDesciptionItem.DataBind(); + } + #endregion + + #region 其他HSE工作计划 + /// + /// 增加其他HSE工作计划 + /// + /// + /// + protected void btnOtherWorkPlanC_Click(object sender, EventArgs e) + { + jerqueSaveOtherWorkPlanCList(); + Model.Manager_Month_OtherWorkPlanC otherWorkPlanC = new Model.Manager_Month_OtherWorkPlanC + { + OtherWorkPlanId = SQLHelper.GetNewID(typeof(Model.Manager_Month_OtherWorkPlanC)) + }; + otherWorkPlanCs.Add(otherWorkPlanC); + this.gvOtherWorkPlanC.DataSource = otherWorkPlanCs; + this.gvOtherWorkPlanC.DataBind(); } /// - /// 检查并保存事故（表二）集合 + /// 删除其他HSE工作计划 /// - private void jerqueSaveAccidentDesciptionItemList() + /// + /// + protected void gvOtherWorkPlanC_RowCommand(object sender, GridCommandEventArgs e) { - AccidentDesciptionItems.Clear(); - JArray mergedData = gvAccidentDesciptionItem.GetMergedData(); + jerqueSaveOtherWorkPlanCList(); + string rowID = this.gvOtherWorkPlanC.DataKeys[e.RowIndex][0].ToString(); + if (e.CommandName == "Delete") + { + foreach (var item in otherWorkPlanCs) + { + if (item.OtherWorkPlanId == rowID) + { + otherWorkPlanCs.Remove(item); + break; + } + } + gvOtherWorkPlanC.DataSource = otherWorkPlanCs; + gvOtherWorkPlanC.DataBind(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + + /// + /// 其他HSE工作计划 + /// + private void jerqueSaveOtherWorkPlanCList() + { + otherWorkPlanCs.Clear(); + JArray mergedData = gvOtherWorkPlanC.GetMergedData(); foreach (JObject mergedRow in mergedData) { string status = mergedRow.Value("status"); JObject values = mergedRow.Value("values"); int i = mergedRow.Value("index"); - Model.Manager_Month_AccidentDesciptionItemC accidentDesciptionItemSort = new Model.Manager_Month_AccidentDesciptionItemC + Model.Manager_Month_OtherWorkPlanC otherWorkPlanC = new Model.Manager_Month_OtherWorkPlanC { - AccidentDesItemId = this.gvAccidentDesciptionItem.Rows[i].DataKeys[0].ToString(), + OtherWorkPlanId = this.gvOtherWorkPlanC.Rows[i].DataKeys[0].ToString(), SortIndex = i, - Matter = values.Value("Matter").ToString(), - Datas = values.Value("Datas").ToString() + WorkContent = values.Value("WorkContent").ToString() }; - AccidentDesciptionItems.Add(accidentDesciptionItemSort); + otherWorkPlanCs.Add(otherWorkPlanC); } } #endregion + #endregion #region 保存按钮 /// @@ -371,10 +237,9 @@ namespace FineUIPro.Web.HSSE.Manager Model.Manager_MonthReportC oldMonthReport = BLL.MonthReportCService.GetMonthReportByMonths(Convert.ToDateTime(Request.Params["months"]), this.CurrUser.LoginProjectId); if (oldMonthReport != null) { - oldMonthReport.AccidentDes = this.txtAccidentDes.Text.Trim(); BLL.MonthReportCService.UpdateMonthReport(oldMonthReport); - OperateAccidentDesciptionSort(MonthReportId); - OperateAccidentDesciptionItemSort(MonthReportId); + OperateHazardCSort(MonthReportId); + OperateOtherWorkPlanCSort(MonthReportId); BLL.LogService.AddSys_Log(this.CurrUser, oldMonthReport.MonthReportCode, oldMonthReport.MonthReportId, BLL.Const.ProjectManagerMonthCMenuId, BLL.Const.BtnModify); } else @@ -388,10 +253,9 @@ namespace FineUIPro.Web.HSSE.Manager monthReport.Months = Funs.GetNewDateTime(Request.Params["months"]); monthReport.ReportMan = this.CurrUser.UserId; monthReport.MonthReportDate = DateTime.Now; - monthReport.AccidentDes = this.txtAccidentDes.Text.Trim(); BLL.MonthReportCService.AddMonthReport(monthReport); - OperateAccidentDesciptionSort(MonthReportId); - OperateAccidentDesciptionItemSort(MonthReportId); + OperateHazardCSort(MonthReportId); + OperateOtherWorkPlanCSort(MonthReportId); BLL.LogService.AddSys_Log(this.CurrUser, monthReport.MonthReportCode, monthReport.MonthReportId, BLL.Const.ProjectManagerMonthCMenuId, BLL.Const.BtnAdd); } ShowNotify("保存成功!", MessageBoxIcon.Success); @@ -399,32 +263,32 @@ namespace FineUIPro.Web.HSSE.Manager } /// - /// 7.1 管理绩效数据统计 表一 + /// 新增危险源识别及控制 /// /// - private void OperateAccidentDesciptionSort(string monthReportId) + private void OperateHazardCSort(string monthReportId) { - BLL.AccidentDesciptionCService.DeleteAccidentDesciptionByMonthReportId(monthReportId); - jerqueSaveAccidentDesciptionList(); - foreach (Model.Manager_Month_AccidentDesciptionC des in accidentDesciptions) + BLL.HazardCService.DeleteHazardByMonthReportId(monthReportId); + jerqueSaveHazardCList(); + foreach (Model.Manager_Month_HazardC des in hazardCs) { des.MonthReportId = monthReportId; - BLL.AccidentDesciptionCService.AddAccidentDesciption(des); + BLL.HazardCService.AddHazard(des); } } /// - /// 7.2 管理绩效数据统计 表二 + /// 7.2 其他HSE工作计划 /// /// - private void OperateAccidentDesciptionItemSort(string monthReportId) + private void OperateOtherWorkPlanCSort(string monthReportId) { - BLL.AccidentDesciptionItemCService.DeleteAccidentDesciptionItemByMonthReportId(monthReportId); - jerqueSaveAccidentDesciptionItemList(); - foreach (Model.Manager_Month_AccidentDesciptionItemC item in AccidentDesciptionItems) + BLL.OtherWorkPlanCService.DeleteOtherWorkPlanByMonthReportId(monthReportId); + jerqueSaveOtherWorkPlanCList(); + foreach (Model.Manager_Month_OtherWorkPlanC item in otherWorkPlanCs) { item.MonthReportId = monthReportId; - BLL.AccidentDesciptionItemCService.AddAccidentDesciptionItem(item); + BLL.OtherWorkPlanCService.AddOtherWorkPlan(item); } } #endregion diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx.designer.cs index aec18882..24ae78ef 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit7.aspx.designer.cs @@ -58,40 +58,76 @@ namespace FineUIPro.Web.HSSE.Manager { protected global::FineUIPro.GroupPanel GroupPanel44; /// - /// gvAccidentDesciption 控件。 + /// gvHazardC 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Grid gvAccidentDesciption; + protected global::FineUIPro.Grid gvHazardC; /// - /// TextBox45 控件。 + /// Toolbar2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox45; + protected global::FineUIPro.Toolbar Toolbar2; /// - /// NumberBox4 控件。 + /// btnNewHazardC 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.NumberBox NumberBox4; + protected global::FineUIPro.Button btnNewHazardC; /// - /// NumberBox5 控件。 + /// TextBox1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.NumberBox NumberBox5; + protected global::FineUIPro.TextBox TextBox1; + + /// + /// TextBox2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox2; + + /// + /// TextBox3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox3; + + /// + /// TextBox4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox4; + + /// + /// drpIsMajor 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpIsMajor; /// /// GroupPanel45 控件。 @@ -103,49 +139,40 @@ namespace FineUIPro.Web.HSSE.Manager { protected global::FineUIPro.GroupPanel GroupPanel45; /// - /// gvAccidentDesciptionItem 控件。 + /// gvOtherWorkPlanC 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Grid gvAccidentDesciptionItem; + protected global::FineUIPro.Grid gvOtherWorkPlanC; /// - /// TextBox46 控件。 + /// Toolbar19 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox46; + protected global::FineUIPro.Toolbar Toolbar19; /// - /// TextBox47 控件。 + /// btnOtherWorkPlanC 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox47; + protected global::FineUIPro.Button btnOtherWorkPlanC; /// - /// GroupPanel46 控件。 + /// TextBox6 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.GroupPanel GroupPanel46; - - /// - /// txtAccidentDes 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtAccidentDes; + protected global::FineUIPro.TextBox TextBox6; /// /// Toolbar1 控件。 diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx index 455d0cf1..e60456dc 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx @@ -4,227 +4,84 @@ - + 8.HSE合规义务识别与评价
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx.cs index a910095b..50e4e11f 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx.cs @@ -1,11 +1,9 @@ -using System; +using BLL; +using Newtonsoft.Json.Linq; +using System; using System.Collections.Generic; using System.Linq; -using System.Web; -using System.Web.UI; using System.Web.UI.WebControls; -using BLL; -using Newtonsoft.Json.Linq; namespace FineUIPro.Web.HSSE.Manager { @@ -41,65 +39,11 @@ namespace FineUIPro.Web.HSSE.Manager ViewState["ProjectId"] = value; } } - - private static DateTime startTime; - - private static DateTime endTime; - - private static DateTime yearStartTime; - - private static DateTime projectStartTime; - #region 定义集合 /// - /// 9.1 危险源动态识别及控制集合 + /// HSE合规义务识别与评价表 /// - private static List hazards = new List(); - - /// - /// 9.2 HSSE培训集合 - /// - private static List trains = new List(); - - /// - /// 9.3 HSSE检查集合 - /// - private static List checks = new List(); - - /// - /// 9.4 HSSE会议集合 - /// - private static List meetings = new List(); - - /// - /// 9.5 HSSE活动集合 - /// - private static List activitiess = new List(); - - /// - /// 9.6.1 应急预案修编集合 - /// - private static List emergencyPlans = new List(); - - /// - /// 9.6.2 应急演练活动集合 - /// - private static List emergencyExercisess = new List(); - - /// - /// 9.7 HSE费用投入计划集合 - /// - private static List costInvestmentPlans = new List(); - - /// - /// 9.8 HSE管理文件/方案修编计划集合 - /// - private static List manageDocPlans = new List(); - - /// - /// 9.9 其他HSE工作计划 - /// - private static List otherWorkPlans = new List(); + private static List complianceObligationsCs = new List(); #endregion @@ -110,316 +54,87 @@ namespace FineUIPro.Web.HSSE.Manager { if (!IsPostBack) { - hazards.Clear(); - trains.Clear(); - checks.Clear(); - meetings.Clear(); - activitiess.Clear(); - emergencyPlans.Clear(); - emergencyExercisess.Clear(); - costInvestmentPlans.Clear(); - manageDocPlans.Clear(); - otherWorkPlans.Clear(); + complianceObligationsCs.Clear(); this.MonthReportId = Request.Params["monthReportId"]; this.ProjectId = this.CurrUser.LoginProjectId; DateTime months = Convert.ToDateTime(Request.Params["months"]); - startTime = Convert.ToDateTime(Request.Params["startTime"]); - endTime = Convert.ToDateTime(Request.Params["endTime"]); - yearStartTime = Convert.ToDateTime(Request.Params["yearStartTime"]); Model.Manager_MonthReportC monthReport = BLL.MonthReportCService.GetMonthReportByMonths(months, this.CurrUser.LoginProjectId); - Model.Manager_MonthReportC mr = BLL.MonthReportCService.GetLastMonthReportByDate(endTime, this.ProjectId); - Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(ProjectId); - if (project.StartDate != null) - { - projectStartTime = Convert.ToDateTime(project.StartDate); - } + if (monthReport != null) { this.MonthReportId = monthReport.MonthReportId; this.ProjectId = monthReport.ProjectId; months = Convert.ToDateTime(monthReport.Months); - this.txtNextEmergencyResponse.Text = monthReport.NextEmergencyResponse; - Model.SGGLDB db = Funs.DB; - //9.1 危险源动态识别及控制 - hazards = (from x in db.Manager_Month_HazardC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); - if (hazards.Count > 0) + + complianceObligationsCs = (from x in Funs.DB.Manager_Month_ComplianceObligationsC where x.MonthReportId == this.MonthReportId select x).ToList(); + if (complianceObligationsCs.Count>0) { - this.gvHazard.DataSource = hazards; - this.gvHazard.DataBind(); - } - //9.3 HSSE检查 - checks = (from x in db.Manager_Month_CheckC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); - if (checks.Count > 0) - { - this.gvCheck.DataSource = checks; - this.gvCheck.DataBind(); - } - //9.8 HSE管理文件/方案修编计划 - manageDocPlans = (from x in db.Manager_Month_ManageDocPlanC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); - if (manageDocPlans.Count > 0) - { - this.gvManageDocPlan.DataSource = manageDocPlans; - this.gvManageDocPlan.DataBind(); - } - //9.9其他HSE工作计划 - otherWorkPlans = (from x in db.Manager_Month_OtherWorkPlanC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); - if (otherWorkPlans.Count > 0) - { - this.gvOtherWorkPlan.DataSource = otherWorkPlans; - this.gvOtherWorkPlan.DataBind(); + this.Grid1.DataSource = complianceObligationsCs; + this.Grid1.DataBind(); } } } } #endregion - #region 危险源动态识别及控制 - /// - /// 增加危险源动态识别及控制 - /// - /// - /// - protected void btnNewHazard_Click(object sender, EventArgs e) + #region HSE合规义务识别与评价 + ///// + ///// 增加HSE合规义务识别与评价 + ///// + ///// + ///// + protected void btnNew_Click(object sender, EventArgs e) { - jerqueSaveMonthHazardList(); - Model.Manager_Month_HazardC hazardSort = new Model.Manager_Month_HazardC + jerqueSaveComplianceObligationsCList(); + Model.Manager_Month_ComplianceObligationsC complianceObligationsC = new Model.Manager_Month_ComplianceObligationsC { - HazardId = SQLHelper.GetNewID(typeof(Model.Manager_Month_HazardC)) + ComplianceObligationsId = SQLHelper.GetNewID(typeof(Model.Manager_Month_ComplianceObligationsC)) }; - hazards.Add(hazardSort); - this.gvHazard.DataSource = hazards; - this.gvHazard.DataBind(); + complianceObligationsCs.Add(complianceObligationsC); + this.Grid1.DataSource = complianceObligationsCs; + this.Grid1.DataBind(); } - /// - /// 检查并保存危险源动态识别及控制集合 - /// - private void jerqueSaveMonthHazardList() + ///// + ///// 检查并保存危险源动态识别及控制集合 + ///// + private void jerqueSaveComplianceObligationsCList() { - hazards.Clear(); - JArray mergedData = gvHazard.GetMergedData(); + complianceObligationsCs.Clear(); + JArray mergedData = Grid1.GetMergedData(); foreach (JObject mergedRow in mergedData) { string status = mergedRow.Value("status"); JObject values = mergedRow.Value("values"); int i = mergedRow.Value("index"); - Model.Manager_Month_HazardC hazardSort = new Model.Manager_Month_HazardC + Model.Manager_Month_ComplianceObligationsC hazardSort = new Model.Manager_Month_ComplianceObligationsC { - HazardId = this.gvHazard.Rows[i].DataKeys[0].ToString(), - SortIndex = i, - WorkArea = values.Value("WorkArea").ToString(), - Subcontractor = values.Value("Subcontractor").ToString(), - DangerousSource = values.Value("DangerousSource").ToString(), - ControlMeasures = values.Value("ControlMeasures").ToString() + ComplianceObligationsId = this.Grid1.Rows[i].DataKeys[0].ToString(), + InformationContent = values.Value("InformationContent").ToString(), + ResponseMeasures = values.Value("ResponseMeasures").ToString(), + ImplementationStatus = values.Value("ImplementationStatus").ToString(), + EvaluationConclusion = values.Value("EvaluationConclusion").ToString() }; - hazards.Add(hazardSort); + complianceObligationsCs.Add(hazardSort); } } - protected void gvHazard_RowCommand(object sender, GridCommandEventArgs e) + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) { - jerqueSaveMonthHazardList(); - string rowID = this.gvHazard.DataKeys[e.RowIndex][0].ToString(); + jerqueSaveComplianceObligationsCList(); + string rowID = this.Grid1.DataKeys[e.RowIndex][0].ToString(); if (e.CommandName == "Delete") { - foreach (var item in hazards) + foreach (var item in complianceObligationsCs) { - if (item.HazardId == rowID) + if (item.ComplianceObligationsId == rowID) { - hazards.Remove(item); + complianceObligationsCs.Remove(item); break; } } - gvHazard.DataSource = hazards; - gvHazard.DataBind(); - ShowNotify("删除数据成功!", MessageBoxIcon.Success); - } - } - #endregion - - #region HSE检查 - /// - /// 增加HSE检查 - /// - /// - /// - protected void btnNewCheck_Click(object sender, EventArgs e) - { - jerqueSaveMonthCheckList(); - Model.Manager_Month_CheckC checkSort = new Model.Manager_Month_CheckC - { - CheckId = SQLHelper.GetNewID(typeof(Model.Manager_Month_CheckC)) - }; - checks.Add(checkSort); - this.gvCheck.DataSource = checks; - this.gvCheck.DataBind(); - } - - /// - /// 检查并保存HSE检查集合 - /// - private void jerqueSaveMonthCheckList() - { - checks.Clear(); - JArray mergedData = gvCheck.GetMergedData(); - foreach (JObject mergedRow in mergedData) - { - string status = mergedRow.Value("status"); - JObject values = mergedRow.Value("values"); - int i = mergedRow.Value("index"); - Model.Manager_Month_CheckC checkSort = new Model.Manager_Month_CheckC - { - CheckId = this.gvCheck.Rows[i].DataKeys[0].ToString(), - SortIndex = i, - CheckType = values.Value("CheckType").ToString(), - Inspectors = values.Value("Inspectors").ToString(), - CheckDate = values.Value("CheckDate").ToString(), - Remark = values.Value("Remark").ToString() - }; - checks.Add(checkSort); - } - } - - protected void gvCheck_RowCommand(object sender, GridCommandEventArgs e) - { - jerqueSaveMonthCheckList(); - string rowID = this.gvCheck.DataKeys[e.RowIndex][0].ToString(); - if (e.CommandName == "Delete") - { - foreach (var item in checks) - { - if (item.CheckId == rowID) - { - checks.Remove(item); - break; - } - } - gvCheck.DataSource = checks; - gvCheck.DataBind(); - ShowNotify("删除数据成功!", MessageBoxIcon.Success); - } - } - #endregion - - #region HSE管理文件/方案修编计划 - /// - /// 增加HSE管理文件/方案修编计划 - /// - /// - /// - protected void btnNewManageDocPlan_Click(object sender, EventArgs e) - { - jerqueSaveMonthManageDocPlanList(); - Model.Manager_Month_ManageDocPlanC manageDocPlanSort = new Model.Manager_Month_ManageDocPlanC - { - ManageDocPlanId = SQLHelper.GetNewID(typeof(Model.Manager_Month_ManageDocPlanC)) - }; - manageDocPlans.Add(manageDocPlanSort); - this.gvManageDocPlan.DataSource = manageDocPlans; - this.gvManageDocPlan.DataBind(); - } - - /// - /// 检查并保存HSE管理文件/方案修编计划集合 - /// - private void jerqueSaveMonthManageDocPlanList() - { - manageDocPlans.Clear(); - JArray mergedData = gvManageDocPlan.GetMergedData(); - foreach (JObject mergedRow in mergedData) - { - string status = mergedRow.Value("status"); - JObject values = mergedRow.Value("values"); - int i = mergedRow.Value("index"); - Model.Manager_Month_ManageDocPlanC manageDocPlanSort = new Model.Manager_Month_ManageDocPlanC - { - ManageDocPlanId = this.gvManageDocPlan.Rows[i].DataKeys[0].ToString(), - SortIndex = i, - ManageDocPlanName = values.Value("ManageDocPlanName").ToString(), - CompileMan = values.Value("CompileMan").ToString(), - CompileDate = values.Value("CompileDate").ToString() - }; - manageDocPlans.Add(manageDocPlanSort); - } - } - - protected void gvManageDocPlan_RowCommand(object sender, GridCommandEventArgs e) - { - jerqueSaveMonthManageDocPlanList(); - string rowID = this.gvManageDocPlan.DataKeys[e.RowIndex][0].ToString(); - if (e.CommandName == "Delete") - { - foreach (var item in manageDocPlans) - { - if (item.ManageDocPlanId == rowID) - { - manageDocPlans.Remove(item); - break; - } - } - gvManageDocPlan.DataSource = manageDocPlans; - gvManageDocPlan.DataBind(); - ShowNotify("删除数据成功!", MessageBoxIcon.Success); - } - } - #endregion - - #region 其他HSE工作计划 - /// - /// 增加其他HSE工作计划 - /// - /// - /// - protected void btnNewOtherWorkPlan_Click(object sender, EventArgs e) - { - jerqueSaveMonthOtherWorkPlanList(); - Model.Manager_Month_OtherWorkPlanC otherWorkPlanSort = new Model.Manager_Month_OtherWorkPlanC - { - OtherWorkPlanId = SQLHelper.GetNewID(typeof(Model.Manager_Month_OtherWorkPlanC)) - }; - otherWorkPlans.Add(otherWorkPlanSort); - this.gvOtherWorkPlan.DataSource = otherWorkPlans; - this.gvOtherWorkPlan.DataBind(); - } - - /// - /// 检查并保存其他HSE工作计划集合 - /// - private void jerqueSaveMonthOtherWorkPlanList() - { - otherWorkPlans.Clear(); - JArray mergedData = gvOtherWorkPlan.GetMergedData(); - foreach (JObject mergedRow in mergedData) - { - string status = mergedRow.Value("status"); - JObject values = mergedRow.Value("values"); - int i = mergedRow.Value("index"); - Model.Manager_Month_OtherWorkPlanC otherWorkPlanSort = new Model.Manager_Month_OtherWorkPlanC - { - OtherWorkPlanId = this.gvOtherWorkPlan.Rows[i].DataKeys[0].ToString(), - SortIndex = i, - WorkContent = values.Value("WorkContent").ToString() - }; - otherWorkPlans.Add(otherWorkPlanSort); - } - } - - protected void gvOtherWorkPlan_RowCommand(object sender, GridCommandEventArgs e) - { - jerqueSaveMonthOtherWorkPlanList(); - string rowID = this.gvOtherWorkPlan.DataKeys[e.RowIndex][0].ToString(); - if (e.CommandName == "Delete") - { - foreach (var item in otherWorkPlans) - { - if (item.OtherWorkPlanId == rowID) - { - otherWorkPlans.Remove(item); - break; - } - } - gvOtherWorkPlan.DataSource = otherWorkPlans; - gvOtherWorkPlan.DataBind(); + Grid1.DataSource = complianceObligationsCs; + Grid1.DataBind(); ShowNotify("删除数据成功!", MessageBoxIcon.Success); } } @@ -436,12 +151,8 @@ namespace FineUIPro.Web.HSSE.Manager Model.Manager_MonthReportC oldMonthReport = BLL.MonthReportCService.GetMonthReportByMonths(Convert.ToDateTime(Request.Params["months"]), this.CurrUser.LoginProjectId); if (oldMonthReport != null) { - oldMonthReport.NextEmergencyResponse = this.txtNextEmergencyResponse.Text.Trim(); BLL.MonthReportCService.UpdateMonthReport(oldMonthReport); - OperateHazardListSort(MonthReportId); - OperateCheckListSort(MonthReportId); - OperateManageDocPlanSort(MonthReportId); - OperateOtherWorkPlanSort(MonthReportId); + OperateComplianceObligationsCSort(MonthReportId); BLL.LogService.AddSys_Log(this.CurrUser, oldMonthReport.MonthReportCode, oldMonthReport.MonthReportId, BLL.Const.ProjectManagerMonthCMenuId, BLL.Const.BtnModify); } else @@ -455,12 +166,8 @@ namespace FineUIPro.Web.HSSE.Manager monthReport.Months = Funs.GetNewDateTime(Request.Params["months"]); monthReport.ReportMan = this.CurrUser.UserId; monthReport.MonthReportDate = DateTime.Now; - monthReport.NextEmergencyResponse = this.txtNextEmergencyResponse.Text.Trim(); BLL.MonthReportCService.AddMonthReport(monthReport); - OperateHazardListSort(MonthReportId); - OperateCheckListSort(MonthReportId); - OperateManageDocPlanSort(MonthReportId); - OperateOtherWorkPlanSort(MonthReportId); + OperateComplianceObligationsCSort(MonthReportId); BLL.LogService.AddSys_Log(this.CurrUser, monthReport.MonthReportCode, monthReport.MonthReportId, BLL.Const.ProjectManagerMonthCMenuId, BLL.Const.BtnAdd); } ShowNotify("保存成功!", MessageBoxIcon.Success); @@ -468,62 +175,17 @@ namespace FineUIPro.Web.HSSE.Manager } /// - /// 9.1 危险源动态识别及控制 + /// HSE合规义务识别与评价 /// /// - private void OperateHazardListSort(string monthReportId) + private void OperateComplianceObligationsCSort(string monthReportId) { - BLL.HazardCService.DeleteHazardByMonthReportId(monthReportId); - jerqueSaveMonthHazardList(); - foreach (Model.Manager_Month_HazardC hazard in hazards) + BLL.ComplianceObligationsCService.DeleteComplianceObligationsCByMonthReportId(monthReportId); + jerqueSaveComplianceObligationsCList(); + foreach (Model.Manager_Month_ComplianceObligationsC coc in complianceObligationsCs) { - hazard.MonthReportId = monthReportId; - BLL.HazardCService.AddHazard(hazard); - } - } - - /// - /// 9.3 HSSE检查 - /// - /// - private void OperateCheckListSort(string monthReportId) - { - BLL.CheckCService.DeleteCheckByMonthReportId(monthReportId); - jerqueSaveMonthCheckList(); - foreach (Model.Manager_Month_CheckC check in checks) - { - check.MonthReportId = monthReportId; - BLL.CheckCService.AddCheck(check); - } - } - - /// - /// 9.8 HSE管理文件/方案修编计划 - /// - /// - private void OperateManageDocPlanSort(string monthReportId) - { - BLL.ManageDocPlanCService.DeleteManageDocPlanByMonthReportId(monthReportId); - jerqueSaveMonthManageDocPlanList(); - foreach (Model.Manager_Month_ManageDocPlanC item in manageDocPlans) - { - item.MonthReportId = monthReportId; - BLL.ManageDocPlanCService.AddManageDocPlan(item); - } - } - - /// - /// 9.9 其他HSE工作计划 - /// - /// - private void OperateOtherWorkPlanSort(string monthReportId) - { - BLL.OtherWorkPlanCService.DeleteOtherWorkPlanByMonthReportId(monthReportId); - jerqueSaveMonthOtherWorkPlanList(); - foreach (Model.Manager_Month_OtherWorkPlanC item in otherWorkPlans) - { - item.MonthReportId = monthReportId; - BLL.OtherWorkPlanCService.AddOtherWorkPlan(item); + coc.MonthReportId = monthReportId; + BLL.ComplianceObligationsCService.AddComplianceObligationsC(coc); } } #endregion diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx.designer.cs index b5c5517b..f54f3920 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit8.aspx.designer.cs @@ -49,22 +49,13 @@ namespace FineUIPro.Web.HSSE.Manager { protected global::FineUIPro.GroupPanel GroupPanel48; /// - /// GroupPanel49 控件。 + /// Grid1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.GroupPanel GroupPanel49; - - /// - /// gvHazard 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Grid gvHazard; + protected global::FineUIPro.Grid Grid1; /// /// Toolbar19 控件。 @@ -76,256 +67,58 @@ namespace FineUIPro.Web.HSSE.Manager { protected global::FineUIPro.Toolbar Toolbar19; /// - /// btnNewHazard 控件。 + /// btnNew 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnNewHazard; + protected global::FineUIPro.Button btnNew; /// - /// TextBox49 控件。 + /// TextBox1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox49; + protected global::FineUIPro.TextBox TextBox1; /// - /// TextBox50 控件。 + /// TextBox2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox50; + protected global::FineUIPro.TextBox TextBox2; /// - /// TextBox51 控件。 + /// TextBox3 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox51; + protected global::FineUIPro.TextBox TextBox3; /// - /// TextBox52 控件。 + /// TextBox4 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox52; + protected global::FineUIPro.TextBox TextBox4; /// - /// GroupPanel51 控件。 + /// lb111 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.GroupPanel GroupPanel51; - - /// - /// gvCheck 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Grid gvCheck; - - /// - /// Toolbar21 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Toolbar Toolbar21; - - /// - /// btnNewCheck 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnNewCheck; - - /// - /// TextBox58 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox58; - - /// - /// TextBox59 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox59; - - /// - /// TextBox60 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox60; - - /// - /// TextBox62 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox62; - - /// - /// GroupPanel54 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.GroupPanel GroupPanel54; - - /// - /// Form2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form Form2; - - /// - /// txtNextEmergencyResponse 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtNextEmergencyResponse; - - /// - /// GroupPanel58 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.GroupPanel GroupPanel58; - - /// - /// gvManageDocPlan 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Grid gvManageDocPlan; - - /// - /// Toolbar26 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Toolbar Toolbar26; - - /// - /// btnNewManageDocPlan 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnNewManageDocPlan; - - /// - /// TextBox78 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox78; - - /// - /// TextBox79 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox79; - - /// - /// TextBox80 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox80; - - /// - /// GroupPanel59 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.GroupPanel GroupPanel59; - - /// - /// gvOtherWorkPlan 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Grid gvOtherWorkPlan; - - /// - /// Toolbar27 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Toolbar Toolbar27; - - /// - /// btnNewOtherWorkPlan 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnNewOtherWorkPlan; - - /// - /// TextBox81 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox TextBox81; + protected global::FineUIPro.Label lb111; /// /// Toolbar1 控件。 diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit9.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit9.aspx index d6da0613..2f34edb7 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit9.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit9.aspx @@ -4,7 +4,7 @@ - + 9.需协调解决的主要问题
@@ -15,7 +15,7 @@ - diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCOut.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCOut.aspx.cs index c3448c25..86a0c7ef 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCOut.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCOut.aspx.cs @@ -299,7 +299,7 @@ namespace FineUIPro.Web.HSSE.Manager } this.txtAccidentDes.Text = monthReport.AccidentDes; //9.1 危险源动态识别及控制 - var hazards = (from x in db.Manager_Month_HazardC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); + var hazards = (from x in db.Manager_Month_HazardC where x.MonthReportId == MonthReportId select x).ToList(); if (hazards.Count > 0) { this.gvHazard.DataSource = hazards; diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView2.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView2.aspx.cs index 689c5f84..f9d4951a 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView2.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView2.aspx.cs @@ -130,7 +130,8 @@ namespace FineUIPro.Web.HSSE.Manager { PersonSortId = SQLHelper.GetNewID(typeof(Model.Manager_PersonSortC)), UnitId = u.UnitId, - SumPersonNum = BLL.PersonService.GetPersonCountByUnitId(u.UnitId, this.CurrUser.LoginProjectId), + SumPersonNum = BLL.PersonService.GetPersonCountByUnitId(u.UnitId, this.CurrUser.LoginProjectId,false),//本部 + SumOutPersonNum = BLL.PersonService.GetPersonCountByUnitId(u.UnitId, this.CurrUser.LoginProjectId, true),//外聘 HSEPersonNum = BLL.PersonService.GetHSEPersonCountByUnitId(u.UnitId, this.CurrUser.LoginProjectId) }; personSorts.Add(personSort); diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView8.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView8.aspx.cs index 9f3ee8ef..a97d1fbc 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView8.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCView8.aspx.cs @@ -130,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Manager this.txtNextEmergencyResponse.Text = monthReport.NextEmergencyResponse; Model.SGGLDB db = Funs.DB; //9.1 危险源动态识别及控制 - hazards = (from x in db.Manager_Month_HazardC where x.MonthReportId == MonthReportId orderby x.SortIndex select x).ToList(); + hazards = (from x in db.Manager_Month_HazardC where x.MonthReportId == MonthReportId select x).ToList(); if (hazards.Count > 0) { this.gvHazard.DataSource = hazards; diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx new file mode 100644 index 00000000..0c964cbb --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx @@ -0,0 +1,171 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectTailTermEdit.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.InspectTailTermEdit" %> + + + + + + 质量巡检 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs new file mode 100644 index 00000000..4087645f --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs @@ -0,0 +1,500 @@ +using BLL; +using Model; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + public partial class InspectTailTermEdit : PageBase + { + /// + /// 主键 + /// + public string TailTermId + { + get { return (string)ViewState["TailTermId"]; } + set { ViewState["TailTermId"] = value; } + } + + /// + /// 是否查看 + /// + public bool IsView + { + get { return (bool)ViewState["IsView"]; } + set { ViewState["IsView"] = value; } + } + + /// + /// 问题图片是否可编辑 + /// + public int QuestionEditImg + { + get { return (int)ViewState["QuestionEditImg"]; } + set { ViewState["QuestionEditImg"] = value; } + } + + /// + /// 整改图片是否可编辑 + /// + public int RectifyEditImg + { + get { return (int)ViewState["RectifyEditImg"]; } + set { ViewState["RectifyEditImg"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.TailTermId = Request["TailTermId"]; + //是否查看 + this.IsView = string.IsNullOrWhiteSpace(Request["IsView"]) ? false : bool.Parse(Request["IsView"]); + //数据绑定 + PageInit(); + //审批已经绑定 + gvApproveBrid(); + //判断是否查看 + if (IsView) + { + btnSave.Hidden = true; + btnSubmit.Hidden = true; + QuestionEditImg = -1; + RectifyEditImg = -1; + txtTailTermCode.Enabled = false; + ddlConstructionUnit.Enabled = false; + ddlProblemType.Enabled = false; + ddlQuestionTechnologyId.Enabled = false; + ddlTermItemId.Enabled = false; + txtQuestionDesc.Enabled = false; + txtRectifyOpinion.Enabled = false; + txtRectifyTime.Enabled = false; + ddlInspectUser.Enabled = false; + ddlApproveUser.Enabled = false; + } + } + } + + /// + /// 默认绑定 + /// + public void PageInit() + { + QuestionEditImg = 0; + RectifyEditImg = 0; + //施工单位 + UnitService.InitUnitByProjectIdUnitTypeDropDownList(ddlConstructionUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); + //获取用户信息 + var users = from user in Funs.DB.Sys_User + join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId + where projectrole.ProjectId == this.CurrUser.LoginProjectId + select user; + //检查人和审核人 + if (users.Count() > 0) + { + //检查人 + ddlInspectUser.DataTextField = "UserName"; + ddlInspectUser.DataValueField = "UserId"; + ddlInspectUser.DataSource = users; + ddlInspectUser.DataBind(); + //审核人 + ddlApproveUser.DataTextField = "UserName"; + ddlApproveUser.DataValueField = "UserId"; + ddlApproveUser.DataSource = users; + ddlApproveUser.DataBind(); + } + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (model != null) + { + //项目名称 + txtProjectName.Text = model.ProjectName; + //巡检编号 + txtTailTermCode.Text = model.TailTermCode; + //施工单位 + ddlConstructionUnit.SelectedValue = model.ConstructionUnit; + //问题类别 + ddlProblemType.SelectedValue = model.ProblemType.ToString(); + //绑定管道或者设备 + if (model.ProblemType == 1) + { + var sysPipingData = from proper in Funs.DB.PreRun_PropertySysPiping + join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId + join termitem in Funs.DB.PreRun_SubInspectTermItem on proper.PropertyId equals termitem.PropertyTechnologyId + where termitem.InspectionResults == 0 && termitem.InspectedUser == this.CurrUser.UserId + group proper by new { proper.PropertyId, proper.PipingCode } into t + select new + { + Id = t.Key.PropertyId, + Code = $"管道：({t.Key.PipingCode})" + }; + if (sysPipingData.Count() > 0) + { + ddlQuestionTechnologyId.DataTextField = "Code"; + ddlQuestionTechnologyId.DataValueField = "Id"; + ddlQuestionTechnologyId.DataSource = sysPipingData; + ddlQuestionTechnologyId.DataBind(); + } + } + else + { + var sysPipingData = from technology in Funs.DB.PreRun_TechnologySysPiping + join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId + join termitem in Funs.DB.PreRun_SubInspectTermItem on technology.TechnologyId equals termitem.PropertyTechnologyId + where termitem.InspectionResults == 0 && termitem.InspectedUser == this.CurrUser.UserId + group technology by new { technology.TechnologyId, technology.TagNumber } into t + select new + { + Id = t.Key.TechnologyId, + Code = $"设备：({t.Key.TagNumber})" + }; + if (sysPipingData.Count() > 0) + { + ddlQuestionTechnologyId.DataTextField = "Code"; + ddlQuestionTechnologyId.DataValueField = "Id"; + ddlQuestionTechnologyId.DataSource = sysPipingData; + ddlQuestionTechnologyId.DataBind(); + } + } + //管道/设备 + ddlQuestionTechnologyId.SelectedValue = model.QuestionTechnologyId; + //绑定检查项 + if (!string.IsNullOrWhiteSpace(ddlQuestionTechnologyId.SelectedValue)) + { + var TermItemIds = Funs.DB.PreRun_InspectTailTerm.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TailTermId != this.TailTermId).Select(a => a.TermItemId).ToList(); + var list = new List(); + if (TermItemIds.Count > 0) + { + list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.PropertyTechnologyId == ddlQuestionTechnologyId.SelectedValue && !TermItemIds.Contains(x.TermItemId)).ToList(); + } + else + { + list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.PropertyTechnologyId == ddlQuestionTechnologyId.SelectedValue).ToList(); + } + if (list.Count() > 0) + { + ddlTermItemId.DataTextField = "WorkInspectName"; + ddlTermItemId.DataValueField = "TermItemId"; + ddlTermItemId.DataSource = list; + ddlTermItemId.DataBind(); + } + } + //检查项 + ddlTermItemId.SelectedValue = model.TermItemId; + //问题描述 + txtQuestionDesc.Text = model.QuestionDesc; + //整改意见 + txtRectifyOpinion.Text = model.RectifyOpinion; + //整改时间 + txtRectifyTime.Text = model.RectifyTime != null ? model.RectifyTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty; + //检查人 + ddlInspectUser.SelectedValue = model.InspectUser; + //审核人 + ddlApproveUser.SelectedValue = model.ApproveUser; + if (model.ApproveState > 1) + { + QuestionEditImg = -1; + RectifyEditImg = -1; + } + } + else + { + this.TailTermId = Guid.NewGuid().ToString(); + var projectModel = Funs.DB.Base_Project.FirstOrDefault(e => e.ProjectId == this.CurrUser.LoginProjectId); + if (projectModel != null) + { + txtProjectName.Text = projectModel.ProjectName; + string code = projectModel.ProjectCode + "-06-CM03-XJ-"; + txtTailTermCode.Text = SQLHelper.RunProcNewId("SpGetNewCode5", "dbo.PreRun_InspectTailTerm", "TailTermCode", code); + } + } + } + + /// + /// 审批意见绑定 + /// + public void gvApproveBrid() + { + string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveState,(case a.ApproveState when 0 then '退回' when 1 then '通过' else '' end) as ApproveStateName,a.AddUser,a.AddTime from PreRun_InspectTermApproveRecords as a inner join PreRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId where 1=1 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId "; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@TailTermId", this.TailTermId)); + strSql += " order by a.AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + gvApprove.DataSource = tb; + gvApprove.DataBind(); + } + + #region 按钮 + + /// + /// 保存 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrWhiteSpace(ddlConstructionUnit.SelectedValue)) + { + ShowNotify("请选择施工单位!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlProblemType.SelectedValue)) + { + ShowNotify("请选择问题类别!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlQuestionTechnologyId.SelectedValue)) + { + ShowNotify("请选择管道/设备!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlTermItemId.SelectedValue)) + { + ShowNotify("请选择检查项!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlInspectUser.SelectedValue)) + { + ShowNotify("请选择检查人!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlApproveUser.SelectedValue)) + { + ShowNotify("请选择审核人!", MessageBoxIcon.Warning); + return; + } + var isAdd = false; + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (model == null) + { + isAdd = true; + model = new PreRun_InspectTailTerm(); + model.TailTermId = this.TailTermId; + model.ProjectId = this.CurrUser.LoginProjectId; + } + model.ProjectName = txtProjectName.Text; + model.TailTermCode = txtTailTermCode.Text; + model.ConstructionUnit = ddlConstructionUnit.SelectedValue; + model.ProblemType = int.Parse(ddlProblemType.SelectedValue); + model.QuestionTechnologyId = ddlQuestionTechnologyId.SelectedValue; + model.TermItemId = ddlTermItemId.SelectedValue; + model.QuestionDesc = txtQuestionDesc.Text.Trim(); + model.RectifyOpinion = txtRectifyOpinion.Text.Trim(); + model.RectifyTime = DateTime.Parse(txtRectifyTime.Text); + model.InspectUser = ddlInspectUser.SelectedValue; + model.ApproveUser = ddlApproveUser.SelectedValue; + model.ApproveState = 0; + model.AddUser = this.CurrUser.LoginProjectId; + model.AddTime = DateTime.Now; + var workPack = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == model.TermItemId); + if (workPack != null) + { + model.WorkPackId = workPack.WorkPackId; + } + if (isAdd) + { + Funs.DB.PreRun_InspectTailTerm.InsertOnSubmit(model); + } + Funs.DB.SubmitChanges(); + ShowNotify("操作成功!", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 保存并提交 + /// + protected void btnSubmit_Click(object sender, EventArgs e) + { + if (string.IsNullOrWhiteSpace(ddlConstructionUnit.SelectedValue)) + { + ShowNotify("请选择施工单位!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlProblemType.SelectedValue)) + { + ShowNotify("请选择问题类别!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlQuestionTechnologyId.SelectedValue)) + { + ShowNotify("请选择管道/设备!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlTermItemId.SelectedValue)) + { + ShowNotify("请选择检查项!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlInspectUser.SelectedValue)) + { + ShowNotify("请选择检查人!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlApproveUser.SelectedValue)) + { + ShowNotify("请选择审核人!", MessageBoxIcon.Warning); + return; + } + var isAdd = false; + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (model == null) + { + isAdd = true; + model = new PreRun_InspectTailTerm(); + model.TailTermId = this.TailTermId; + model.ProjectId = this.CurrUser.LoginProjectId; + } + model.ProjectName = txtProjectName.Text; + model.TailTermCode = txtTailTermCode.Text; + model.ConstructionUnit = ddlConstructionUnit.SelectedValue; + model.ProblemType = int.Parse(ddlProblemType.SelectedValue); + model.QuestionTechnologyId = ddlQuestionTechnologyId.SelectedValue; + model.TermItemId = ddlTermItemId.SelectedValue; + model.QuestionDesc = txtQuestionDesc.Text.Trim(); + model.RectifyOpinion = txtRectifyOpinion.Text.Trim(); + model.RectifyTime = DateTime.Parse(txtRectifyTime.Text); + model.InspectUser = ddlInspectUser.SelectedValue; + model.ApproveUser = ddlApproveUser.SelectedValue; + model.ApproveState = 2; + model.AddUser = this.CurrUser.LoginProjectId; + model.AddTime = DateTime.Now; + var workPack = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == model.TermItemId); + if (workPack != null) + { + model.WorkPackId = workPack.WorkPackId; + } + if (isAdd) + { + Funs.DB.PreRun_InspectTailTerm.InsertOnSubmit(model); + } + Funs.DB.SubmitChanges(); + ShowNotify("操作成功!", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 问题图片 + /// + protected void imgBtnQuestionFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", QuestionEditImg, this.TailTermId + "q", Const.InspectTailTerm))); + } + + /// + /// 整改图片 + /// + protected void imgBtnRectifyFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", RectifyEditImg, this.TailTermId + "h", Const.InspectTailTerm))); + } + + #endregion + + #region 事件 + + /// + /// 问题类别事件 + /// + protected void ddlProblemType_SelectedIndexChanged(object sender, EventArgs e) + { + if (!string.IsNullOrWhiteSpace(ddlProblemType.SelectedValue)) + { + if (ddlProblemType.SelectedValue == "1") + { + var sysPipingData = from proper in Funs.DB.PreRun_PropertySysPiping + join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId + join termitem in Funs.DB.PreRun_SubInspectTermItem on proper.PropertyId equals termitem.PropertyTechnologyId + where termitem.InspectionResults == 0 && termitem.InspectedUser == this.CurrUser.UserId + group proper by new { proper.PropertyId, proper.PipingCode } into t + select new + { + Id = t.Key.PropertyId, + Code = $"管道：({t.Key.PipingCode})" + }; + ddlQuestionTechnologyId.Items.Clear(); + if (sysPipingData.Count() > 0) + { + ddlQuestionTechnologyId.DataTextField = "Code"; + ddlQuestionTechnologyId.DataValueField = "Id"; + ddlQuestionTechnologyId.DataSource = sysPipingData; + ddlQuestionTechnologyId.DataBind(); + } + else + { + ddlQuestionTechnologyId.Items.Insert(0, new ListItem("==无数据==", "")); + } + } + else + { + var sysPipingData = from technology in Funs.DB.PreRun_TechnologySysPiping + join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId + join termitem in Funs.DB.PreRun_SubInspectTermItem on technology.TechnologyId equals termitem.PropertyTechnologyId + where termitem.InspectionResults == 0 && termitem.InspectedUser == this.CurrUser.UserId + group technology by new { technology.TechnologyId, technology.TagNumber } into t + select new + { + Id = t.Key.TechnologyId, + Code = $"设备：({t.Key.TagNumber})" + }; + ddlQuestionTechnologyId.Items.Clear(); + if (sysPipingData.Count() > 0) + { + ddlQuestionTechnologyId.DataTextField = "Code"; + ddlQuestionTechnologyId.DataValueField = "Id"; + ddlQuestionTechnologyId.DataSource = sysPipingData; + ddlQuestionTechnologyId.DataBind(); + } + else + { + ddlQuestionTechnologyId.Items.Insert(0, new ListItem("==无数据==", "")); + } + } + } + } + + /// + /// 管道/设备 + /// + protected void ddlQuestionTechnologyId_SelectedIndexChanged(object sender, EventArgs e) + { + if (string.IsNullOrWhiteSpace(ddlQuestionTechnologyId.SelectedValue)) return; + var TermItemIds = Funs.DB.PreRun_InspectTailTerm.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TailTermId != this.TailTermId).Select(a => a.TermItemId).ToList(); + var list = new List(); + if (TermItemIds.Count > 0) + { + list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.PropertyTechnologyId == ddlQuestionTechnologyId.SelectedValue && !TermItemIds.Contains(x.TermItemId)).ToList(); + } + else + { + list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.PropertyTechnologyId == ddlQuestionTechnologyId.SelectedValue).ToList(); + } + ddlTermItemId.Items.Clear(); + if (list.Count() > 0) + { + ddlTermItemId.DataTextField = "WorkInspectName"; + ddlTermItemId.DataValueField = "TermItemId"; + ddlTermItemId.DataSource = list; + ddlTermItemId.DataBind(); + } + else + { + ddlTermItemId.Items.Insert(0, new ListItem("==无数据==", "")); + } + } + + /// + /// + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + } + + #endregion +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.designer.cs new file mode 100644 index 00000000..925aa731 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.designer.cs @@ -0,0 +1,269 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + + + public partial class InspectTailTermEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// txtProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// txtTailTermCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTailTermCode; + + /// + /// ddlConstructionUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlConstructionUnit; + + /// + /// ddlProblemType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlProblemType; + + /// + /// ddlQuestionTechnologyId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlQuestionTechnologyId; + + /// + /// ddlTermItemId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlTermItemId; + + /// + /// txtQuestionDesc 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtQuestionDesc; + + /// + /// txtRectifyOpinion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRectifyOpinion; + + /// + /// txtRectifyTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtRectifyTime; + + /// + /// ddlInspectUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlInspectUser; + + /// + /// ddlApproveUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlApproveUser; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnQuestionFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnQuestionFile; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// lblAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// imgBtnRectifyFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnRectifyFile; + + /// + /// plApprove2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow plApprove2; + + /// + /// gvApprove 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvApprove; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnSubmit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSubmit; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx new file mode 100644 index 00000000..71295e4f --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx @@ -0,0 +1,163 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectTailTermList.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.InspectTailTermList" %> + + + + + + + + + 质量巡检 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs new file mode 100644 index 00000000..6b3a6ad1 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs @@ -0,0 +1,243 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + public partial class InspectTailTermList : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + //绑定数据 + BindGrid(); + } + } + + + #region 绑定数据 + + /// + /// 数据绑定 + /// + public void BindGrid() + { + string strSql = @"select * from (select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.ProblemType,'管道' as ProblemTypeName,a.QuestionTechnologyId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交' when 1 then '退回' when 2 then '待审核' when 3 then '审核通过' else '待提交' end) as ApproveStateName,a.AddTime from PreRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser where a.ProblemType=1 and a.ProjectId=@projectid and c.InspectedUser=@InspectedUser union all select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.ProblemType,'设备' as ProblemTypeName,a.QuestionTechnologyId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交' when 1 then '退回' when 2 then '待审核' when 3 then '审核通过' else '待提交' end) as ApproveStateName,a.AddTime from PreRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser where a.ProblemType=2 and a.ProjectId=@projectid and c.InspectedUser=@InspectedUser) as t where 1=1 "; + List listStr = new List(); + listStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@InspectedUser", this.CurrUser.UserId)); + //问题类别 + if (!string.IsNullOrWhiteSpace(ddlProblemType.SelectedValue)) + { + strSql += " and t.ProblemType=@ProblemType"; + listStr.Add(new SqlParameter("@ProblemType", ddlProblemType.SelectedValue)); + } + //审核状态 + if (!string.IsNullOrWhiteSpace(ddlApproveState.SelectedValue)) + { + strSql += " and t.ApproveState=@ApproveState"; + listStr.Add(new SqlParameter("@ApproveState", ddlApproveState.SelectedValue)); + } + //开始时间 + if (!string.IsNullOrWhiteSpace(txtStartTime.Text)) + { + strSql += $" and t.RectifyTime>='{DateTime.Parse(txtStartTime.Text.Trim()).ToString("yyyy-MM-dd")} 00:00:00'"; + } + //结束时间 + if (!string.IsNullOrWhiteSpace(txtEndTime.Text)) + { + strSql += $" and t.RectifyTime<='{DateTime.Parse(txtStartTime.Text.Trim()).ToString("yyyy-MM-dd")} 23:59:59'"; + } + strSql += " order by AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 双击事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuModify_Click(null, null); + } + + /// + /// 分页下拉框 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + #region 按钮 + + /// + /// 修改 + /// + protected void btnMenuModify_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ApproveState > 1) + { + Alert.ShowInTop("只可编辑“待提交”和“退回”的记录！", MessageBoxIcon.Warning); + return; + } + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}", Grid1.SelectedRowID, "编辑 - "))); + } + + /// + /// 新增 + /// + protected void btnNew_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId=", "新增 - "))); + } + + /// + /// 查看 + /// + protected void btnMenuView_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?IsView=true&TailTermId={0}", Grid1.SelectedRowID, "查看 - "))); + } + + /// + /// 删除 + /// + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ApproveState != 0) + { + Alert.ShowInTop("只可删除待提交的记录！", MessageBoxIcon.Warning); + return; + } + + Funs.DB.PreRun_InspectTailTerm.DeleteOnSubmit(model); + Funs.DB.SubmitChanges(); + BindGrid(); + Alert.ShowInTop("删除成功！", MessageBoxIcon.Success); + } + } + + /// + /// 查询 + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 弹框关闭 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + /// + /// 提交审核 + /// + protected void btnSubmitReview_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ApproveState > 1) + { + Alert.ShowInTop("只可提交“待提交”和“退回”的记录！", MessageBoxIcon.Warning); + return; + } + model.ApproveState = 2; + Funs.DB.SubmitChanges(); + BindGrid(); + Alert.ShowInTop("提交成功！", MessageBoxIcon.Success); + } + } + + /// + /// 撤回提交 + /// + protected void btnwithdraw_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ApproveState != 2) + { + Alert.ShowInTop("只可撤回“待审核”的记录！", MessageBoxIcon.Warning); + return; + } + model.ApproveState = 0; + Funs.DB.SubmitChanges(); + BindGrid(); + Alert.ShowInTop("撤回成功！", MessageBoxIcon.Success); + } + } + + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.designer.cs new file mode 100644 index 00000000..5094bc84 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.designer.cs @@ -0,0 +1,206 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + + + public partial class InspectTailTermList + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ddlProblemType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlProblemType; + + /// + /// ddlApproveState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlApproveState; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// btnSubmitReview 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSubmitReview; + + /// + /// btnwithdraw 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnwithdraw; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuModify; + + /// + /// btnMenuView 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuView; + + /// + /// btnMenuDel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDel; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx index a6a50fad..c24d23d3 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx @@ -18,7 +18,7 @@ + + + + + + + - + @@ -61,6 +91,21 @@ + + + + + + + + + + + + + + + @@ -76,8 +121,36 @@ //检查人 var ddlInspectedUser = '<%= ddlInspectedUser.ClientID %>'; function renderInspectedUser(value) { - return F(ddlInspectedUser).getTextByValue(value); + if (value == -1) { + return ''; + } else { + return F(ddlInspectedUser).getTextByValue(value); + } } + + var ddbSysPipingClientID = '<%= ddbSysPiping.ClientID %>'; + var cbSysPipingClientID = '<%= cbSysPiping.ClientID %>'; + function onSelectAllClick() { + var cbSysPiping = F(cbSysPipingClientID); + $.each(cbSysPiping.items, function (index, item) { + item.setValue(true); + }); + + // 将数据控件中的值同步到输入框 + F(ddbSysPipingClientID).syncToBox(); + } + + + function onClearAllClick() { + var cbSysPiping = F(cbSysPipingClientID); + $.each(cbSysPiping.items, function (index, item) { + item.setValue(false); + }); + + // 将数据控件中的值同步到输入框 + F(ddbSysPipingClientID).syncToBox(); + } + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs index 15a190f0..799456ec 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs @@ -19,6 +19,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun if (!IsPostBack) { this.InitTreeMenu();//加载树 + PageInit(); } } @@ -37,6 +38,12 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun rootNode.ToolTip = ""; rootNode.EnableClickEvent = true; this.tvControlItem.Nodes.Add(rootNode); + + //var userSubInspects = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).ToList(); + //if (userSubInspects.Count == 0) return; + //var subSystemIds = userSubInspects.ConvertAll(x => x.SubSystemId); + //var workPackIds = userSubInspects.ConvertAll(x => x.WorkPackId); + var list = from a in Funs.DB.PreRun_SysDevice join b in Funs.DB.PreRun_SubSysWorkPackage on a.PreRunId equals b.SubSystemId join c in Funs.DB.PreRun_WorkPackage on b.WorkPackId equals c.WorkPackId @@ -45,6 +52,40 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun if (list.Count() > 0) { + var subSystemIds = list.Select(x => x.PreRunId).ToList(); + var workPackIds = list.Select(x => x.WorkPackId).ToList(); + var selectlist = new List(); + var sysPipingData = from proper in Funs.DB.PreRun_PropertySysPiping + join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId + join inspectterm in Funs.DB.PreRun_SubInspectTerm on selectproper.PropertyId equals inspectterm.PropertyTechnologyId + where subSystemIds.Contains(selectproper.SubSystemId) + select new SelectPropertyTechnology() + { + Id = proper.PropertyId, + Code = $"管道：({proper.PipingCode})", + WorkPackId = inspectterm.WorkPackId, + SubSystemId = selectproper.SubSystemId + }; + if (sysPipingData.Count() > 0) + { + selectlist.AddRange(sysPipingData); + } + var technologylist = from technology in Funs.DB.PreRun_TechnologySysPiping + join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId + join inspectterm in Funs.DB.PreRun_SubInspectTerm on selecttechnology.TechnologyId equals inspectterm.PropertyTechnologyId + where subSystemIds.Contains(selecttechnology.SubSystemId) + select new SelectPropertyTechnology() + { + Id = technology.TechnologyId, + Code = $"设备：({technology.TagNumber})", + WorkPackId = inspectterm.WorkPackId, + SubSystemId = selecttechnology.SubSystemId + }; + if (technologylist.Count() > 0) + { + selectlist.AddRange(technologylist); + } + var subList = list.GroupBy(x => new { x.PreRunId, x.PreRunCode, x.PreRunName }); foreach (var item in subList) { @@ -53,8 +94,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun rootUnitNode.Text = item.Key.PreRunName; rootUnitNode.ToolTip = item.Key.PreRunName; rootUnitNode.CommandName = ""; - rootUnitNode.EnableClickEvent = true; - rootUnitNode.EnableExpandEvent = true; + rootUnitNode.EnableClickEvent = false; + rootUnitNode.EnableExpandEvent = false; rootNode.Nodes.Add(rootUnitNode); rootUnitNode.Expanded = true; var worklist = list.Where(a => a.PreRunId == item.Key.PreRunId).GroupBy(x => new { x.WorkPackId, x.WorkPackName }).ToList(); @@ -67,13 +108,66 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun newNode.NodeID = itemWork.Key.WorkPackId + "|" + item.Key.PreRunId; newNode.ToolTip = itemWork.Key.WorkPackName; newNode.CommandName = ""; - newNode.EnableClickEvent = true; - rootUnitNode.Nodes.Add(newNode); + newNode.Expanded = true; + var workselects = selectlist.Where(x => x.SubSystemId == item.Key.PreRunId && x.WorkPackId == itemWork.Key.WorkPackId); + if (workselects.Count() > 0) + { + newNode.EnableClickEvent = false; + newNode.EnableExpandEvent = false; + rootUnitNode.Nodes.Add(newNode); + foreach (var itemSelect in workselects) + { + TreeNode newNodeSelect = new TreeNode(); + newNodeSelect.Text = itemSelect.Code; + newNodeSelect.NodeID = itemWork.Key.WorkPackId + "|" + item.Key.PreRunId + "|" + itemSelect.Id; + newNodeSelect.ToolTip = itemSelect.Code; + newNodeSelect.CommandName = ""; + newNodeSelect.EnableClickEvent = true; + newNodeSelect.EnableExpandEvent = true; + newNode.Nodes.Add(newNodeSelect); + newNodeSelect.Expanded = true; + } + } + else + { + newNode.EnableClickEvent = true; + newNode.EnableExpandEvent = true; + rootUnitNode.Nodes.Add(newNode); + } } } } } + } + /// + /// 绑定下拉框 + /// + public void PageInit() + { + var userList = Funs.DB.Sys_User; + if (userList.Count() > 0) + { + ddlfbs.DataTextField = "UserName"; + ddlfbs.DataValueField = "UserId"; + ddlfbs.DataSource = userList; + ddlfbs.DataBind(); + + ddlcbs.DataTextField = "UserName"; + ddlcbs.DataValueField = "UserId"; + ddlcbs.DataSource = userList; + ddlcbs.DataBind(); + + ddljl.DataTextField = "UserName"; + ddljl.DataValueField = "UserId"; + ddljl.DataSource = userList; + ddljl.DataBind(); + + ddlyz.DataTextField = "UserName"; + ddlyz.DataValueField = "UserId"; + ddlyz.DataSource = userList; + ddlyz.DataBind(); + } } /// @@ -91,14 +185,125 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// /// 绑定数据 /// - public void BindGrid() + public void BindGrid(bool typechange = true) { var result = new List(); - var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First(); - var subSystemId = this.tvControlItem.SelectedNodeID.Split('|').Last(); + var sysPipingData = new List(); + var workPackId = this.tvControlItem.SelectedNodeID.Split('|')[0]; + var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1]; + var propertytechnologyid = string.Empty; + if (this.tvControlItem.SelectedNodeID.Split('|').Length > 2) + { + propertytechnologyid = this.tvControlItem.SelectedNodeID.Split('|').Last(); + } + if (typechange) + { + var workPage = Funs.DB.PreRun_WorkPackage.FirstOrDefault(x => x.WorkPackId == workPackId); + if (workPage != null) + { + //加载类型 + if (workPage.WorkPackType == 0) + { + ddlWorkPackType.Items.Clear(); + ddlWorkPackType.Items.Insert(0, new ListItem("管道", "1")); + ddlWorkPackType.Items.Insert(1, new ListItem("设备", "2")); + ddlWorkPackType.SelectedValue = "1"; + } + if (workPage.WorkPackType == 1) + { + ddlWorkPackType.Items.Clear(); + ddlWorkPackType.Items.Insert(0, new ListItem("管道", "1")); + ddlWorkPackType.SelectedValue = "1"; + } + if (workPage.WorkPackType == 2) + { + ddlWorkPackType.Items.Clear(); + ddlWorkPackType.Items.Insert(0, new ListItem("设备", "2")); + ddlWorkPackType.SelectedValue = "2"; + } + //加载数据 + if (ddlWorkPackType.SelectedValue == "1") + { + var sysData = from proper in Funs.DB.PreRun_PropertySysPiping + join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId + where selectproper.SubSystemId == subSystemId + select new SelectPropertyTechnology() + { + Id = proper.PropertyId, + Code = $"管道：({proper.PipingCode})" + }; + if (sysData.Count() > 0) + { + sysPipingData = sysData.ToList(); + cbSysPiping.DataTextField = "Code"; + cbSysPiping.DataValueField = "Id"; + cbSysPiping.DataSource = sysPipingData; + cbSysPiping.DataBind(); + } + else + { + cbSysPiping.Items.Clear(); + cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", "")); + } + } + else + { + var sysData = from technology in Funs.DB.PreRun_TechnologySysPiping + join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId + where selecttechnology.SubSystemId == subSystemId + select new SelectPropertyTechnology() + { + Id = technology.TechnologyId, + Code = $"设备：({technology.TagNumber})" + }; + if (sysData.Count() > 0) + { + sysPipingData = sysData.ToList(); + cbSysPiping.DataTextField = "Code"; + cbSysPiping.DataValueField = "Id"; + cbSysPiping.DataSource = sysPipingData; + cbSysPiping.DataBind(); + } + else + { + cbSysPiping.Items.Clear(); + cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", "")); + } + } + } + } + //获取子系统 var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId); - var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId).OrderBy(x => x.Sort).ToList(); + //获取主表数据 + var workPackType = int.Parse(ddlWorkPackType.SelectedValue); + var subModel = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId && x.WorkPackType == workPackType && x.PropertyTechnologyId == propertytechnologyid); + if (subModel != null) + { + if (subModel.WorkPackType != null) + { + ddlWorkPackType.SelectedValue = subModel.WorkPackType.ToString(); + ddlWorkPackType.Enabled = false; + } + var ddlsysModel = sysPipingData.FirstOrDefault(x => x.Id == subModel.PropertyTechnologyId); + if (ddlsysModel != null) + { + ddbSysPiping.Value = ddlsysModel.Id; + ddbSysPiping.Text = ddlsysModel.Code; + } + ddlfbs.SelectedValue = subModel.Subcontractor; + ddlcbs.SelectedValue = subModel.Contractor; + ddljl.SelectedValue = subModel.Supervision; + ddlyz.SelectedValue = subModel.Owner; + } + else + { + ddlfbs.SelectedValue = string.Empty; + ddlcbs.SelectedValue = string.Empty; + ddljl.SelectedValue = string.Empty; + ddlyz.SelectedValue = string.Empty; + } + var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId && x.WorkPackType == workPackType && x.PropertyTechnologyId == propertytechnologyid).OrderBy(x => x.Sort).ToList(); if (list.Count > 0) { foreach (var item in list) @@ -114,6 +319,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun model.SystemId = subSysModel.SystemId; model.SubSystemId = subSysModel.PreRunId; model.InspectedUser = item.InspectedUser; + model.InspectionResults = item.InspectionResults; + model.InspectionIllustrate = item.InspectionIllustrate; model.Sort = item.Sort; model.isChick = true; result.Add(model); @@ -147,7 +354,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun } Grid1.DataSource = result; Grid1.DataBind(); - if(result.Count(x => x.isChick)>0) + if (result.Count(x => x.isChick) > 0) { //默认选中行 var checkids = result.Where(x => x.isChick).Select(a => a.SubItemId); @@ -169,58 +376,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun ddlInspectedUser.DataValueField = "UserId"; ddlInspectedUser.DataSource = data; ddlInspectedUser.DataBind(); - - - #region 注释 - //var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First(); - //var subSystemId = this.tvControlItem.SelectedNodeID.Split('|').Last(); - ////获取子系统 - //var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId); - //var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId).OrderBy(x => x.Sort).ToList(); - //if (list.Count == 0) - //{ - // list = new List(); - // var defaultDatas = Funs.DB.PreRun_WorkInspectTemplate.Where(s => s.WorkPackId == workPackId).OrderBy(x=>x.Sort).ToList(); - // if (defaultDatas.Count > 0) - // { - // int index = 0; - // foreach (var item in defaultDatas) - // { - // var model = new PreRun_SubInspectTermItem(); - // model.SubItemId = Guid.NewGuid().ToString(); - // model.ProjectId = this.CurrUser.LoginProjectId; - // model.WorkPackId = item.WorkPackId; - // model.WorkInspectId = item.WorkInspectId; - // model.WorkInspectName = item.WorkInspectName; - // model.InstallationId = subSysModel.InstallationId; - // model.ProcessesId = subSysModel.ProcessesId; - // model.SystemId = subSysModel.SystemId; - // model.SubSystemId = subSysModel.PreRunId; - // model.Sort = index + 1; - // list.Add(model); - // index++; - // } - // } - //} - - //Grid1.DataSource = list; - //Grid1.DataBind(); - ////检查人绑定 - //var userList = from user in Funs.DB.Sys_User join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId where projectrole.ProjectId == this.CurrUser.LoginProjectId select user; - - //var userids = new List() { Const.sysglyId, Const.hfnbdId, Const.sedinId }; - //var addUserList = Funs.DB.Sys_User.Where(x => userids.Contains(x.UserId)); - //var data = userList.ToList(); - //if (addUserList.Count() > 0) - //{ - // data.AddRange(addUserList); - //} - //DropDownList ddlInspectedUser = Grid1.FindColumn("InspectedUser").FindControl("ddlInspectedUser") as DropDownList; - //ddlInspectedUser.DataTextField = "UserName"; - //ddlInspectedUser.DataValueField = "UserId"; - //ddlInspectedUser.DataSource = data; - //ddlInspectedUser.DataBind(); - #endregion } /// @@ -233,7 +388,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun BindGrid(); } - /// /// 行按钮事件 /// @@ -270,75 +424,129 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { try { + if (string.IsNullOrWhiteSpace(ddlfbs.SelectedValue)) + { + ShowNotify("请选择分包商!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlcbs.SelectedValue)) + { + ShowNotify("请选择承包商!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddljl.SelectedValue)) + { + ShowNotify("请选择监理!", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrWhiteSpace(ddlyz.SelectedValue)) + { + ShowNotify("请选择业主!", MessageBoxIcon.Warning); + return; + } + if (ddbSysPiping.Values.Length == 0) + { + ShowNotify("请选择设备!", MessageBoxIcon.Warning); + return; + } if (Grid1.SelectedRowIndexArray.Length == 0) { ShowNotify("请选择一条数据!", MessageBoxIcon.Warning); return; } - var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First(); - var subSystemId = this.tvControlItem.SelectedNodeID.Split('|').Last(); - var subTrem = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubSystemId == subSystemId && x.WorkPackId == workPackId); - JArray mergedData = Grid1.GetMergedData(); - foreach (JObject mergedRow in mergedData) + + var workPackId = this.tvControlItem.SelectedNodeID.Split('|')[0]; + var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1]; + var workPackType = int.Parse(ddlWorkPackType.SelectedValue); + + List subTrems = new List(); + List subTremItems = new List(); + + foreach (var item in ddbSysPiping.Values) { - string status = mergedRow.Value("status"); - JObject values = mergedRow.Value("values"); - int i = mergedRow.Value("index"); - var subItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); - var workInspectId = this.Grid1.Rows[i].DataKeys[1].ToString(); - if (!Grid1.SelectedRowIndexArray.Contains(i)) continue; - - //获取子系统信息 - var list = new List(); - var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId); - if (subSysModel != null) + var subTrem = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubSystemId == subSystemId && x.WorkPackId == workPackId && x.WorkPackType == workPackType && x.PropertyTechnologyId == item); + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) { - //获取子系统工作包检查表，如果不存在则添加 - if (subTrem == null) - { - subTrem = new PreRun_SubInspectTerm(); - subTrem.SubInspectId = Guid.NewGuid().ToString(); - subTrem.WorkPackId = workPackId; - subTrem.ProjectId = this.CurrUser.LoginProjectId; - subTrem.InstallationId = subSysModel.InstallationId; - subTrem.ProcessesId = subSysModel.ProcessesId; - subTrem.SystemId = subSysModel.SystemId; - subTrem.SubSystemId = subSysModel.PreRunId; - subTrem.AddUser = this.CurrUser.UserId; - subTrem.AddTime = DateTime.Now; - Funs.DB.PreRun_SubInspectTerm.InsertOnSubmit(subTrem); - } + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + var subItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); + var workInspectId = this.Grid1.Rows[i].DataKeys[1].ToString(); + if (!Grid1.SelectedRowIndexArray.Contains(i)) continue; - var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.SubItemId == subItemId); - if (model == null) + //获取子系统信息 + var list = new List(); + var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId); + if (subSysModel != null) { - model = new PreRun_SubInspectTermItem(); - model.SubItemId = subItemId; - model.SubInspectId = subTrem.SubInspectId; - model.WorkPackId = workPackId; - model.ProjectId = this.CurrUser.LoginProjectId; - model.WorkInspectId = workInspectId; - model.WorkInspectName = values.Value("WorkInspectName"); - model.InstallationId = subSysModel.InstallationId; - model.ProcessesId = subSysModel.ProcessesId; - model.SystemId = subSysModel.SystemId; - model.SubSystemId = subSysModel.PreRunId; - model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value("InspectedUser")) ? values.Value("InspectedUser") : string.Empty; - model.AddUser = this.CurrUser.UserId; - model.AddTime = DateTime.Now; - model.Sort = i + 1; - Funs.DB.PreRun_SubInspectTermItem.InsertOnSubmit(model); - } - else - { - model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value("InspectedUser")) ? values.Value("InspectedUser") : string.Empty; - model.WorkInspectName = values.Value("WorkInspectName"); - Funs.DB.SubmitChanges(); + //获取子系统工作包检查表，如果不存在则添加 + if (subTrem == null) + { + subTrem = new PreRun_SubInspectTerm(); + subTrem.SubInspectId = Guid.NewGuid().ToString(); + subTrem.WorkPackId = workPackId; + subTrem.ProjectId = this.CurrUser.LoginProjectId; + subTrem.InstallationId = subSysModel.InstallationId; + subTrem.ProcessesId = subSysModel.ProcessesId; + subTrem.SystemId = subSysModel.SystemId; + subTrem.SubSystemId = subSysModel.PreRunId; + subTrem.Subcontractor = ddlfbs.SelectedValue; + subTrem.Contractor = ddlcbs.SelectedValue; + subTrem.Supervision = ddljl.SelectedValue; + subTrem.Owner = ddlyz.SelectedValue; + subTrem.PropertyTechnologyId = item; + subTrem.WorkPackType = int.Parse(ddlWorkPackType.SelectedValue); + subTrem.AddUser = this.CurrUser.UserId; + subTrem.AddTime = DateTime.Now; + subTrems.Add(subTrem); + //Funs.DB.PreRun_SubInspectTerm.InsertOnSubmit(subTrem); + } + + var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.SubItemId == subItemId && x.PropertyTechnologyId == item); + if (model == null) + { + model = new PreRun_SubInspectTermItem(); + model.TermItemId = Guid.NewGuid().ToString(); + model.SubItemId = subItemId; + model.SubInspectId = subTrem.SubInspectId; + model.WorkPackId = workPackId; + model.ProjectId = this.CurrUser.LoginProjectId; + model.WorkInspectId = workInspectId; + model.WorkInspectName = values.Value("WorkInspectName"); + model.InstallationId = subSysModel.InstallationId; + model.ProcessesId = subSysModel.ProcessesId; + model.SystemId = subSysModel.SystemId; + model.SubSystemId = subSysModel.PreRunId; + model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value("InspectedUser")) ? values.Value("InspectedUser") : string.Empty; + model.Subcontractor = ddlfbs.SelectedValue; + model.Contractor = ddlcbs.SelectedValue; + model.Supervision = ddljl.SelectedValue; + model.Owner = ddlyz.SelectedValue; + model.PropertyTechnologyId = item; + model.WorkPackType = int.Parse(ddlWorkPackType.SelectedValue); + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + model.Sort = i + 1; + subTremItems.Add(model); + //Funs.DB.PreRun_SubInspectTermItem.InsertOnSubmit(model); + } + else + { + model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value("InspectedUser")) ? values.Value("InspectedUser") : string.Empty; + model.WorkInspectName = values.Value("WorkInspectName"); + Funs.DB.SubmitChanges(); + } } + //Funs.DB.SubmitChanges(); } - Funs.DB.SubmitChanges(); } - BindGrid(); + + Funs.DB.PreRun_SubInspectTerm.InsertAllOnSubmit(subTrems); + Funs.DB.PreRun_SubInspectTermItem.InsertAllOnSubmit(subTremItems); + Funs.DB.SubmitChanges(); + this.InitTreeMenu(); + //BindGrid(); ShowNotify("保存成功!"); } catch (Exception ex) @@ -353,8 +561,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun protected void btnAdd_Click(object sender, EventArgs e) { var list = gvList(); - var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First(); - var subSystemId = this.tvControlItem.SelectedNodeID.Split('|').Last(); + var workPackId = this.tvControlItem.SelectedNodeID.Split('|')[0]; + var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1]; //获取子系统 var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId); if (subSysModel != null) @@ -453,5 +661,91 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun public bool isChick { get; set; } } + /// + /// 类型 + /// + protected void ddlWorkPackType_SelectedIndexChanged(object sender, EventArgs e) + { + var workPackId = this.tvControlItem.SelectedNodeID.Split('|')[0]; + var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1]; + if (ddlWorkPackType.SelectedValue == "1") + { + var sysPipingData = from proper in Funs.DB.PreRun_PropertySysPiping + join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId + where selectproper.SubSystemId == subSystemId + select new + { + Id = proper.PropertyId, + Code = $"管道：({proper.PipingCode})" + }; + if (sysPipingData.Count() > 0) + { + cbSysPiping.DataTextField = "Code"; + cbSysPiping.DataValueField = "Id"; + cbSysPiping.DataSource = sysPipingData; + cbSysPiping.DataBind(); + } + else + { + cbSysPiping.Items.Clear(); + cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", "")); + } + } + else + { + var sysPipingData = from technology in Funs.DB.PreRun_TechnologySysPiping + join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId + where selecttechnology.SubSystemId == subSystemId + select new + { + Id = technology.TechnologyId, + Code = $"设备：({technology.TagNumber})" + }; + if (sysPipingData.Count() > 0) + { + cbSysPiping.DataTextField = "Code"; + cbSysPiping.DataValueField = "Id"; + cbSysPiping.DataSource = sysPipingData; + cbSysPiping.DataBind(); + } + else + { + cbSysPiping.Items.Clear(); + cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", "")); + } + } + + } + + /// + /// 设备选择 + /// + protected void ddlSysPiping_SelectedIndexChanged(object sender, EventArgs e) + { + BindGrid(false); + } + + /// + /// 子系统选择的管道/设备 + /// + public class SelectPropertyTechnology + { + /// + /// 主键 + /// + public string Id { get; set; } + /// + /// 编码 + /// + public string Code { get; set; } + /// + /// 工作包主键 + /// + public string WorkPackId { get; set; } + /// + /// 子系统主键 + /// + public string SubSystemId { get; set; } + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs index 3e1fd3a0..c3219fca 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs @@ -77,6 +77,69 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// protected global::FineUIPro.Toolbar Toolbar1; + /// + /// ddlWorkPackType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlWorkPackType; + + /// + /// ddbSysPiping 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownBox ddbSysPiping; + + /// + /// SimpleForm2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.SimpleForm SimpleForm2; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// cbSysPiping 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBoxList cbSysPiping; + + /// + /// btnSelectAll 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSelectAll; + + /// + /// btnClearAll 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClearAll; + /// /// ToolbarFill 控件。 /// @@ -130,5 +193,59 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblInspectionResults; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// ddlfbs 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlfbs; + + /// + /// ddlcbs 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlcbs; + + /// + /// ddljl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddljl; + + /// + /// ddlyz 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlyz; } } diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx index 78d19a08..79c7704c 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx @@ -18,7 +18,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs index 34e7fc5f..b2a82a63 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs @@ -28,8 +28,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// private void InitTreeMenu() { - - this.tvControlItem.Nodes.Clear(); TreeNode rootNode = new TreeNode(); rootNode.Text = "检查表"; @@ -48,9 +46,39 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun join c in Funs.DB.PreRun_WorkPackage on b.WorkPackId equals c.WorkPackId where a.ProjectId == this.CurrUser.LoginProjectId && subSystemIds.Contains(a.PreRunId) && workPackIds.Contains(c.WorkPackId) select new { a.PreRunId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackName }; - if (list.Count() > 0) { + var selectlist = new List(); + var sysPipingData = from proper in Funs.DB.PreRun_PropertySysPiping + join selectproper in Funs.DB.PreRun_SubPropertySelect on proper.PropertyId equals selectproper.PropertyId + join inspectterm in Funs.DB.PreRun_SubInspectTerm on selectproper.PropertyId equals inspectterm.PropertyTechnologyId + where subSystemIds.Contains(selectproper.SubSystemId) + select new SelectPropertyTechnology() + { + Id = proper.PropertyId, + Code = $"管道：({proper.PipingCode})", + WorkPackId = inspectterm.WorkPackId, + SubSystemId = selectproper.SubSystemId + }; + if (sysPipingData.Count() > 0) + { + selectlist.AddRange(sysPipingData); + } + var technologylist = from technology in Funs.DB.PreRun_TechnologySysPiping + join selecttechnology in Funs.DB.PreRun_SubTechnologySelect on technology.TechnologyId equals selecttechnology.TechnologyId + join inspectterm in Funs.DB.PreRun_SubInspectTerm on selecttechnology.TechnologyId equals inspectterm.PropertyTechnologyId + where subSystemIds.Contains(selecttechnology.SubSystemId) + select new SelectPropertyTechnology() + { + Id = technology.TechnologyId, + Code = $"设备：({technology.TagNumber})", + WorkPackId = inspectterm.WorkPackId, + SubSystemId = selecttechnology.SubSystemId + }; + if (technologylist.Count() > 0) + { + selectlist.AddRange(technologylist); + } var subList = list.GroupBy(x => new { x.PreRunId, x.PreRunCode, x.PreRunName }); foreach (var item in subList) { @@ -59,8 +87,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun rootUnitNode.Text = item.Key.PreRunName; rootUnitNode.ToolTip = item.Key.PreRunName; rootUnitNode.CommandName = ""; - rootUnitNode.EnableClickEvent = true; - rootUnitNode.EnableExpandEvent = true; + rootUnitNode.EnableClickEvent = false; + rootUnitNode.EnableExpandEvent = false; rootNode.Nodes.Add(rootUnitNode); rootUnitNode.Expanded = true; var worklist = list.Where(a => a.PreRunId == item.Key.PreRunId).GroupBy(x => new { x.WorkPackId, x.WorkPackName }).ToList(); @@ -73,13 +101,31 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun newNode.NodeID = itemWork.Key.WorkPackId + "|" + item.Key.PreRunId; newNode.ToolTip = itemWork.Key.WorkPackName; newNode.CommandName = ""; - newNode.EnableClickEvent = true; + newNode.EnableClickEvent = false; + newNode.EnableExpandEvent = false; rootUnitNode.Nodes.Add(newNode); + newNode.Expanded = true; + if (selectlist.Count > 0) + { + var workselects = selectlist.Where(x => x.SubSystemId == item.Key.PreRunId && x.WorkPackId == itemWork.Key.WorkPackId); + foreach (var itemSelect in workselects) + { + TreeNode newNodeSelect = new TreeNode(); + newNodeSelect.Text = itemSelect.Code; + newNodeSelect.NodeID = itemWork.Key.WorkPackId + "|" + item.Key.PreRunId + "|" + itemSelect.Id; + newNodeSelect.ToolTip = itemSelect.Code; + newNodeSelect.CommandName = ""; + newNodeSelect.EnableClickEvent = true; + newNodeSelect.EnableExpandEvent = true; + newNode.Nodes.Add(newNodeSelect); + newNodeSelect.Expanded = true; + } + } + } } } } - } /// @@ -100,10 +146,11 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun public void BindGrid() { var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First(); - var subSystemId = this.tvControlItem.SelectedNodeID.Split('|').Last(); + var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1]; + var propertytechnologyid = this.tvControlItem.SelectedNodeID.Split('|').Last(); //获取子系统 var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId); - var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId && x.InspectedUser == this.CurrUser.UserId).ToList(); + var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.WorkPackId == workPackId && x.SubSystemId == subSystemId && x.PropertyTechnologyId == propertytechnologyid && x.InspectedUser == this.CurrUser.UserId).OrderBy(x => x.Sort).ToList(); Grid1.DataSource = list; Grid1.DataBind(); } @@ -120,6 +167,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun #endregion + #region 保存 + /// /// 保存 /// @@ -134,13 +183,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun JObject values = mergedRow.Value("values"); int i = mergedRow.Value("index"); var subItemId = this.Grid1.Rows[i].DataKeys[0].ToString(); - //获取子系统信息 - var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.SubItemId == subItemId); + var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == subItemId); if (model != null) { model.InspectionIllustrate = !string.IsNullOrWhiteSpace(values.Value("InspectionIllustrate")) ? values.Value("InspectionIllustrate") : string.Empty; - model.InspectionResults = !string.IsNullOrWhiteSpace(values.Value("InspectionResults")) ? int.Parse(values.Value("InspectionResults")) : -1; + if (!string.IsNullOrWhiteSpace(values.Value("InspectionResults"))) + { + model.InspectionResults = int.Parse(values.Value("InspectionResults")); + } Funs.DB.SubmitChanges(); } } @@ -152,5 +203,31 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun ShowNotify(ex.Message, MessageBoxIcon.Error); } } + + #endregion + + /// + /// 子系统选择的管道/设备 + /// + public class SelectPropertyTechnology + { + /// + /// 主键 + /// + public string Id { get; set; } + /// + /// 编码 + /// + public string Code { get; set; } + /// + /// 工作包主键 + /// + public string WorkPackId { get; set; } + /// + /// 子系统主键 + /// + public string SubSystemId { get; set; } + } + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.designer.cs index 438b75b9..7c66f4c6 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.designer.cs @@ -102,7 +102,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtInspectionIllustrate; + protected global::FineUIPro.TextArea txtInspectionIllustrate; /// /// ddlInspectionResults 控件。 diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx new file mode 100644 index 00000000..3ece5bf3 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx @@ -0,0 +1,139 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TailTermApprove.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.TailTermApprove" %> + + + + + + 质量巡检 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.cs new file mode 100644 index 00000000..9d666bea --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.cs @@ -0,0 +1,221 @@ +using BLL; +using Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + public partial class TailTermApprove : PageBase + { + /// + /// 主键 + /// + public string TailTermId + { + get { return (string)ViewState["TailTermId"]; } + set { ViewState["TailTermId"] = value; } + } + + /// + /// 问题图片是否可编辑 + /// + public int QuestionEditImg + { + get { return (int)ViewState["QuestionEditImg"]; } + set { ViewState["QuestionEditImg"] = value; } + } + + /// + /// 整改图片是否可编辑 + /// + public int RectifyEditImg + { + get { return (int)ViewState["RectifyEditImg"]; } + set { ViewState["RectifyEditImg"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.TailTermId = Request["TailTermId"]; + this.QuestionEditImg = -1; + this.RectifyEditImg = -1; + //数据绑定 + PageInit(); + } + } + + /// + /// 绑定数据 + /// + public void PageInit() + { + //获取用户信息 + var users = from user in Funs.DB.Sys_User + join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId + where projectrole.ProjectId == this.CurrUser.LoginProjectId + select user; + //检查人和审核人 + if (users.Count() > 0) + { + //检查人 + ddlApproveUser.DataTextField = "UserName"; + ddlApproveUser.DataValueField = "UserId"; + ddlApproveUser.DataSource = users; + ddlApproveUser.DataBind(); + } + txtApproveTime.Text = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"); + ddlApproveUser.SelectedValue = this.CurrUser.UserId; + + var data = from tail in Funs.DB.PreRun_InspectTailTerm + join unit in Funs.DB.Base_Unit on tail.ConstructionUnit equals unit.UnitId + join inspuser in Funs.DB.Sys_User on tail.InspectUser equals inspuser.UserId + join approuser in Funs.DB.Sys_User on tail.ApproveUser equals approuser.UserId + join termitem in Funs.DB.PreRun_SubInspectTermItem on tail.TermItemId equals termitem.TermItemId + where tail.TailTermId == this.TailTermId + select new + { + tail.ProjectName, + tail.TailTermCode, + unit.UnitName, + TermItemName = termitem.WorkInspectName, + tail.QuestionTechnologyId, + tail.QuestionDesc, + tail.RectifyOpinion, + tail.RectifyTime, + tail.ProblemType, + InspectUserName = inspuser.UserName, + ApproveUserName = approuser.UserName, + + }; + if (data.Count() > 0) + { + var model = data.FirstOrDefault(); + //项目名称 + lblProjectName.Text = model.ProjectName; + //巡检编号 + lblTailTermCode.Text = model.TailTermCode; + //施工单位 + lblConstructionUnit.Text = model.UnitName; + //问题类别 + lblProblemType.Text = model.ProblemType == 1 ? "管道" : "设备"; + //管道/设备 + if (model.ProblemType == 1) + { + var piping = Funs.DB.PreRun_PropertySysPiping.FirstOrDefault(x => x.PropertyId == model.QuestionTechnologyId); + if (piping != null) + { + lblQuestionTechnologyId.Text = $"管道：{piping.PipingCode}"; + } + } + else + { + var piping = Funs.DB.PreRun_TechnologySysPiping.FirstOrDefault(x => x.TechnologyId == model.QuestionTechnologyId); + if (piping != null) + { + lblQuestionTechnologyId.Text = $"设备：{piping.TagNumber}"; + } + } + //检查项 + lblTermItemId.Text = model.TermItemName; + //问题描述 + lblQuestionDesc.Text = model.QuestionDesc; + //整改意见 + lblRectifyOpinion.Text = model.RectifyOpinion; + //整改时间 + lblRectifyTime.Text = model.RectifyTime != null ? model.RectifyTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty; + //检查人 + lblInspectUser.Text = model.InspectUserName; + } + } + + /// + /// 问题图片 + /// + protected void imgBtnQuestionFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", QuestionEditImg, this.TailTermId + "q", Const.InspectTailTerm))); + } + + /// + /// 整改图片 + /// + protected void imgBtnRectifyFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", RectifyEditImg, this.TailTermId + "h", Const.InspectTailTerm))); + } + + /// + /// 退回 + /// + protected void btnReturn_Click(object sender, EventArgs e) + { + var tailTerm = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (tailTerm != null) + { + tailTerm.ApproveState = 1; + var model = new PreRun_InspectTermApproveRecords(); + model.InspectTermId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.TermItemId = tailTerm.TermItemId; + model.TailTermId = this.TailTermId; + model.ApproveOpinion = txtApproveOpinion.Text; + model.ApproveTime = DateTime.Parse(txtApproveTime.Text); + model.ApproveUser = ddlApproveUser.SelectedValue; + model.ApproveState = 0; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.PreRun_InspectTermApproveRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("退回成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 通过 + /// + protected void btnPass_Click(object sender, EventArgs e) + { + var tailTerm = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == this.TailTermId); + if (tailTerm != null) + { + //获取审核项 + var termItemModel = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == tailTerm.TermItemId); + if (termItemModel != null) + { + termItemModel.InspectionResults = 1; + } + tailTerm.ApproveState = 3; + var model = new PreRun_InspectTermApproveRecords(); + model.InspectTermId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.TermItemId = tailTerm.TermItemId; + model.TailTermId = this.TailTermId; + model.ApproveOpinion = txtApproveOpinion.Text; + model.ApproveTime = DateTime.Parse(txtApproveTime.Text); + model.ApproveUser = ddlApproveUser.SelectedValue; + model.ApproveState = 1; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.PreRun_InspectTermApproveRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("审核成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 关闭 + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.designer.cs new file mode 100644 index 00000000..39880e3c --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.designer.cs @@ -0,0 +1,269 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + + + public partial class TailTermApprove + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// lblProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblProjectName; + + /// + /// lblTailTermCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblTailTermCode; + + /// + /// lblConstructionUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblConstructionUnit; + + /// + /// lblProblemType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblProblemType; + + /// + /// lblQuestionTechnologyId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblQuestionTechnologyId; + + /// + /// lblTermItemId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblTermItemId; + + /// + /// lblQuestionDesc 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblQuestionDesc; + + /// + /// lblRectifyOpinion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblRectifyOpinion; + + /// + /// lblInspectUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblInspectUser; + + /// + /// lblRectifyTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblRectifyTime; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnQuestionFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnQuestionFile; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// lblAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// imgBtnRectifyFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnRectifyFile; + + /// + /// ddlApproveUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlApproveUser; + + /// + /// txtApproveTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtApproveTime; + + /// + /// txtApproveOpinion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtApproveOpinion; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnReturn 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnReturn; + + /// + /// btnPass 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPass; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx new file mode 100644 index 00000000..3b1fe59c --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx @@ -0,0 +1,145 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TailTermApproveList.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.TailTermApproveList" %> + + + + + + + + + 质量巡检审核 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.cs new file mode 100644 index 00000000..52a18145 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.cs @@ -0,0 +1,138 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + public partial class TailTermApproveList : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + //绑定数据 + BindGrid(); + } + } + + #region 绑定数据 + + /// + /// 数据绑定 + /// + public void BindGrid() + { + string strSql = @"select * from (select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.ProblemType,'管道' as ProblemTypeName,a.QuestionTechnologyId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交' when 1 then '退回' when 2 then '待审核' when 3 then '审核通过' else '待提交' end) as ApproveStateName,a.AddTime from PreRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser where a.ProblemType=1 and a.ApproveState>1 and a.ProjectId=@projectid and a.ApproveUser=@ApproveUser union all select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.ProblemType,'设备' as ProblemTypeName,a.QuestionTechnologyId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交' when 1 then '退回' when 2 then '待审核' when 3 then '审核通过' else '待提交' end) as ApproveStateName,a.AddTime from PreRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser where a.ProblemType=2 and a.ApproveState>1 and a.ProjectId=@projectid and a.ApproveUser=@ApproveUser) as t where 1=1 "; + List listStr = new List(); + listStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@ApproveUser", this.CurrUser.UserId)); + //问题类别 + if (!string.IsNullOrWhiteSpace(ddlProblemType.SelectedValue)) + { + strSql += " and t.ProblemType=@ProblemType"; + listStr.Add(new SqlParameter("@ProblemType", ddlProblemType.SelectedValue)); + } + //审核状态 + if (!string.IsNullOrWhiteSpace(ddlApproveState.SelectedValue)) + { + strSql += " and t.ApproveState=@ApproveState"; + listStr.Add(new SqlParameter("@ApproveState", ddlApproveState.SelectedValue)); + } + strSql += " order by AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 双击事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuApprove_Click(null, null); + } + + /// + /// 分页下拉框 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + /// + /// 关闭弹框 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + + /// + /// 审核 + /// + protected void btnReview_Click(object sender, EventArgs e) + { + btnMenuApprove_Click(null, null); + } + + /// + /// 审核 + /// + protected void btnMenuApprove_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ApproveState != 2) + { + Alert.ShowInTop("只可审核“待审核”的记录！", MessageBoxIcon.Warning); + return; + } + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TailTermApprove.aspx?TailTermId={0}", Grid1.SelectedRowID, "审核 - "))); + } + + /// + /// 搜索 + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.designer.cs new file mode 100644 index 00000000..ad651684 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.designer.cs @@ -0,0 +1,152 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + + + public partial class TailTermApproveList + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ddlProblemType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlProblemType; + + /// + /// ddlApproveState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlApproveState; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnReview 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnReview; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuApprove 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuApprove; + } +} diff --git a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs index 93fa7ba8..8968a929 100644 --- a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs @@ -137,6 +137,8 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary public string ProjectId { get; set; } public DateTime? Mdate { get; set; } + + public string state { get; set; } } #region 生成按钮 @@ -171,7 +173,8 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary { ProblemTypes = x.ProblemTypes, ProjectId = x.ProjectId, - CheckTime=x.CheckTime + CheckTime=x.CheckTime, + States=x.States }).Where(x => x.ProblemTypes == "1").ToList(); //周例会 var list3 = Funs.DB.Meeting_WeekMeeting.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.WeekMeetingDate }).ToList(); @@ -196,7 +199,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary var list7 = Funs.DB.Manager_MonthReportC.Select(x=> new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.Months }).ToList(); //质量巡检 - var list8 = Funs.DB.Check_CheckControl.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.CheckDate }).ToList(); + var list8 = Funs.DB.Check_CheckControl.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.CheckDate,state=x.State }).ToList(); //设备材料报验 var list10 = Funs.DB.Comprehensive_InspectionEquipment.Select @@ -335,6 +338,21 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary allList.Add(model); + //安全巡检已闭合 + model = new Inspection_Summary(); + model.ProjectId = pid; + model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim(); + model.InspectionSummaryId = Guid.NewGuid().ToString(); + model.InspectionSummaryMbId = "28"; + AqxjCount = list2.Where(x => x.ProjectId == pid && x.States=="3").ToList().Count(); + model.SummeryResult = AqxjCount.ToString(); + //时间 + if (AqxjCount > 0) + { + model.CompileDate = list2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.CheckTime).FirstOrDefault().CheckTime; + } + + allList.Add(model); //周例会 model = new Inspection_Summary(); @@ -437,6 +455,23 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary } allList.Add(model); + //质量巡检已闭合项 + model = new Inspection_Summary(); + model.ProjectId = pid; + model.CompileDate = DateTime.Now; + model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim(); + model.InspectionSummaryId = Guid.NewGuid().ToString(); + model.InspectionSummaryMbId = "29"; + //已闭合 + ZlxjCount = list8.Where(x => x.ProjectId == pid&&x.state=="7").ToList().Count; + model.SummeryResult = ZlxjCount.ToString(); + if (ZlxjCount > 0) + { + //巡检日期 + model.CompileDate = list8.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate; + } + allList.Add(model); + //WBS数据 model = new Inspection_Summary(); model.ProjectId = pid; diff --git a/SGGL/Model/APIItem/HSSE/HSSELogItem.cs b/SGGL/Model/APIItem/HSSE/HSSELogItem.cs new file mode 100644 index 00000000..9083866d --- /dev/null +++ b/SGGL/Model/APIItem/HSSE/HSSELogItem.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model +{ + public class HSSELogItem + { + public string HSSELogId { get; set; } + + public string ProjectId { get; set; } + public string CompileDate { get; set; } + public string CompileMan { get; set; } + public string Weather { get; set; } + public bool? IsVisible { get; set; } + public string CompileManName { get; set; } + public string WeatherName { get; set; } + + public int? Num11 { get; set; } + + + + public string Contents12 { get; set; } + public string Contents13 { get; set; } + public string Contents21 { get; set; } + + public int? Num21 { get; set; } + public string Contents22 { get; set; } + + public int? Num22 { get; set; } + public string Contents23 { get; set; } + public int? Num23 { get; set; } + public string Contents24 { get; set; } + public int? Num24 { get; set; } + public string Contents210 { get; set; } + public int? Num210 { get; set; } + public int? Num211 { get; set; } + public string Contents31 { get; set; } + public int? Num31 { get; set; } + public string Contents32 { get; set; } + public int? Num32 { get; set; } + public string Contents41 { get; set; } + public string Contents42 { get; set; } + + #region 添加修改时字段 + public string Content1 { get; set; } + public string Content2 { get; set; } + public string Content3 { get; set; } + public string Content4 { get; set; } + public string Content5 { get; set; } + public string Content6 { get; set; } + public string Content7 { get; set; } + public string Content8 { get; set; } + public string Content9 { get; set; } + public string Content10 { get; set; } + public string Content11 { get; set; } + public string Content12 { get; set; } + public string Content13 { get; set; } + public string Content14 { get; set; } + public string Content15 { get; set; } + public string Content16 { get; set; } + public string Content17 { get; set; } + public string Content18 { get; set; } + public string Content19 { get; set; } + public string Content20 { get; set; } + #endregion + } +} diff --git a/SGGL/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; } } } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index a3d83c74..f3139172 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1376,6 +1376,9 @@ namespace Model partial void InsertManager_Month_CheckC(Manager_Month_CheckC instance); partial void UpdateManager_Month_CheckC(Manager_Month_CheckC instance); partial void DeleteManager_Month_CheckC(Manager_Month_CheckC instance); + partial void InsertManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); + partial void UpdateManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); + partial void DeleteManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void InsertManager_Month_CostInvestmentPlanC(Manager_Month_CostInvestmentPlanC instance); partial void UpdateManager_Month_CostInvestmentPlanC(Manager_Month_CostInvestmentPlanC instance); partial void DeleteManager_Month_CostInvestmentPlanC(Manager_Month_CostInvestmentPlanC instance); @@ -1394,12 +1397,18 @@ namespace Model partial void InsertManager_Month_HazardC(Manager_Month_HazardC instance); partial void UpdateManager_Month_HazardC(Manager_Month_HazardC instance); partial void DeleteManager_Month_HazardC(Manager_Month_HazardC instance); + partial void InsertManager_Month_InjuryAccidentC(Manager_Month_InjuryAccidentC instance); + partial void UpdateManager_Month_InjuryAccidentC(Manager_Month_InjuryAccidentC instance); + partial void DeleteManager_Month_InjuryAccidentC(Manager_Month_InjuryAccidentC instance); partial void InsertManager_Month_ManageDocPlanC(Manager_Month_ManageDocPlanC instance); partial void UpdateManager_Month_ManageDocPlanC(Manager_Month_ManageDocPlanC instance); partial void DeleteManager_Month_ManageDocPlanC(Manager_Month_ManageDocPlanC instance); partial void InsertManager_Month_MeetingC(Manager_Month_MeetingC instance); partial void UpdateManager_Month_MeetingC(Manager_Month_MeetingC instance); partial void DeleteManager_Month_MeetingC(Manager_Month_MeetingC instance); + partial void InsertManager_Month_NoInjuryAccidentC(Manager_Month_NoInjuryAccidentC instance); + partial void UpdateManager_Month_NoInjuryAccidentC(Manager_Month_NoInjuryAccidentC instance); + partial void DeleteManager_Month_NoInjuryAccidentC(Manager_Month_NoInjuryAccidentC instance); partial void InsertManager_Month_OtherManagementC(Manager_Month_OtherManagementC instance); partial void UpdateManager_Month_OtherManagementC(Manager_Month_OtherManagementC instance); partial void DeleteManager_Month_OtherManagementC(Manager_Month_OtherManagementC instance); @@ -1409,6 +1418,9 @@ namespace Model partial void InsertManager_Month_OtherWorkPlanC(Manager_Month_OtherWorkPlanC instance); partial void UpdateManager_Month_OtherWorkPlanC(Manager_Month_OtherWorkPlanC instance); partial void DeleteManager_Month_OtherWorkPlanC(Manager_Month_OtherWorkPlanC instance); + partial void InsertManager_Month_PerformanceIndicatorC(Manager_Month_PerformanceIndicatorC instance); + partial void UpdateManager_Month_PerformanceIndicatorC(Manager_Month_PerformanceIndicatorC instance); + partial void DeleteManager_Month_PerformanceIndicatorC(Manager_Month_PerformanceIndicatorC instance); partial void InsertManager_Month_PlanC(Manager_Month_PlanC instance); partial void UpdateManager_Month_PlanC(Manager_Month_PlanC instance); partial void DeleteManager_Month_PlanC(Manager_Month_PlanC instance); @@ -1445,6 +1457,9 @@ namespace Model partial void InsertManager_PromotionalActiviteSortC(Manager_PromotionalActiviteSortC instance); partial void UpdateManager_PromotionalActiviteSortC(Manager_PromotionalActiviteSortC instance); partial void DeleteManager_PromotionalActiviteSortC(Manager_PromotionalActiviteSortC instance); + partial void InsertManager_RewardAndPunishSortC(Manager_RewardAndPunishSortC instance); + partial void UpdateManager_RewardAndPunishSortC(Manager_RewardAndPunishSortC instance); + partial void DeleteManager_RewardAndPunishSortC(Manager_RewardAndPunishSortC instance); partial void InsertManager_SafetyDataD(Manager_SafetyDataD instance); partial void UpdateManager_SafetyDataD(Manager_SafetyDataD instance); partial void DeleteManager_SafetyDataD(Manager_SafetyDataD instance); @@ -1625,6 +1640,12 @@ namespace Model partial void InsertPersonTrain_TrainPlan(PersonTrain_TrainPlan instance); partial void UpdatePersonTrain_TrainPlan(PersonTrain_TrainPlan instance); partial void DeletePersonTrain_TrainPlan(PersonTrain_TrainPlan instance); + partial void InsertPreRun_InspectTailTerm(PreRun_InspectTailTerm instance); + partial void UpdatePreRun_InspectTailTerm(PreRun_InspectTailTerm instance); + partial void DeletePreRun_InspectTailTerm(PreRun_InspectTailTerm instance); + partial void InsertPreRun_InspectTermApproveRecords(PreRun_InspectTermApproveRecords instance); + partial void UpdatePreRun_InspectTermApproveRecords(PreRun_InspectTermApproveRecords instance); + partial void DeletePreRun_InspectTermApproveRecords(PreRun_InspectTermApproveRecords instance); partial void InsertPreRun_PropertySysPiping(PreRun_PropertySysPiping instance); partial void UpdatePreRun_PropertySysPiping(PreRun_PropertySysPiping instance); partial void DeletePreRun_PropertySysPiping(PreRun_PropertySysPiping instance); @@ -6022,6 +6043,14 @@ namespace Model } } + public System.Data.Linq.Table Manager_Month_ComplianceObligationsC + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Manager_Month_CostInvestmentPlanC { get @@ -6070,6 +6099,14 @@ namespace Model } } + public System.Data.Linq.Table Manager_Month_InjuryAccidentC + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Manager_Month_ManageDocPlanC { get @@ -6086,6 +6123,14 @@ namespace Model } } + public System.Data.Linq.Table Manager_Month_NoInjuryAccidentC + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Manager_Month_OtherManagementC { get @@ -6110,6 +6155,14 @@ namespace Model } } + public System.Data.Linq.Table Manager_Month_PerformanceIndicatorC + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Manager_Month_PlanC { get @@ -6206,6 +6259,14 @@ namespace Model } } + public System.Data.Linq.Table Manager_RewardAndPunishSortC + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Manager_SafetyDataD { get @@ -6686,6 +6747,22 @@ namespace Model } } + public System.Data.Linq.Table PreRun_InspectTailTerm + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table PreRun_InspectTermApproveRecords + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table PreRun_PropertySysPiping { get @@ -224357,6 +224434,229 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligationsC")] + public partial class Manager_Month_ComplianceObligationsC : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ComplianceObligationsId; + + private string _MonthReportId; + + private string _InformationContent; + + private string _ResponseMeasures; + + private string _ImplementationStatus; + + private string _EvaluationConclusion; + + private EntityRef _Manager_MonthReportC; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnComplianceObligationsIdChanging(string value); + partial void OnComplianceObligationsIdChanged(); + partial void OnMonthReportIdChanging(string value); + partial void OnMonthReportIdChanged(); + partial void OnInformationContentChanging(string value); + partial void OnInformationContentChanged(); + partial void OnResponseMeasuresChanging(string value); + partial void OnResponseMeasuresChanged(); + partial void OnImplementationStatusChanging(string value); + partial void OnImplementationStatusChanged(); + partial void OnEvaluationConclusionChanging(string value); + partial void OnEvaluationConclusionChanged(); + #endregion + + public Manager_Month_ComplianceObligationsC() + { + this._Manager_MonthReportC = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ComplianceObligationsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ComplianceObligationsId + { + get + { + return this._ComplianceObligationsId; + } + set + { + if ((this._ComplianceObligationsId != value)) + { + this.OnComplianceObligationsIdChanging(value); + this.SendPropertyChanging(); + this._ComplianceObligationsId = value; + this.SendPropertyChanged("ComplianceObligationsId"); + this.OnComplianceObligationsIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")] + public string MonthReportId + { + get + { + return this._MonthReportId; + } + set + { + if ((this._MonthReportId != value)) + { + if (this._Manager_MonthReportC.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnMonthReportIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportId = value; + this.SendPropertyChanged("MonthReportId"); + this.OnMonthReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InformationContent", DbType="NVarChar(500)")] + public string InformationContent + { + get + { + return this._InformationContent; + } + set + { + if ((this._InformationContent != value)) + { + this.OnInformationContentChanging(value); + this.SendPropertyChanging(); + this._InformationContent = value; + this.SendPropertyChanged("InformationContent"); + this.OnInformationContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponseMeasures", DbType="NVarChar(500)")] + public string ResponseMeasures + { + get + { + return this._ResponseMeasures; + } + set + { + if ((this._ResponseMeasures != value)) + { + this.OnResponseMeasuresChanging(value); + this.SendPropertyChanging(); + this._ResponseMeasures = value; + this.SendPropertyChanged("ResponseMeasures"); + this.OnResponseMeasuresChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(500)")] + public string ImplementationStatus + { + get + { + return this._ImplementationStatus; + } + set + { + if ((this._ImplementationStatus != value)) + { + this.OnImplementationStatusChanging(value); + this.SendPropertyChanging(); + this._ImplementationStatus = value; + this.SendPropertyChanged("ImplementationStatus"); + this.OnImplementationStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationConclusion", DbType="NVarChar(50)")] + public string EvaluationConclusion + { + get + { + return this._EvaluationConclusion; + } + set + { + if ((this._EvaluationConclusion != value)) + { + this.OnEvaluationConclusionChanging(value); + this.SendPropertyChanging(); + this._EvaluationConclusion = value; + this.SendPropertyChanged("EvaluationConclusion"); + this.OnEvaluationConclusionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligationsC_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] + public Manager_MonthReportC Manager_MonthReportC + { + get + { + return this._Manager_MonthReportC.Entity; + } + set + { + Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity; + if (((previousValue != value) + || (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Manager_MonthReportC.Entity = null; + previousValue.Manager_Month_ComplianceObligationsC.Remove(this); + } + this._Manager_MonthReportC.Entity = value; + if ((value != null)) + { + value.Manager_Month_ComplianceObligationsC.Add(this); + this._MonthReportId = value.MonthReportId; + } + else + { + this._MonthReportId = default(string); + } + this.SendPropertyChanged("Manager_MonthReportC"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_CostInvestmentPlanC")] public partial class Manager_Month_CostInvestmentPlanC : INotifyPropertyChanging, INotifyPropertyChanged { @@ -225580,13 +225880,13 @@ namespace Model private string _WorkArea; - private string _Subcontractor; + private string _EnvironmentalFactors; - private string _DangerousSource; + private string _Consequence; private string _ControlMeasures; - private System.Nullable _SortIndex; + private System.Nullable _IsMajor; private EntityRef _Manager_MonthReportC; @@ -225600,14 +225900,14 @@ namespace Model partial void OnMonthReportIdChanged(); partial void OnWorkAreaChanging(string value); partial void OnWorkAreaChanged(); - partial void OnSubcontractorChanging(string value); - partial void OnSubcontractorChanged(); - partial void OnDangerousSourceChanging(string value); - partial void OnDangerousSourceChanged(); + partial void OnEnvironmentalFactorsChanging(string value); + partial void OnEnvironmentalFactorsChanged(); + partial void OnConsequenceChanging(string value); + partial void OnConsequenceChanged(); partial void OnControlMeasuresChanging(string value); partial void OnControlMeasuresChanged(); - partial void OnSortIndexChanging(System.Nullable value); - partial void OnSortIndexChanged(); + partial void OnIsMajorChanging(System.Nullable value); + partial void OnIsMajorChanged(); #endregion public Manager_Month_HazardC() @@ -225680,42 +225980,42 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="NVarChar(50)")] - public string Subcontractor + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnvironmentalFactors", DbType="NVarChar(500)")] + public string EnvironmentalFactors { get { - return this._Subcontractor; + return this._EnvironmentalFactors; } set { - if ((this._Subcontractor != value)) + if ((this._EnvironmentalFactors != value)) { - this.OnSubcontractorChanging(value); + this.OnEnvironmentalFactorsChanging(value); this.SendPropertyChanging(); - this._Subcontractor = value; - this.SendPropertyChanged("Subcontractor"); - this.OnSubcontractorChanged(); + this._EnvironmentalFactors = value; + this.SendPropertyChanged("EnvironmentalFactors"); + this.OnEnvironmentalFactorsChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DangerousSource", DbType="NVarChar(50)")] - public string DangerousSource + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Consequence", DbType="NVarChar(500)")] + public string Consequence { get { - return this._DangerousSource; + return this._Consequence; } set { - if ((this._DangerousSource != value)) + if ((this._Consequence != value)) { - this.OnDangerousSourceChanging(value); + this.OnConsequenceChanging(value); this.SendPropertyChanging(); - this._DangerousSource = value; - this.SendPropertyChanged("DangerousSource"); - this.OnDangerousSourceChanged(); + this._Consequence = value; + this.SendPropertyChanged("Consequence"); + this.OnConsequenceChanged(); } } } @@ -225740,22 +226040,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")] - public System.Nullable SortIndex + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsMajor", DbType="Bit")] + public System.Nullable IsMajor { get { - return this._SortIndex; + return this._IsMajor; } set { - if ((this._SortIndex != value)) + if ((this._IsMajor != value)) { - this.OnSortIndexChanging(value); + this.OnIsMajorChanging(value); this.SendPropertyChanging(); - this._SortIndex = value; - this.SendPropertyChanged("SortIndex"); - this.OnSortIndexChanged(); + this._IsMajor = value; + this.SendPropertyChanged("IsMajor"); + this.OnIsMajorChanged(); } } } @@ -225815,6 +226115,397 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_InjuryAccidentC")] + public partial class Manager_Month_InjuryAccidentC : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _InjuryAccidentId; + + private string _MonthReportId; + + private string _UnitName; + + private System.Nullable _AttemptedIncidents; + + private System.Nullable _FirstAidDressing; + + private System.Nullable _MedicalTreatment; + + private System.Nullable _WorkLimitation; + + private System.Nullable _LossPerson; + + private System.Nullable _LossWorkTime; + + private System.Nullable _LossEconomy; + + private System.Nullable _DeathPerson; + + private System.Nullable _DeathWorkTime; + + private System.Nullable _DeathEconomy; + + private EntityRef _Manager_MonthReportC; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnInjuryAccidentIdChanging(string value); + partial void OnInjuryAccidentIdChanged(); + partial void OnMonthReportIdChanging(string value); + partial void OnMonthReportIdChanged(); + partial void OnUnitNameChanging(string value); + partial void OnUnitNameChanged(); + partial void OnAttemptedIncidentsChanging(System.Nullable value); + partial void OnAttemptedIncidentsChanged(); + partial void OnFirstAidDressingChanging(System.Nullable value); + partial void OnFirstAidDressingChanged(); + partial void OnMedicalTreatmentChanging(System.Nullable value); + partial void OnMedicalTreatmentChanged(); + partial void OnWorkLimitationChanging(System.Nullable value); + partial void OnWorkLimitationChanged(); + partial void OnLossPersonChanging(System.Nullable value); + partial void OnLossPersonChanged(); + partial void OnLossWorkTimeChanging(System.Nullable value); + partial void OnLossWorkTimeChanged(); + partial void OnLossEconomyChanging(System.Nullable value); + partial void OnLossEconomyChanged(); + partial void OnDeathPersonChanging(System.Nullable value); + partial void OnDeathPersonChanged(); + partial void OnDeathWorkTimeChanging(System.Nullable value); + partial void OnDeathWorkTimeChanged(); + partial void OnDeathEconomyChanging(System.Nullable value); + partial void OnDeathEconomyChanged(); + #endregion + + public Manager_Month_InjuryAccidentC() + { + this._Manager_MonthReportC = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InjuryAccidentId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string InjuryAccidentId + { + get + { + return this._InjuryAccidentId; + } + set + { + if ((this._InjuryAccidentId != value)) + { + this.OnInjuryAccidentIdChanging(value); + this.SendPropertyChanging(); + this._InjuryAccidentId = value; + this.SendPropertyChanged("InjuryAccidentId"); + this.OnInjuryAccidentIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")] + public string MonthReportId + { + get + { + return this._MonthReportId; + } + set + { + if ((this._MonthReportId != value)) + { + if (this._Manager_MonthReportC.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnMonthReportIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportId = value; + this.SendPropertyChanged("MonthReportId"); + this.OnMonthReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(50)")] + public string UnitName + { + get + { + return this._UnitName; + } + set + { + if ((this._UnitName != value)) + { + this.OnUnitNameChanging(value); + this.SendPropertyChanging(); + this._UnitName = value; + this.SendPropertyChanged("UnitName"); + this.OnUnitNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttemptedIncidents", DbType="Int")] + public System.Nullable AttemptedIncidents + { + get + { + return this._AttemptedIncidents; + } + set + { + if ((this._AttemptedIncidents != value)) + { + this.OnAttemptedIncidentsChanging(value); + this.SendPropertyChanging(); + this._AttemptedIncidents = value; + this.SendPropertyChanged("AttemptedIncidents"); + this.OnAttemptedIncidentsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FirstAidDressing", DbType="Int")] + public System.Nullable FirstAidDressing + { + get + { + return this._FirstAidDressing; + } + set + { + if ((this._FirstAidDressing != value)) + { + this.OnFirstAidDressingChanging(value); + this.SendPropertyChanging(); + this._FirstAidDressing = value; + this.SendPropertyChanged("FirstAidDressing"); + this.OnFirstAidDressingChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MedicalTreatment", DbType="Int")] + public System.Nullable MedicalTreatment + { + get + { + return this._MedicalTreatment; + } + set + { + if ((this._MedicalTreatment != value)) + { + this.OnMedicalTreatmentChanging(value); + this.SendPropertyChanging(); + this._MedicalTreatment = value; + this.SendPropertyChanged("MedicalTreatment"); + this.OnMedicalTreatmentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLimitation", DbType="Int")] + public System.Nullable WorkLimitation + { + get + { + return this._WorkLimitation; + } + set + { + if ((this._WorkLimitation != value)) + { + this.OnWorkLimitationChanging(value); + this.SendPropertyChanging(); + this._WorkLimitation = value; + this.SendPropertyChanged("WorkLimitation"); + this.OnWorkLimitationChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LossPerson", DbType="Int")] + public System.Nullable LossPerson + { + get + { + return this._LossPerson; + } + set + { + if ((this._LossPerson != value)) + { + this.OnLossPersonChanging(value); + this.SendPropertyChanging(); + this._LossPerson = value; + this.SendPropertyChanged("LossPerson"); + this.OnLossPersonChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LossWorkTime", DbType="Decimal(18,2)")] + public System.Nullable LossWorkTime + { + get + { + return this._LossWorkTime; + } + set + { + if ((this._LossWorkTime != value)) + { + this.OnLossWorkTimeChanging(value); + this.SendPropertyChanging(); + this._LossWorkTime = value; + this.SendPropertyChanged("LossWorkTime"); + this.OnLossWorkTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LossEconomy", DbType="Decimal(18,2)")] + public System.Nullable LossEconomy + { + get + { + return this._LossEconomy; + } + set + { + if ((this._LossEconomy != value)) + { + this.OnLossEconomyChanging(value); + this.SendPropertyChanging(); + this._LossEconomy = value; + this.SendPropertyChanged("LossEconomy"); + this.OnLossEconomyChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DeathPerson", DbType="Int")] + public System.Nullable DeathPerson + { + get + { + return this._DeathPerson; + } + set + { + if ((this._DeathPerson != value)) + { + this.OnDeathPersonChanging(value); + this.SendPropertyChanging(); + this._DeathPerson = value; + this.SendPropertyChanged("DeathPerson"); + this.OnDeathPersonChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DeathWorkTime", DbType="Decimal(18,2)")] + public System.Nullable DeathWorkTime + { + get + { + return this._DeathWorkTime; + } + set + { + if ((this._DeathWorkTime != value)) + { + this.OnDeathWorkTimeChanging(value); + this.SendPropertyChanging(); + this._DeathWorkTime = value; + this.SendPropertyChanged("DeathWorkTime"); + this.OnDeathWorkTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DeathEconomy", DbType="Decimal(18,2)")] + public System.Nullable DeathEconomy + { + get + { + return this._DeathEconomy; + } + set + { + if ((this._DeathEconomy != value)) + { + this.OnDeathEconomyChanging(value); + this.SendPropertyChanging(); + this._DeathEconomy = value; + this.SendPropertyChanged("DeathEconomy"); + this.OnDeathEconomyChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_InjuryAccidentC_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] + public Manager_MonthReportC Manager_MonthReportC + { + get + { + return this._Manager_MonthReportC.Entity; + } + set + { + Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity; + if (((previousValue != value) + || (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Manager_MonthReportC.Entity = null; + previousValue.Manager_Month_InjuryAccidentC.Remove(this); + } + this._Manager_MonthReportC.Entity = value; + if ((value != null)) + { + value.Manager_Month_InjuryAccidentC.Add(this); + this._MonthReportId = value.MonthReportId; + } + else + { + this._MonthReportId = default(string); + } + this.SendPropertyChanged("Manager_MonthReportC"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ManageDocPlanC")] public partial class Manager_Month_ManageDocPlanC : INotifyPropertyChanging, INotifyPropertyChanged { @@ -226285,6 +226976,229 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_NoInjuryAccidentC")] + public partial class Manager_Month_NoInjuryAccidentC : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _NoInjuryAccidentId; + + private string _MonthReportId; + + private string _AccidentType; + + private System.Nullable _EconomicLosses; + + private System.Nullable _WHAccidentCount; + + private System.Nullable _SubAccidentCount; + + private EntityRef _Manager_MonthReportC; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnNoInjuryAccidentIdChanging(string value); + partial void OnNoInjuryAccidentIdChanged(); + partial void OnMonthReportIdChanging(string value); + partial void OnMonthReportIdChanged(); + partial void OnAccidentTypeChanging(string value); + partial void OnAccidentTypeChanged(); + partial void OnEconomicLossesChanging(System.Nullable value); + partial void OnEconomicLossesChanged(); + partial void OnWHAccidentCountChanging(System.Nullable value); + partial void OnWHAccidentCountChanged(); + partial void OnSubAccidentCountChanging(System.Nullable value); + partial void OnSubAccidentCountChanged(); + #endregion + + public Manager_Month_NoInjuryAccidentC() + { + this._Manager_MonthReportC = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NoInjuryAccidentId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string NoInjuryAccidentId + { + get + { + return this._NoInjuryAccidentId; + } + set + { + if ((this._NoInjuryAccidentId != value)) + { + this.OnNoInjuryAccidentIdChanging(value); + this.SendPropertyChanging(); + this._NoInjuryAccidentId = value; + this.SendPropertyChanged("NoInjuryAccidentId"); + this.OnNoInjuryAccidentIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")] + public string MonthReportId + { + get + { + return this._MonthReportId; + } + set + { + if ((this._MonthReportId != value)) + { + if (this._Manager_MonthReportC.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnMonthReportIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportId = value; + this.SendPropertyChanged("MonthReportId"); + this.OnMonthReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AccidentType", DbType="NVarChar(50)")] + public string AccidentType + { + get + { + return this._AccidentType; + } + set + { + if ((this._AccidentType != value)) + { + this.OnAccidentTypeChanging(value); + this.SendPropertyChanging(); + this._AccidentType = value; + this.SendPropertyChanged("AccidentType"); + this.OnAccidentTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EconomicLosses", DbType="Decimal(18,2)")] + public System.Nullable EconomicLosses + { + get + { + return this._EconomicLosses; + } + set + { + if ((this._EconomicLosses != value)) + { + this.OnEconomicLossesChanging(value); + this.SendPropertyChanging(); + this._EconomicLosses = value; + this.SendPropertyChanged("EconomicLosses"); + this.OnEconomicLossesChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WHAccidentCount", DbType="Int")] + public System.Nullable WHAccidentCount + { + get + { + return this._WHAccidentCount; + } + set + { + if ((this._WHAccidentCount != value)) + { + this.OnWHAccidentCountChanging(value); + this.SendPropertyChanging(); + this._WHAccidentCount = value; + this.SendPropertyChanged("WHAccidentCount"); + this.OnWHAccidentCountChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubAccidentCount", DbType="Int")] + public System.Nullable SubAccidentCount + { + get + { + return this._SubAccidentCount; + } + set + { + if ((this._SubAccidentCount != value)) + { + this.OnSubAccidentCountChanging(value); + this.SendPropertyChanging(); + this._SubAccidentCount = value; + this.SendPropertyChanged("SubAccidentCount"); + this.OnSubAccidentCountChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_NoInjuryAccidentC_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] + public Manager_MonthReportC Manager_MonthReportC + { + get + { + return this._Manager_MonthReportC.Entity; + } + set + { + Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity; + if (((previousValue != value) + || (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Manager_MonthReportC.Entity = null; + previousValue.Manager_Month_NoInjuryAccidentC.Remove(this); + } + this._Manager_MonthReportC.Entity = value; + if ((value != null)) + { + value.Manager_Month_NoInjuryAccidentC.Add(this); + this._MonthReportId = value.MonthReportId; + } + else + { + this._MonthReportId = default(string); + } + this.SendPropertyChanged("Manager_MonthReportC"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_OtherManagementC")] public partial class Manager_Month_OtherManagementC : INotifyPropertyChanging, INotifyPropertyChanged { @@ -226810,6 +227724,229 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_PerformanceIndicatorC")] + public partial class Manager_Month_PerformanceIndicatorC : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _PerformanceIndicatorId; + + private string _MonthReportId; + + private string _IndicatorType; + + private string _IndicatorName; + + private string _IndicatorValue; + + private System.Nullable _SortIndex; + + private EntityRef _Manager_MonthReportC; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnPerformanceIndicatorIdChanging(string value); + partial void OnPerformanceIndicatorIdChanged(); + partial void OnMonthReportIdChanging(string value); + partial void OnMonthReportIdChanged(); + partial void OnIndicatorTypeChanging(string value); + partial void OnIndicatorTypeChanged(); + partial void OnIndicatorNameChanging(string value); + partial void OnIndicatorNameChanged(); + partial void OnIndicatorValueChanging(string value); + partial void OnIndicatorValueChanged(); + partial void OnSortIndexChanging(System.Nullable value); + partial void OnSortIndexChanged(); + #endregion + + public Manager_Month_PerformanceIndicatorC() + { + this._Manager_MonthReportC = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PerformanceIndicatorId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string PerformanceIndicatorId + { + get + { + return this._PerformanceIndicatorId; + } + set + { + if ((this._PerformanceIndicatorId != value)) + { + this.OnPerformanceIndicatorIdChanging(value); + this.SendPropertyChanging(); + this._PerformanceIndicatorId = value; + this.SendPropertyChanged("PerformanceIndicatorId"); + this.OnPerformanceIndicatorIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")] + public string MonthReportId + { + get + { + return this._MonthReportId; + } + set + { + if ((this._MonthReportId != value)) + { + if (this._Manager_MonthReportC.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnMonthReportIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportId = value; + this.SendPropertyChanged("MonthReportId"); + this.OnMonthReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IndicatorType", DbType="NVarChar(50)")] + public string IndicatorType + { + get + { + return this._IndicatorType; + } + set + { + if ((this._IndicatorType != value)) + { + this.OnIndicatorTypeChanging(value); + this.SendPropertyChanging(); + this._IndicatorType = value; + this.SendPropertyChanged("IndicatorType"); + this.OnIndicatorTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IndicatorName", DbType="NVarChar(200)")] + public string IndicatorName + { + get + { + return this._IndicatorName; + } + set + { + if ((this._IndicatorName != value)) + { + this.OnIndicatorNameChanging(value); + this.SendPropertyChanging(); + this._IndicatorName = value; + this.SendPropertyChanged("IndicatorName"); + this.OnIndicatorNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IndicatorValue", DbType="NVarChar(50)")] + public string IndicatorValue + { + get + { + return this._IndicatorValue; + } + set + { + if ((this._IndicatorValue != value)) + { + this.OnIndicatorValueChanging(value); + this.SendPropertyChanging(); + this._IndicatorValue = value; + this.SendPropertyChanged("IndicatorValue"); + this.OnIndicatorValueChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")] + public System.Nullable SortIndex + { + get + { + return this._SortIndex; + } + set + { + if ((this._SortIndex != value)) + { + this.OnSortIndexChanging(value); + this.SendPropertyChanging(); + this._SortIndex = value; + this.SendPropertyChanged("SortIndex"); + this.OnSortIndexChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_PerformanceIndicatorC_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] + public Manager_MonthReportC Manager_MonthReportC + { + get + { + return this._Manager_MonthReportC.Entity; + } + set + { + Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity; + if (((previousValue != value) + || (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Manager_MonthReportC.Entity = null; + previousValue.Manager_Month_PerformanceIndicatorC.Remove(this); + } + this._Manager_MonthReportC.Entity = value; + if ((value != null)) + { + value.Manager_Month_PerformanceIndicatorC.Add(this); + this._MonthReportId = value.MonthReportId; + } + else + { + this._MonthReportId = default(string); + } + this.SendPropertyChanged("Manager_MonthReportC"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_PlanC")] public partial class Manager_Month_PlanC : INotifyPropertyChanging, INotifyPropertyChanged { @@ -227274,6 +228411,12 @@ namespace Model private System.Nullable _SortIndex; + private System.Nullable _ContractAmount; + + private System.Nullable _MonthApprovalAmount; + + private System.Nullable _ProjectApprovalAmount; + private EntityRef _Manager_MonthReportC; #region 可扩展性方法定义 @@ -227292,6 +228435,12 @@ namespace Model partial void OnCostYearChanged(); partial void OnSortIndexChanging(System.Nullable value); partial void OnSortIndexChanged(); + partial void OnContractAmountChanging(System.Nullable value); + partial void OnContractAmountChanged(); + partial void OnMonthApprovalAmountChanging(System.Nullable value); + partial void OnMonthApprovalAmountChanged(); + partial void OnProjectApprovalAmountChanging(System.Nullable value); + partial void OnProjectApprovalAmountChanged(); #endregion public Manager_Month_SubExpenseC() @@ -227424,6 +228573,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractAmount", DbType="Decimal(18,2)")] + public System.Nullable ContractAmount + { + get + { + return this._ContractAmount; + } + set + { + if ((this._ContractAmount != value)) + { + this.OnContractAmountChanging(value); + this.SendPropertyChanging(); + this._ContractAmount = value; + this.SendPropertyChanged("ContractAmount"); + this.OnContractAmountChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthApprovalAmount", DbType="Decimal(18,2)")] + public System.Nullable MonthApprovalAmount + { + get + { + return this._MonthApprovalAmount; + } + set + { + if ((this._MonthApprovalAmount != value)) + { + this.OnMonthApprovalAmountChanging(value); + this.SendPropertyChanging(); + this._MonthApprovalAmount = value; + this.SendPropertyChanged("MonthApprovalAmount"); + this.OnMonthApprovalAmountChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectApprovalAmount", DbType="Decimal(18,2)")] + public System.Nullable ProjectApprovalAmount + { + get + { + return this._ProjectApprovalAmount; + } + set + { + if ((this._ProjectApprovalAmount != value)) + { + this.OnProjectApprovalAmountChanging(value); + this.SendPropertyChanging(); + this._ProjectApprovalAmount = value; + this.SendPropertyChanged("ProjectApprovalAmount"); + this.OnProjectApprovalAmountChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_SubExpenseC_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] public Manager_MonthReportC Manager_MonthReportC { @@ -229394,6 +230603,8 @@ namespace Model private string _PhotoContents; + private string _AccidentDef; + private EntitySet _Manager_AccidentSortC; private EntitySet _Manager_CheckDetailSortC; @@ -229422,6 +230633,8 @@ namespace Model private EntitySet _Manager_Month_CheckC; + private EntitySet _Manager_Month_ComplianceObligationsC; + private EntitySet _Manager_Month_CostInvestmentPlanC; private EntitySet _Manager_Month_EmergencyExercisesC; @@ -229434,16 +230647,22 @@ namespace Model private EntitySet _Manager_Month_HazardC; + private EntitySet _Manager_Month_InjuryAccidentC; + private EntitySet _Manager_Month_ManageDocPlanC; private EntitySet _Manager_Month_MeetingC; + private EntitySet _Manager_Month_NoInjuryAccidentC; + private EntitySet _Manager_Month_OtherManagementC; private EntitySet _Manager_Month_OtherWorkC; private EntitySet _Manager_Month_OtherWorkPlanC; + private EntitySet _Manager_Month_PerformanceIndicatorC; + private EntitySet _Manager_Month_PlanC; private EntitySet _Manager_Month_ReviewRecordC; @@ -229462,6 +230681,8 @@ namespace Model private EntitySet _Manager_PromotionalActiviteSortC; + private EntitySet _Manager_RewardAndPunishSortC; + private EntitySet _Manager_TrainActivitySortC; private EntitySet _Manager_TrainSortC; @@ -229664,6 +230885,8 @@ namespace Model partial void OnNextEmergencyResponseChanged(); partial void OnPhotoContentsChanging(string value); partial void OnPhotoContentsChanged(); + partial void OnAccidentDefChanging(string value); + partial void OnAccidentDefChanged(); #endregion public Manager_MonthReportC() @@ -229682,17 +230905,21 @@ namespace Model this._Manager_Month_ActivitiesC = new EntitySet(new Action(this.attach_Manager_Month_ActivitiesC), new Action(this.detach_Manager_Month_ActivitiesC)); this._Manager_Month_ActivityDesC = new EntitySet(new Action(this.attach_Manager_Month_ActivityDesC), new Action(this.detach_Manager_Month_ActivityDesC)); this._Manager_Month_CheckC = new EntitySet(new Action(this.attach_Manager_Month_CheckC), new Action(this.detach_Manager_Month_CheckC)); + this._Manager_Month_ComplianceObligationsC = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligationsC), new Action(this.detach_Manager_Month_ComplianceObligationsC)); this._Manager_Month_CostInvestmentPlanC = new EntitySet(new Action(this.attach_Manager_Month_CostInvestmentPlanC), new Action(this.detach_Manager_Month_CostInvestmentPlanC)); this._Manager_Month_EmergencyExercisesC = new EntitySet(new Action(this.attach_Manager_Month_EmergencyExercisesC), new Action(this.detach_Manager_Month_EmergencyExercisesC)); this._Manager_Month_EmergencyPlanC = new EntitySet(new Action(this.attach_Manager_Month_EmergencyPlanC), new Action(this.detach_Manager_Month_EmergencyPlanC)); this._Manager_Month_FileManageC = new EntitySet(new Action(this.attach_Manager_Month_FileManageC), new Action(this.detach_Manager_Month_FileManageC)); this._Manager_Month_FiveExpenseC = new EntitySet(new Action(this.attach_Manager_Month_FiveExpenseC), new Action(this.detach_Manager_Month_FiveExpenseC)); this._Manager_Month_HazardC = new EntitySet(new Action(this.attach_Manager_Month_HazardC), new Action(this.detach_Manager_Month_HazardC)); + this._Manager_Month_InjuryAccidentC = new EntitySet(new Action(this.attach_Manager_Month_InjuryAccidentC), new Action(this.detach_Manager_Month_InjuryAccidentC)); this._Manager_Month_ManageDocPlanC = new EntitySet(new Action(this.attach_Manager_Month_ManageDocPlanC), new Action(this.detach_Manager_Month_ManageDocPlanC)); this._Manager_Month_MeetingC = new EntitySet(new Action(this.attach_Manager_Month_MeetingC), new Action(this.detach_Manager_Month_MeetingC)); + this._Manager_Month_NoInjuryAccidentC = new EntitySet(new Action(this.attach_Manager_Month_NoInjuryAccidentC), new Action(this.detach_Manager_Month_NoInjuryAccidentC)); this._Manager_Month_OtherManagementC = new EntitySet(new Action(this.attach_Manager_Month_OtherManagementC), new Action(this.detach_Manager_Month_OtherManagementC)); this._Manager_Month_OtherWorkC = new EntitySet(new Action(this.attach_Manager_Month_OtherWorkC), new Action(this.detach_Manager_Month_OtherWorkC)); this._Manager_Month_OtherWorkPlanC = new EntitySet(new Action(this.attach_Manager_Month_OtherWorkPlanC), new Action(this.detach_Manager_Month_OtherWorkPlanC)); + this._Manager_Month_PerformanceIndicatorC = new EntitySet(new Action(this.attach_Manager_Month_PerformanceIndicatorC), new Action(this.detach_Manager_Month_PerformanceIndicatorC)); this._Manager_Month_PlanC = new EntitySet(new Action(this.attach_Manager_Month_PlanC), new Action(this.detach_Manager_Month_PlanC)); this._Manager_Month_ReviewRecordC = new EntitySet(new Action(this.attach_Manager_Month_ReviewRecordC), new Action(this.detach_Manager_Month_ReviewRecordC)); this._Manager_Month_SubExpenseC = new EntitySet(new Action(this.attach_Manager_Month_SubExpenseC), new Action(this.detach_Manager_Month_SubExpenseC)); @@ -229702,6 +230929,7 @@ namespace Model this._Manager_OtherActiveSortC = new EntitySet(new Action(this.attach_Manager_OtherActiveSortC), new Action(this.detach_Manager_OtherActiveSortC)); this._Manager_PersonSortC = new EntitySet(new Action(this.attach_Manager_PersonSortC), new Action(this.detach_Manager_PersonSortC)); this._Manager_PromotionalActiviteSortC = new EntitySet(new Action(this.attach_Manager_PromotionalActiviteSortC), new Action(this.detach_Manager_PromotionalActiviteSortC)); + this._Manager_RewardAndPunishSortC = new EntitySet(new Action(this.attach_Manager_RewardAndPunishSortC), new Action(this.detach_Manager_RewardAndPunishSortC)); this._Manager_TrainActivitySortC = new EntitySet(new Action(this.attach_Manager_TrainActivitySortC), new Action(this.detach_Manager_TrainActivitySortC)); this._Manager_TrainSortC = new EntitySet(new Action(this.attach_Manager_TrainSortC), new Action(this.detach_Manager_TrainSortC)); OnCreated(); @@ -231655,6 +232883,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AccidentDef", DbType="NVarChar(2000)")] + public string AccidentDef + { + get + { + return this._AccidentDef; + } + set + { + if ((this._AccidentDef != value)) + { + this.OnAccidentDefChanging(value); + this.SendPropertyChanging(); + this._AccidentDef = value; + this.SendPropertyChanged("AccidentDef"); + this.OnAccidentDefChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_AccidentCSort_Manager_MonthReport", Storage="_Manager_AccidentSortC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] public EntitySet Manager_AccidentSortC { @@ -231837,6 +233085,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligationsC_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligationsC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] + public EntitySet Manager_Month_ComplianceObligationsC + { + get + { + return this._Manager_Month_ComplianceObligationsC; + } + set + { + this._Manager_Month_ComplianceObligationsC.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_CostInvestmentPlanC_Manager_MonthReport", Storage="_Manager_Month_CostInvestmentPlanC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] public EntitySet Manager_Month_CostInvestmentPlanC { @@ -231915,6 +233176,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_InjuryAccidentC_Manager_MonthReportC", Storage="_Manager_Month_InjuryAccidentC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] + public EntitySet Manager_Month_InjuryAccidentC + { + get + { + return this._Manager_Month_InjuryAccidentC; + } + set + { + this._Manager_Month_InjuryAccidentC.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ManageDocPlanC_Manager_MonthReport", Storage="_Manager_Month_ManageDocPlanC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] public EntitySet Manager_Month_ManageDocPlanC { @@ -231941,6 +233215,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_NoInjuryAccidentC_Manager_MonthReportC", Storage="_Manager_Month_NoInjuryAccidentC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] + public EntitySet Manager_Month_NoInjuryAccidentC + { + get + { + return this._Manager_Month_NoInjuryAccidentC; + } + set + { + this._Manager_Month_NoInjuryAccidentC.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_OtherManagementC_Manager_MonthReport", Storage="_Manager_Month_OtherManagementC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] public EntitySet Manager_Month_OtherManagementC { @@ -231980,6 +233267,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_PerformanceIndicatorC_Manager_MonthReportC", Storage="_Manager_Month_PerformanceIndicatorC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] + public EntitySet Manager_Month_PerformanceIndicatorC + { + get + { + return this._Manager_Month_PerformanceIndicatorC; + } + set + { + this._Manager_Month_PerformanceIndicatorC.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_PlanC_Manager_MonthReport", Storage="_Manager_Month_PlanC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] public EntitySet Manager_Month_PlanC { @@ -232139,6 +233439,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_RewardAndPunishSortC_Manager_MonthReportC", Storage="_Manager_RewardAndPunishSortC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] + public EntitySet Manager_RewardAndPunishSortC + { + get + { + return this._Manager_RewardAndPunishSortC; + } + set + { + this._Manager_RewardAndPunishSortC.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_TrainActivitySortC_Manager_MonthReportC", Storage="_Manager_TrainActivitySortC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] public EntitySet Manager_TrainActivitySortC { @@ -232353,6 +233666,18 @@ namespace Model entity.Manager_MonthReportC = null; } + private void attach_Manager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = this; + } + + private void detach_Manager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = null; + } + private void attach_Manager_Month_CostInvestmentPlanC(Manager_Month_CostInvestmentPlanC entity) { this.SendPropertyChanging(); @@ -232425,6 +233750,18 @@ namespace Model entity.Manager_MonthReportC = null; } + private void attach_Manager_Month_InjuryAccidentC(Manager_Month_InjuryAccidentC entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = this; + } + + private void detach_Manager_Month_InjuryAccidentC(Manager_Month_InjuryAccidentC entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = null; + } + private void attach_Manager_Month_ManageDocPlanC(Manager_Month_ManageDocPlanC entity) { this.SendPropertyChanging(); @@ -232449,6 +233786,18 @@ namespace Model entity.Manager_MonthReportC = null; } + private void attach_Manager_Month_NoInjuryAccidentC(Manager_Month_NoInjuryAccidentC entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = this; + } + + private void detach_Manager_Month_NoInjuryAccidentC(Manager_Month_NoInjuryAccidentC entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = null; + } + private void attach_Manager_Month_OtherManagementC(Manager_Month_OtherManagementC entity) { this.SendPropertyChanging(); @@ -232485,6 +233834,18 @@ namespace Model entity.Manager_MonthReportC = null; } + private void attach_Manager_Month_PerformanceIndicatorC(Manager_Month_PerformanceIndicatorC entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = this; + } + + private void detach_Manager_Month_PerformanceIndicatorC(Manager_Month_PerformanceIndicatorC entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = null; + } + private void attach_Manager_Month_PlanC(Manager_Month_PlanC entity) { this.SendPropertyChanging(); @@ -232569,6 +233930,18 @@ namespace Model entity.Manager_MonthReportC = null; } + private void attach_Manager_RewardAndPunishSortC(Manager_RewardAndPunishSortC entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = this; + } + + private void detach_Manager_RewardAndPunishSortC(Manager_RewardAndPunishSortC entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = null; + } + private void attach_Manager_TrainActivitySortC(Manager_TrainActivitySortC entity) { this.SendPropertyChanging(); @@ -234665,6 +236038,8 @@ namespace Model private string _Remark; + private System.Nullable _SumOutPersonNum; + private EntityRef _Base_Unit; private EntityRef _Manager_MonthReportC; @@ -234687,6 +236062,8 @@ namespace Model partial void OnContractRangeChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); + partial void OnSumOutPersonNumChanging(System.Nullable value); + partial void OnSumOutPersonNumChanged(); #endregion public Manager_PersonSortC() @@ -234844,6 +236221,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SumOutPersonNum", DbType="Int")] + public System.Nullable SumOutPersonNum + { + get + { + return this._SumOutPersonNum; + } + set + { + if ((this._SumOutPersonNum != value)) + { + this.OnSumOutPersonNumChanging(value); + this.SendPropertyChanging(); + this._SumOutPersonNum = value; + this.SendPropertyChanged("SumOutPersonNum"); + this.OnSumOutPersonNumChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_PersonCSort_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)] public Base_Unit Base_Unit { @@ -235180,6 +236577,277 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_RewardAndPunishSortC")] + public partial class Manager_RewardAndPunishSortC : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _RewardAndPunishId; + + private string _MonthReportId; + + private System.Nullable _RewardNum; + + private System.Nullable _RewardMoney; + + private System.Nullable _ProjectRewardMoney; + + private System.Nullable _PunishNum; + + private System.Nullable _PunishMoney; + + private System.Nullable _ProjectPunishMoney; + + private EntityRef _Manager_MonthReportC; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnRewardAndPunishIdChanging(string value); + partial void OnRewardAndPunishIdChanged(); + partial void OnMonthReportIdChanging(string value); + partial void OnMonthReportIdChanged(); + partial void OnRewardNumChanging(System.Nullable value); + partial void OnRewardNumChanged(); + partial void OnRewardMoneyChanging(System.Nullable value); + partial void OnRewardMoneyChanged(); + partial void OnProjectRewardMoneyChanging(System.Nullable value); + partial void OnProjectRewardMoneyChanged(); + partial void OnPunishNumChanging(System.Nullable value); + partial void OnPunishNumChanged(); + partial void OnPunishMoneyChanging(System.Nullable value); + partial void OnPunishMoneyChanged(); + partial void OnProjectPunishMoneyChanging(System.Nullable value); + partial void OnProjectPunishMoneyChanged(); + #endregion + + public Manager_RewardAndPunishSortC() + { + this._Manager_MonthReportC = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RewardAndPunishId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string RewardAndPunishId + { + get + { + return this._RewardAndPunishId; + } + set + { + if ((this._RewardAndPunishId != value)) + { + this.OnRewardAndPunishIdChanging(value); + this.SendPropertyChanging(); + this._RewardAndPunishId = value; + this.SendPropertyChanged("RewardAndPunishId"); + this.OnRewardAndPunishIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")] + public string MonthReportId + { + get + { + return this._MonthReportId; + } + set + { + if ((this._MonthReportId != value)) + { + if (this._Manager_MonthReportC.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnMonthReportIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportId = value; + this.SendPropertyChanged("MonthReportId"); + this.OnMonthReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RewardNum", DbType="Int")] + public System.Nullable RewardNum + { + get + { + return this._RewardNum; + } + set + { + if ((this._RewardNum != value)) + { + this.OnRewardNumChanging(value); + this.SendPropertyChanging(); + this._RewardNum = value; + this.SendPropertyChanged("RewardNum"); + this.OnRewardNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RewardMoney", DbType="Decimal(18,2)")] + public System.Nullable RewardMoney + { + get + { + return this._RewardMoney; + } + set + { + if ((this._RewardMoney != value)) + { + this.OnRewardMoneyChanging(value); + this.SendPropertyChanging(); + this._RewardMoney = value; + this.SendPropertyChanged("RewardMoney"); + this.OnRewardMoneyChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectRewardMoney", DbType="Decimal(18,2)")] + public System.Nullable ProjectRewardMoney + { + get + { + return this._ProjectRewardMoney; + } + set + { + if ((this._ProjectRewardMoney != value)) + { + this.OnProjectRewardMoneyChanging(value); + this.SendPropertyChanging(); + this._ProjectRewardMoney = value; + this.SendPropertyChanged("ProjectRewardMoney"); + this.OnProjectRewardMoneyChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PunishNum", DbType="Int")] + public System.Nullable PunishNum + { + get + { + return this._PunishNum; + } + set + { + if ((this._PunishNum != value)) + { + this.OnPunishNumChanging(value); + this.SendPropertyChanging(); + this._PunishNum = value; + this.SendPropertyChanged("PunishNum"); + this.OnPunishNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PunishMoney", DbType="Decimal(18,2)")] + public System.Nullable PunishMoney + { + get + { + return this._PunishMoney; + } + set + { + if ((this._PunishMoney != value)) + { + this.OnPunishMoneyChanging(value); + this.SendPropertyChanging(); + this._PunishMoney = value; + this.SendPropertyChanged("PunishMoney"); + this.OnPunishMoneyChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectPunishMoney", DbType="Decimal(18,2)")] + public System.Nullable ProjectPunishMoney + { + get + { + return this._ProjectPunishMoney; + } + set + { + if ((this._ProjectPunishMoney != value)) + { + this.OnProjectPunishMoneyChanging(value); + this.SendPropertyChanging(); + this._ProjectPunishMoney = value; + this.SendPropertyChanged("ProjectPunishMoney"); + this.OnProjectPunishMoneyChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_RewardAndPunishSortC_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] + public Manager_MonthReportC Manager_MonthReportC + { + get + { + return this._Manager_MonthReportC.Entity; + } + set + { + Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity; + if (((previousValue != value) + || (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Manager_MonthReportC.Entity = null; + previousValue.Manager_RewardAndPunishSortC.Remove(this); + } + this._Manager_MonthReportC.Entity = value; + if ((value != null)) + { + value.Manager_RewardAndPunishSortC.Add(this); + this._MonthReportId = value.MonthReportId; + } + else + { + this._MonthReportId = default(string); + } + this.SendPropertyChanged("Manager_MonthReportC"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_SafetyDataD")] public partial class Manager_SafetyDataD : INotifyPropertyChanging, INotifyPropertyChanged { @@ -239001,6 +240669,10 @@ namespace Model private System.Nullable _SortIndex; + private string _TrainType; + + private System.Nullable _TotalPersonNum; + private EntityRef _Manager_MonthReportC; #region 可扩展性方法定义 @@ -239023,6 +240695,10 @@ namespace Model partial void OnPersonNumChanged(); partial void OnSortIndexChanging(System.Nullable value); partial void OnSortIndexChanged(); + partial void OnTrainTypeChanging(string value); + partial void OnTrainTypeChanged(); + partial void OnTotalPersonNumChanging(System.Nullable value); + partial void OnTotalPersonNumChanged(); #endregion public Manager_TrainSortC() @@ -239195,6 +240871,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainType", DbType="NVarChar(50)")] + public string TrainType + { + get + { + return this._TrainType; + } + set + { + if ((this._TrainType != value)) + { + this.OnTrainTypeChanging(value); + this.SendPropertyChanging(); + this._TrainType = value; + this.SendPropertyChanged("TrainType"); + this.OnTrainTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalPersonNum", DbType="Int")] + public System.Nullable TotalPersonNum + { + get + { + return this._TotalPersonNum; + } + set + { + if ((this._TotalPersonNum != value)) + { + this.OnTotalPersonNumChanging(value); + this.SendPropertyChanging(); + this._TotalPersonNum = value; + this.SendPropertyChanged("TotalPersonNum"); + this.OnTotalPersonNumChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_TrainSortC_Manager_MonthReport", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] public Manager_MonthReportC Manager_MonthReportC { @@ -259168,6 +260884,730 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PreRun_InspectTailTerm")] + public partial class PreRun_InspectTailTerm : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _TailTermId; + + private string _ProjectId; + + private string _ProjectName; + + private string _TailTermCode; + + private string _ConstructionUnit; + + private System.Nullable _ProblemType; + + private string _QuestionTechnologyId; + + private string _TermItemId; + + private string _WorkPackId; + + private string _QuestionDesc; + + private string _RectifyOpinion; + + private System.Nullable _RectifyTime; + + private string _InspectUser; + + private string _ApproveUser; + + private System.Nullable _ApproveState; + + private string _AddUser; + + private System.Nullable _AddTime; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnTailTermIdChanging(string value); + partial void OnTailTermIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnProjectNameChanging(string value); + partial void OnProjectNameChanged(); + partial void OnTailTermCodeChanging(string value); + partial void OnTailTermCodeChanged(); + partial void OnConstructionUnitChanging(string value); + partial void OnConstructionUnitChanged(); + partial void OnProblemTypeChanging(System.Nullable value); + partial void OnProblemTypeChanged(); + partial void OnQuestionTechnologyIdChanging(string value); + partial void OnQuestionTechnologyIdChanged(); + partial void OnTermItemIdChanging(string value); + partial void OnTermItemIdChanged(); + partial void OnWorkPackIdChanging(string value); + partial void OnWorkPackIdChanged(); + partial void OnQuestionDescChanging(string value); + partial void OnQuestionDescChanged(); + partial void OnRectifyOpinionChanging(string value); + partial void OnRectifyOpinionChanged(); + partial void OnRectifyTimeChanging(System.Nullable value); + partial void OnRectifyTimeChanged(); + partial void OnInspectUserChanging(string value); + partial void OnInspectUserChanged(); + partial void OnApproveUserChanging(string value); + partial void OnApproveUserChanged(); + partial void OnApproveStateChanging(System.Nullable value); + partial void OnApproveStateChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + #endregion + + public PreRun_InspectTailTerm() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TailTermId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string TailTermId + { + get + { + return this._TailTermId; + } + set + { + if ((this._TailTermId != value)) + { + this.OnTailTermIdChanging(value); + this.SendPropertyChanging(); + this._TailTermId = value; + this.SendPropertyChanged("TailTermId"); + this.OnTailTermIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="VarChar(50)")] + public string ProjectName + { + get + { + return this._ProjectName; + } + set + { + if ((this._ProjectName != value)) + { + this.OnProjectNameChanging(value); + this.SendPropertyChanging(); + this._ProjectName = value; + this.SendPropertyChanged("ProjectName"); + this.OnProjectNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TailTermCode", DbType="VarChar(50)")] + public string TailTermCode + { + get + { + return this._TailTermCode; + } + set + { + if ((this._TailTermCode != value)) + { + this.OnTailTermCodeChanging(value); + this.SendPropertyChanging(); + this._TailTermCode = value; + this.SendPropertyChanged("TailTermCode"); + this.OnTailTermCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionUnit", DbType="VarChar(50)")] + public string ConstructionUnit + { + get + { + return this._ConstructionUnit; + } + set + { + if ((this._ConstructionUnit != value)) + { + this.OnConstructionUnitChanging(value); + this.SendPropertyChanging(); + this._ConstructionUnit = value; + this.SendPropertyChanged("ConstructionUnit"); + this.OnConstructionUnitChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemType", DbType="Int")] + public System.Nullable ProblemType + { + get + { + return this._ProblemType; + } + set + { + if ((this._ProblemType != value)) + { + this.OnProblemTypeChanging(value); + this.SendPropertyChanging(); + this._ProblemType = value; + this.SendPropertyChanged("ProblemType"); + this.OnProblemTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionTechnologyId", DbType="VarChar(50)")] + public string QuestionTechnologyId + { + get + { + return this._QuestionTechnologyId; + } + set + { + if ((this._QuestionTechnologyId != value)) + { + this.OnQuestionTechnologyIdChanging(value); + this.SendPropertyChanging(); + this._QuestionTechnologyId = value; + this.SendPropertyChanged("QuestionTechnologyId"); + this.OnQuestionTechnologyIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TermItemId", DbType="VarChar(50)")] + public string TermItemId + { + get + { + return this._TermItemId; + } + set + { + if ((this._TermItemId != value)) + { + this.OnTermItemIdChanging(value); + this.SendPropertyChanging(); + this._TermItemId = value; + this.SendPropertyChanged("TermItemId"); + this.OnTermItemIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackId", DbType="VarChar(50)")] + public string WorkPackId + { + get + { + return this._WorkPackId; + } + set + { + if ((this._WorkPackId != value)) + { + this.OnWorkPackIdChanging(value); + this.SendPropertyChanging(); + this._WorkPackId = value; + this.SendPropertyChanged("WorkPackId"); + this.OnWorkPackIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionDesc", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string QuestionDesc + { + get + { + return this._QuestionDesc; + } + set + { + if ((this._QuestionDesc != value)) + { + this.OnQuestionDescChanging(value); + this.SendPropertyChanging(); + this._QuestionDesc = value; + this.SendPropertyChanged("QuestionDesc"); + this.OnQuestionDescChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string RectifyOpinion + { + get + { + return this._RectifyOpinion; + } + set + { + if ((this._RectifyOpinion != value)) + { + this.OnRectifyOpinionChanging(value); + this.SendPropertyChanging(); + this._RectifyOpinion = value; + this.SendPropertyChanged("RectifyOpinion"); + this.OnRectifyOpinionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyTime", DbType="DateTime")] + public System.Nullable RectifyTime + { + get + { + return this._RectifyTime; + } + set + { + if ((this._RectifyTime != value)) + { + this.OnRectifyTimeChanging(value); + this.SendPropertyChanging(); + this._RectifyTime = value; + this.SendPropertyChanged("RectifyTime"); + this.OnRectifyTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectUser", DbType="VarChar(50)")] + public string InspectUser + { + get + { + return this._InspectUser; + } + set + { + if ((this._InspectUser != value)) + { + this.OnInspectUserChanging(value); + this.SendPropertyChanging(); + this._InspectUser = value; + this.SendPropertyChanged("InspectUser"); + this.OnInspectUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] + public string ApproveUser + { + get + { + return this._ApproveUser; + } + set + { + if ((this._ApproveUser != value)) + { + this.OnApproveUserChanging(value); + this.SendPropertyChanging(); + this._ApproveUser = value; + this.SendPropertyChanged("ApproveUser"); + this.OnApproveUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] + public System.Nullable ApproveState + { + get + { + return this._ApproveState; + } + set + { + if ((this._ApproveState != value)) + { + this.OnApproveStateChanging(value); + this.SendPropertyChanging(); + this._ApproveState = value; + this.SendPropertyChanged("ApproveState"); + this.OnApproveStateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PreRun_InspectTermApproveRecords")] + public partial class PreRun_InspectTermApproveRecords : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _InspectTermId; + + private string _ProjectId; + + private string _TermItemId; + + private string _TailTermId; + + private string _ApproveOpinion; + + private System.Nullable _ApproveTime; + + private string _ApproveUser; + + private System.Nullable _ApproveState; + + private string _AddUser; + + private System.Nullable _AddTime; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnInspectTermIdChanging(string value); + partial void OnInspectTermIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnTermItemIdChanging(string value); + partial void OnTermItemIdChanged(); + partial void OnTailTermIdChanging(string value); + partial void OnTailTermIdChanged(); + partial void OnApproveOpinionChanging(string value); + partial void OnApproveOpinionChanged(); + partial void OnApproveTimeChanging(System.Nullable value); + partial void OnApproveTimeChanged(); + partial void OnApproveUserChanging(string value); + partial void OnApproveUserChanged(); + partial void OnApproveStateChanging(System.Nullable value); + partial void OnApproveStateChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + #endregion + + public PreRun_InspectTermApproveRecords() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTermId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string InspectTermId + { + get + { + return this._InspectTermId; + } + set + { + if ((this._InspectTermId != value)) + { + this.OnInspectTermIdChanging(value); + this.SendPropertyChanging(); + this._InspectTermId = value; + this.SendPropertyChanged("InspectTermId"); + this.OnInspectTermIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="VarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TermItemId", DbType="VarChar(50)")] + public string TermItemId + { + get + { + return this._TermItemId; + } + set + { + if ((this._TermItemId != value)) + { + this.OnTermItemIdChanging(value); + this.SendPropertyChanging(); + this._TermItemId = value; + this.SendPropertyChanged("TermItemId"); + this.OnTermItemIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TailTermId", DbType="VarChar(50)")] + public string TailTermId + { + get + { + return this._TailTermId; + } + set + { + if ((this._TailTermId != value)) + { + this.OnTailTermIdChanging(value); + this.SendPropertyChanging(); + this._TailTermId = value; + this.SendPropertyChanged("TailTermId"); + this.OnTailTermIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string ApproveOpinion + { + get + { + return this._ApproveOpinion; + } + set + { + if ((this._ApproveOpinion != value)) + { + this.OnApproveOpinionChanging(value); + this.SendPropertyChanging(); + this._ApproveOpinion = value; + this.SendPropertyChanged("ApproveOpinion"); + this.OnApproveOpinionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveTime", DbType="DateTime")] + public System.Nullable ApproveTime + { + get + { + return this._ApproveTime; + } + set + { + if ((this._ApproveTime != value)) + { + this.OnApproveTimeChanging(value); + this.SendPropertyChanging(); + this._ApproveTime = value; + this.SendPropertyChanged("ApproveTime"); + this.OnApproveTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] + public string ApproveUser + { + get + { + return this._ApproveUser; + } + set + { + if ((this._ApproveUser != value)) + { + this.OnApproveUserChanging(value); + this.SendPropertyChanging(); + this._ApproveUser = value; + this.SendPropertyChanged("ApproveUser"); + this.OnApproveUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] + public System.Nullable ApproveState + { + get + { + return this._ApproveState; + } + set + { + if ((this._ApproveState != value)) + { + this.OnApproveStateChanging(value); + this.SendPropertyChanging(); + this._ApproveState = value; + this.SendPropertyChanged("ApproveState"); + this.OnApproveStateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PreRun_PropertySysPiping")] public partial class PreRun_PropertySysPiping : INotifyPropertyChanging, INotifyPropertyChanged { @@ -259762,6 +262202,18 @@ namespace Model private System.Nullable _AddTime; + private string _Subcontractor; + + private string _Contractor; + + private string _Supervision; + + private string _Owner; + + private System.Nullable _WorkPackType; + + private string _PropertyTechnologyId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -259788,6 +262240,18 @@ namespace Model partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnSubcontractorChanging(string value); + partial void OnSubcontractorChanged(); + partial void OnContractorChanging(string value); + partial void OnContractorChanged(); + partial void OnSupervisionChanging(string value); + partial void OnSupervisionChanged(); + partial void OnOwnerChanging(string value); + partial void OnOwnerChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); #endregion public PreRun_SubInspectTerm() @@ -260015,6 +262479,126 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")] + public string Subcontractor + { + get + { + return this._Subcontractor; + } + set + { + if ((this._Subcontractor != value)) + { + this.OnSubcontractorChanging(value); + this.SendPropertyChanging(); + this._Subcontractor = value; + this.SendPropertyChanged("Subcontractor"); + this.OnSubcontractorChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Contractor", DbType="VarChar(50)")] + public string Contractor + { + get + { + return this._Contractor; + } + set + { + if ((this._Contractor != value)) + { + this.OnContractorChanging(value); + this.SendPropertyChanging(); + this._Contractor = value; + this.SendPropertyChanged("Contractor"); + this.OnContractorChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Supervision", DbType="VarChar(50)")] + public string Supervision + { + get + { + return this._Supervision; + } + set + { + if ((this._Supervision != value)) + { + this.OnSupervisionChanging(value); + this.SendPropertyChanging(); + this._Supervision = value; + this.SendPropertyChanged("Supervision"); + this.OnSupervisionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Owner", DbType="VarChar(50)")] + public string Owner + { + get + { + return this._Owner; + } + set + { + if ((this._Owner != value)) + { + this.OnOwnerChanging(value); + this.SendPropertyChanging(); + this._Owner = value; + this.SendPropertyChanged("Owner"); + this.OnOwnerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")] + public string PropertyTechnologyId + { + get + { + return this._PropertyTechnologyId; + } + set + { + if ((this._PropertyTechnologyId != value)) + { + this.OnPropertyTechnologyIdChanging(value); + this.SendPropertyChanging(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -260042,6 +262626,8 @@ namespace Model private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + private string _TermItemId; + private string _SubItemId; private string _SubInspectId; @@ -260068,6 +262654,18 @@ namespace Model private string _InspectionIllustrate; + private string _Subcontractor; + + private string _Contractor; + + private string _Supervision; + + private string _Owner; + + private System.Nullable _WorkPackType; + + private string _PropertyTechnologyId; + private string _Remark; private string _AddUser; @@ -260080,6 +262678,8 @@ namespace Model partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnCreated(); + partial void OnTermItemIdChanging(string value); + partial void OnTermItemIdChanged(); partial void OnSubItemIdChanging(string value); partial void OnSubItemIdChanged(); partial void OnSubInspectIdChanging(string value); @@ -260106,6 +262706,18 @@ namespace Model partial void OnInspectionResultsChanged(); partial void OnInspectionIllustrateChanging(string value); partial void OnInspectionIllustrateChanged(); + partial void OnSubcontractorChanging(string value); + partial void OnSubcontractorChanged(); + partial void OnContractorChanging(string value); + partial void OnContractorChanged(); + partial void OnSupervisionChanging(string value); + partial void OnSupervisionChanged(); + partial void OnOwnerChanging(string value); + partial void OnOwnerChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); partial void OnAddUserChanging(string value); @@ -260121,7 +262733,27 @@ namespace Model OnCreated(); } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubItemId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TermItemId", DbType="VarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string TermItemId + { + get + { + return this._TermItemId; + } + set + { + if ((this._TermItemId != value)) + { + this.OnTermItemIdChanging(value); + this.SendPropertyChanging(); + this._TermItemId = value; + this.SendPropertyChanged("TermItemId"); + this.OnTermItemIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubItemId", DbType="VarChar(50)")] public string SubItemId { get @@ -260381,6 +263013,126 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")] + public string Subcontractor + { + get + { + return this._Subcontractor; + } + set + { + if ((this._Subcontractor != value)) + { + this.OnSubcontractorChanging(value); + this.SendPropertyChanging(); + this._Subcontractor = value; + this.SendPropertyChanged("Subcontractor"); + this.OnSubcontractorChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Contractor", DbType="VarChar(50)")] + public string Contractor + { + get + { + return this._Contractor; + } + set + { + if ((this._Contractor != value)) + { + this.OnContractorChanging(value); + this.SendPropertyChanging(); + this._Contractor = value; + this.SendPropertyChanged("Contractor"); + this.OnContractorChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Supervision", DbType="VarChar(50)")] + public string Supervision + { + get + { + return this._Supervision; + } + set + { + if ((this._Supervision != value)) + { + this.OnSupervisionChanging(value); + this.SendPropertyChanging(); + this._Supervision = value; + this.SendPropertyChanged("Supervision"); + this.OnSupervisionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Owner", DbType="VarChar(50)")] + public string Owner + { + get + { + return this._Owner; + } + set + { + if ((this._Owner != value)) + { + this.OnOwnerChanging(value); + this.SendPropertyChanging(); + this._Owner = value; + this.SendPropertyChanged("Owner"); + this.OnOwnerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")] + public string PropertyTechnologyId + { + get + { + return this._PropertyTechnologyId; + } + set + { + if ((this._PropertyTechnologyId != value)) + { + this.OnPropertyTechnologyIdChanging(value); + this.SendPropertyChanging(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(200)")] public string Remark { @@ -262192,6 +264944,8 @@ namespace Model private System.Nullable _Sort; + private System.Nullable _WorkPackType; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -262208,6 +264962,8 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); #endregion public PreRun_WorkPackage() @@ -262335,6 +265091,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj index 021d6974..132bd4b1 100644 --- a/SGGL/Model/Model.csproj +++ b/SGGL/Model/Model.csproj @@ -94,6 +94,7 @@ + diff --git a/SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs b/SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs new file mode 100644 index 00000000..e1064260 --- /dev/null +++ b/SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs @@ -0,0 +1,118 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Web.Http; +using BLL; +using Mvc.Controllers; + +namespace WebAPI.Controllers.HSSE +{ + public class HSSELogController : ApiController + { + /// + /// 加载日志列表 + /// + /// + /// + /// + /// + public Model.ResponeData getHSSELogDataList( string projectId, string userId,string CompileDate="",string CompileMan="", int pageIndex=0) + { + var responeData = new Model.ResponeData(); + try + { + var getDataList = HSSELogService.getHSSELogDataList(projectId, userId, CompileMan, CompileDate); + int pageCount = getDataList.Count; + if (pageCount > 0 && pageIndex > 0) + { + getDataList = (from x in getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize) + select x).ToList(); + } + responeData.data = new { pageCount, getDataList }; + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + + /// + /// 加载日志列表 + /// + /// + /// + /// + /// + public Model.ResponeData getHSSELogData(string HSSELogId) + { + var responeData = new Model.ResponeData(); + try + { + responeData.data = HSSELogService.getHSSELogData(HSSELogId); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + + /// + /// 加载天气 + /// + /// + public Model.ResponeData getWeatherDataList() + { + var responeData = new Model.ResponeData(); + try + { + responeData.data = ConstValue.drpConstItemList(BLL.ConstValue.Group_Weather); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + + /// + /// 保存日志 + /// + /// 作业票记录 + [HttpPost] + public Model.ResponeData SaveHSSELogData([FromBody] Model.HSSELogItem HSSELog) + { + var responeData = new Model.ResponeData(); + HSSELog.IsVisible = true; + try + { + if (!string.IsNullOrEmpty(HSSELog.HSSELogId)) + { + BLL.HSSELogService.UpdateHSSELogApi(HSSELog); + responeData.message = "修改成功"; + } + else + { + HSSELog.HSSELogId = SQLHelper.GetNewID(typeof(Model.Manager_HSSELog)); + BLL.HSSELogService.AddHSSELogApi(HSSELog); + responeData.message = "保存成功"; + } + + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + ErrLogInfo.WriteLog(string.Empty, ex); + } + + return responeData; + } + } +} \ No newline at end of file diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index 70236082..43dc784e 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -153,6 +153,7 @@ +