From 36d60c83fd620013863abc80085f1f6487b43d76 Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Thu, 29 Jun 2023 17:10:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=98=E5=82=A8=E8=BF=87?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SGGLDB_V2023-06-29.sql | 47 ++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/DataBase/版本日志/SGGLDB_V2023-06-29.sql b/DataBase/版本日志/SGGLDB_V2023-06-29.sql
index 5364f0c4..e0a61ea7 100644
--- a/DataBase/版本日志/SGGLDB_V2023-06-29.sql
+++ b/DataBase/版本日志/SGGLDB_V2023-06-29.sql
@@ -10,3 +10,50 @@ VALUES('6077EBFF-3905-4D1E-959B-0795E9A1627C','F004D9B0-6E6A-41E0-88F1-2306BB639
 INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
 VALUES('0E2074B0-53AF-4075-8C69-2F5E10A1E791','F004D9B0-6E6A-41E0-88F1-2306BB6397C6','±£´æ',4)   
 GO
+
+
+--»ñÈ¡µ±Ç°ÈËÏîÄ¿¼¶´ý°ìÊÂÏî
+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
+
+