zhanghj
/
ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改考试一级培训

This commit is contained in:
潘鸿锋 2024-04-08 11:56:38 +08:00
parent 9235b5e078
commit e9d27e2d7b
8 changed files with 557 additions and 12 deletions

8
DataBase/版本日志/SGGLDB_CD_V2024-04-03-phf.sql
View File

@ -8,7 +8,7 @@ BEGIN
DECLARE @personid nvarchar(50);--personid
DECLARE @IdentityCard NVARCHAR(50);--Éí·ÝÖ¤ºÅÂë
SELECT IdentityCard=IdentityCard from sys_user where UserId=@userId;
SELECT @IdentityCard=IdentityCard from sys_user where UserId=@userId;
select @personid = personid from SitePerson_Person where IdentityCard=@IdentityCard and ProjectId=@projectId;
SELECT chec.CheckControlCode AS DataId
@ -474,8 +474,8 @@ SELECT TaskId AS DataId
,'E108F75D-89D0-4DCA-8356-A156C328805C' AS MenuId
,'ÅàѵÈÎÎñ' AS MenuName
,Plans.PlanName AS Content
,@userId
,users.PersonName
,@userId as UserId
,users.PersonName as UserName
,TaskDate AS DataTime
,CONVERT(varchar(100),TaskDate, 23) AS DataTimeStr
,('/pagesTest/test/taskindex') AS UrlStr
@ -484,7 +484,7 @@ FROM Training_Task AS Task
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
AND Task.UserId = @personid
ORDER BY DataTime DESC
END

504
DataBase/版本日志/SGGLDB_CD_V2024-04-07-phf.sql Normal file
View File

@ -0,0 +1,504 @@
ALTER PROCEDURE [dbo].[Sp_APP_GetToDoItems]
@projectId NVARCHAR(50)=NULL,
@userId NVARCHAR(200)=NULL
AS
/*获取当前人待办事项*/
BEGIN
DECLARE @personid nvarchar(50);--personid
DECLARE @IdentityCard NVARCHAR(50);--身份证号码
SELECT @IdentityCard=IdentityCard from sys_user where UserId=@userId;
select @personid = personid from SitePerson_Person where IdentityCard=@IdentityCard and ProjectId=@projectId;
SELECT chec.CheckControlCode AS DataId
,'B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306' AS MenuId
,'质量巡检' AS MenuName
, QuestionDef as Content
,UserId
,users.UserName
,chec.CheckDate AS DataTime
,CONVERT(varchar(100),chec.CheckDate, 23) AS DataTimeStr
,'/pagesQ/eq_xunjian/detail' AS UrlStr
from Check_CheckControl as chec
left join Check_CheckControlApprove checapprove on chec.CheckControlCode = checapprove.CheckControlCode and checapprove.ApproveDate is null
left join Sys_User AS users ON users.UserId =checapprove.ApproveMan
where chec.State !='7' and chec.ProjectId = @projectId and users.UserId =@userId
UNION ALL
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 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.ApplyManId
WHERE License.ProjectId=@projectId
AND ( States = '2' )
AND License.ApplyManId 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 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.ApplyManId
WHERE License.ProjectId=@projectId
AND (States = '2' )
AND License.ApplyManId 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 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.ApplyManId
WHERE License.ProjectId=@projectId
AND (States = '2' )
AND License.ApplyManId 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 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.ApplyManId
WHERE License.ProjectId=@projectId
AND (States = '2' )
AND License.ApplyManId 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 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.ApplyManId
WHERE License.ProjectId=@projectId
AND (States = '0' OR States = '1' )
AND License.ApplyManId 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 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.ApplyManId
WHERE License.ProjectId=@projectId
AND (States = '0' OR States = '1' )
AND License.ApplyManId 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 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.ApplyManId
WHERE License.ProjectId=@projectId
AND (States = '2' )
AND License.ApplyManId 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 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.ApplyManId
WHERE License.ProjectId=@projectId
AND (States = '2' )
AND License.ApplyManId 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) + ' 内容:' + replace(replace(( select WrongContent from Check_RectifyNoticesItem as rni where rni.RectifyNoticesId=Rectify.RectifyNoticesId for xml path ('')),'<WrongContent>',''),'</WrongContent>','') 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.CompleteManId LIKE '%'+ @userId+'%')
OR (Rectify.States =4 AND Rectify.SignPerson 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 TaskId AS DataId
,'E108F75D-89D0-4DCA-8356-A156C328805C' AS MenuId
,'培训任务' AS MenuName
,Plans.PlanName AS Content
,@userId as UserId
,users.PersonName as UserName
,TaskDate AS DataTime
,CONVERT(varchar(100),TaskDate, 23) AS DataTimeStr
,('/pagesTest/test/taskindex') AS UrlStr
FROM Training_Task AS Task
LEFT JOIN SitePerson_Person AS users ON users.PersonId =@personid and users.ProjectId=@projectId
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 = @personid
SELECT TaskId AS DataId
,'E108F75D-89D0-4DCA-8356-A156C328805C' AS MenuId
,'培训任务' AS MenuName
,Plans.PlanName AS Content
,@userId as UserId
,users.PersonName as UserName
,TaskDate AS DataTime
,CONVERT(varchar(100),TaskDate, 23) AS DataTimeStr
,('/pagesTest/test/taskindex') AS UrlStr
FROM Training_Task AS Task
LEFT JOIN SitePerson_Person AS users ON users.PersonId =@userId and users.ProjectId=@projectId
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
ORDER BY DataTime DESC

2
SGGL/BLL/API/HSSE/APITestRecordService.cs
View File

@ -620,7 +620,7 @@ namespace BLL
{
BLL.RedisHelper redis = new BLL.RedisHelper();
var getDataLists= redis.GetObjString<List<TestRecordItemItem>>(testRecordId); //先从redis取数据,不存在再从数据库取
if (getDataLists.Count==0)
if (getDataLists==null)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{

8
SGGL/BLL/Common/Redis/RedisHelper.cs
View File

@ -98,6 +98,7 @@ namespace BLL
GetConnectRedisMultiplexer();
//添加注册事件
AddRegisterEvent();
SelectDB(0);
}
}
@ -2053,11 +2054,18 @@ namespace BLL
private static T DeserializeJson<T>(string strjson)
{
T tmp = default(T);
try
{
if (!string.IsNullOrEmpty(strjson))
{
tmp = JsonConvert.DeserializeObject<T>(strjson);
}
}
catch (Exception ex)
{
throw;
}
return tmp;
}

33
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -1766,3 +1766,36 @@ IP地址:::1
出错时间:03/29/2024 16:27:40
错误信息开始=====>
错误类型:SqlException
错误信息:执行超时已过期。完成操作之前已超时或服务器未响应。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
在 System.Data.Common.DbCommand.ExecuteReader()
在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
在 BLL.GetDataService.CorrectingPersonInOutNumber(String projectId) 位置 E:\2023公司项目\辰达\sggl_cd\SGGL\BLL\OpenService\GetDataService.cs:行号 140
在 BLL.MonitorService.DoSynchData() 位置 E:\2023公司项目\辰达\sggl_cd\SGGL\BLL\OpenService\MonitorService.cs:行号 2180
在 BLL.MonitorService.ColligateFormConfirmProcessEve(Object sender, ElapsedEventArgs e) 位置 E:\2023公司项目\辰达\sggl_cd\SGGL\BLL\OpenService\MonitorService.cs:行号 112
----错误类型:Win32Exception
----错误信息:
----等待的操作过时。
----错误堆栈:
出错时间:04/07/2024 11:20:26
出错时间:04/07/2024 11:20:26

2
SGGL/Model/APIItem/HSSE/TestRecordItemItem.cs
View File

@ -126,7 +126,7 @@ namespace Model
/// <summary>
/// 题目得分
/// </summary>
public decimal SubjectScore
public decimal? SubjectScore
{
get;
set;

6
SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs
View File

@ -357,7 +357,7 @@ namespace WebAPI.Controllers
{
BLL.RedisHelper redis = new RedisHelper();
var trainingTestRecordItems = redis.GetObjString<List<Training_TestRecordItem>>(testRecordId); //根据试卷ID获取试卷题目列表
var getTItem= trainingTestRecordItems.FirstOrDefault(x => x.TestRecordItemId== testRecordItemId); //获取试题
var getTItem= trainingTestRecordItems?.FirstOrDefault(x => x.TestRecordItemId== testRecordItemId); //获取试题
if (getTItem==null)
{
responeData.code = 0;
@ -436,7 +436,7 @@ namespace WebAPI.Controllers
RedisHelper redis = new RedisHelper();
var trainingTestRecordItems = redis.GetObjString<List<Training_TestRecordItem>>(testRecordId);
if (trainingTestRecordItems.Count>0)
if (trainingTestRecordItems!=null)
{
var testRecordItem = from x in db.Training_TestRecordItem
where x.TestRecordId == testRecordId
@ -524,7 +524,7 @@ namespace WebAPI.Controllers
RedisHelper redis = new RedisHelper();
var trainingTestRecordItems = redis.GetObjString<List<Training_TestRecordItem>>(testRecordId);
if (trainingTestRecordItems.Count > 0)
if (trainingTestRecordItems!=null)
{
var modeltestRecordItem = from x in db.Training_TestRecordItem
where x.TestRecordId == testRecordId

2
SGGL/WebAPI/Global.asax.cs
View File

@ -30,7 +30,7 @@ namespace WebAPI
BLL.Funs.ConnString = ConfigurationManager.AppSettings["ConnectionString"];
BLL.Funs.PageSize = Convert.ToInt32(ConfigurationManager.AppSettings["PageSize"]);
BLL.ErrLogInfo.DefaultErrLogFullPath = Server.MapPath("~/ErrLog.txt");
PersonKqSocketSersvices.init(1000);
//PersonKqSocketSersvices.init(1000);
// 使api返回为json
GlobalConfiguration.Configuration.Formatters.XmlFormatter.SupportedMediaTypes.Clear();
}