This commit is contained in:
parent
50106ee7dc
commit
f304f60a72
|
@ -68,6 +68,8 @@ alter table IDP_DesignDrawingIssue add ProjectId nvarchar(50) null
|
|||
GO
|
||||
|
||||
|
||||
|
||||
|
||||
--»ñÈ¡µ±Ç°ÈË´ý°ìÊÂÏî
|
||||
ALTER PROCEDURE [dbo].[Sp_Project_GetToDoItems]
|
||||
@projectId NVARCHAR(50)=NULL,
|
||||
|
@ -138,6 +140,23 @@ and (select count(*) from GJSX_Process process where process.UserId=@userId and
|
|||
or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID))
|
||||
)
|
||||
|
||||
UNION ALL
|
||||
SELECT GJSXID AS DataId
|
||||
,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId
|
||||
,'¹Ø¼üÊÂÏî´ý¹Ø±Õ' AS MenuName
|
||||
,GJSX.Detail AS Content
|
||||
,users.UserId
|
||||
,users.UserName
|
||||
,GJSX.CreateDate AS DataTime
|
||||
,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr
|
||||
,'../PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID AS PCUrl
|
||||
FROM GJSX
|
||||
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
|
||||
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
|
||||
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
|
||||
WHERE GJSX.ProjectId = projectUser.ProjectId and (project.ProjectState = '1' OR project.ProjectState IS NULL) and
|
||||
GJSX.State = 3 and GJSX.ProgressStatus=1 and (GJSX.UserID = @userId OR GJSX.User_ReceiveID = @userId )
|
||||
|
||||
--UNION ALL
|
||||
--SELECT InspectionEquipmentId AS DataId
|
||||
-- ,'6c2c1e5e-1812-4e1c-a683-7125518e28c7' AS MenuId
|
||||
|
@ -419,7 +438,6 @@ LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
|
|||
WHERE DesignDrawingIssue.ProjectId=@projectId and DesignDrawingIssue.ReceiveUserId=@userId
|
||||
and DesignDrawingIssue.IsSee is null
|
||||
|
||||
|
||||
ORDER BY DataTime DESC
|
||||
END
|
||||
|
||||
|
@ -427,7 +445,9 @@ END
|
|||
|
||||
|
||||
|
||||
|
||||
GO
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue