From f304f60a72555233fc9c591239012a13e5f5a074 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 1 Sep 2025 16:59:53 +0800
Subject: [PATCH] 1

---
 .../版本日志/SGGLDB_V2025-08-25-001_gf.sql    | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/DataBase/版本日志/SGGLDB_V2025-08-25-001_gf.sql b/DataBase/版本日志/SGGLDB_V2025-08-25-001_gf.sql
index 7da5be46..943abb55 100644
--- a/DataBase/版本日志/SGGLDB_V2025-08-25-001_gf.sql
+++ b/DataBase/版本日志/SGGLDB_V2025-08-25-001_gf.sql
@@ -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
 
 
+
+
+