Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New
This commit is contained in:
commit
3ad45cfacc
|
|
@ -209,3 +209,51 @@ INSERT INTO ProjectSupervision_CheckTemplate(ID,SortIndex,CheckItem,CheckStandar
|
|||
INSERT INTO ProjectSupervision_CheckTemplate(ID,SortIndex,CheckItem,CheckStandard,CheckMethod,BaseScore,Type,Indexs) VALUES (NEWID(),35,'临建设施','临建设施不符合消防、用电管理要求,扣2分;','现场查验',10,1,193);
|
||||
INSERT INTO ProjectSupervision_CheckTemplate(ID,SortIndex,CheckItem,CheckStandard,CheckMethod,BaseScore,Type,Indexs) VALUES (NEWID(),36,'临建设施','办公区、生活区、生产区未独立设置,扣1分。','现场查验',10,1,194);
|
||||
INSERT INTO ProjectSupervision_CheckTemplate(ID,SortIndex,CheckItem,CheckStandard,CheckMethod,BaseScore,Type,Indexs) VALUES (NEWID(),34,'其他','发现其他不符合安全生产法律、法规、标准、规范以及上级要求等事项,每项扣2分。','现场查验',10,1,195);
|
||||
|
||||
|
||||
|
||||
--获取当前人项目级待办事项
|
||||
ALTER PROCEDURE [dbo].[Sp_Project_GetToDoItems]
|
||||
@projectId NVARCHAR(50)=NULL,
|
||||
@personId NVARCHAR(200)=NULL
|
||||
AS
|
||||
/*获取当前人本部待办事项*/
|
||||
BEGIN
|
||||
SELECT CostManageId AS DataId
|
||||
,'HSE费用申请' AS MenuName
|
||||
,('HSE费用申请'+ CONVERT(varchar(100),CostManage.CostManageDate, 23)+'待处理。') AS Content
|
||||
,PersonId
|
||||
,persons.PersonName
|
||||
,CostManage.CostManageDate AS DataTime
|
||||
,CONVERT(varchar(100),CostManage.CostManageDate, 23) AS DataTimeStr
|
||||
,(CASE WHEN CostManage.States = '0' THEN '../HSSE/CostGoods/CostManageEdit.aspx?CostManageId='+CostManageId
|
||||
ELSE '../HSSE/CostGoods/CostManageAudit.aspx?CostManageId='+CostManageId END)AS PCUrl
|
||||
FROM CostGoods_CostManage AS CostManage
|
||||
LEFT JOIN Person_Persons AS persons ON CostManage.NextManId= persons.PersonId
|
||||
WHERE CostManage.ProjectId=@projectId AND (CostManage.States = '0' or CostManage.States='1' )
|
||||
AND CostManage.NextManId =@personId
|
||||
|
||||
UNION ALL
|
||||
SELECT ActionPlan.ActionPlanListId AS DataId
|
||||
,'安全实施计划' AS MenuName
|
||||
,('安全实施计划'+ CONVERT(varchar(100),ActionPlan.CompileDate, 23)+'待处理。')+'待处理' AS Content
|
||||
,approve.ApproveMan AS PersonId
|
||||
,persons.PersonName
|
||||
,CompileDate AS DataTime
|
||||
,CONVERT(varchar(100),CompileDate, 23) AS DataTimeStr
|
||||
,'../HSSE/ActionPlanListEdit.aspx?ActionPlanListId='+ActionPlan.ActionPlanListId AS PCUrl
|
||||
FROM ActionPlan_ActionPlanList AS ActionPlan
|
||||
LEFT JOIN ActionPlan_ActionPlanListApprove as approve on ActionPlan.ActionPlanListId=approve.ActionPlanListId and ApproveType!='S' and approve.ApproveMan='2dabba4e-19e3-4ccd-8382-7393d9084894'
|
||||
LEFT JOIN Person_Persons AS persons ON persons.PersonId =approve.ApproveMan
|
||||
WHERE ActionPlan.ProjectId=@projectId and ActionPlan.ActionPlanListId in (select ActionPlanListId from dbo.ActionPlan_ActionPlanListApprove
|
||||
where PersonId=@PersonId and ApproveDate is null and ApproveType!='S')
|
||||
|
||||
|
||||
|
||||
ORDER BY DataTime DESC
|
||||
END
|
||||
|
||||
|
||||
GO
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue