This commit is contained in:
parent
f304f60a72
commit
8c5bec86b8
|
@ -352,6 +352,22 @@ WHERE WeekPlan.ProjectId=@projectId
|
||||||
and WeekPlan.DutyPerson like '%'+@userId+'%' and WeekPlan.IsOK =0 and DATENAME(DAY,GETDATE())<=DATENAME(DAY,WeekPlan.EndDate)
|
and WeekPlan.DutyPerson like '%'+@userId+'%' and WeekPlan.IsOK =0 and DATENAME(DAY,GETDATE())<=DATENAME(DAY,WeekPlan.EndDate)
|
||||||
and DATENAME(year,GETDATE())=DATENAME(year,WeekPlan.EndDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,WeekPlan.EndDate)
|
and DATENAME(year,GETDATE())=DATENAME(year,WeekPlan.EndDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,WeekPlan.EndDate)
|
||||||
|
|
||||||
|
UNION ALL
|
||||||
|
SELECT DISTINCT --MonthPlan.MonthPlanId AS DataId
|
||||||
|
'' AS DataId
|
||||||
|
,'C62F4256-4AC5-44BB-A990-2D330541A968' AS MenuId
|
||||||
|
,'档案文件已下发,请查收' AS MenuName
|
||||||
|
,'' AS Content
|
||||||
|
,users.UserId
|
||||||
|
,users.UserName
|
||||||
|
,GETDATE() AS DataTime
|
||||||
|
,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
|
||||||
|
,'../CQMS/DesignDrawing/ArchivesLibReceive.aspx' AS PCUrl
|
||||||
|
FROM IDP_DesignDrawingIssue AS DesignDrawingIssue
|
||||||
|
LEFT JOIN Sys_User AS users ON users.UserId =@userId
|
||||||
|
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
|
ORDER BY DataTime DESC
|
||||||
END
|
END
|
||||||
|
|
Loading…
Reference in New Issue