diff --git a/DataBase/版本日志/SGGLDB_V2025-08-27-xiaj（关键事项申请关闭后待办）.sql b/DataBase/版本日志/SGGLDB_V2025-08-27-xiaj（关键事项申请关闭后待办）.sql
new file mode 100644
index 00000000..3b5e5567
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2025-08-27-xiaj（关键事项申请关闭后待办）.sql
@@ -0,0 +1,756 @@
+
+
+
+--��ȡ��ǰ�˴�������
+ALTER  PROCEDURE [dbo].[Sp_Project_GetToDoItems]
+	@projectId NVARCHAR(50)=NULL,
+	@userId NVARCHAR(200)=NULL
+AS
+/*��ȡ��ǰ�˴�������*/
+BEGIN
+SELECT HazardRegisterId AS DataId
+	,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
+	,'��ȫѲ�������' AS MenuName
+	,(case when len(register.RegisterDef)>15 then left(register.RegisterDef,15)+'...' else register.RegisterDef end)AS Content
+	,UserId
+	,users.UserName
+	,register.RegisterDate AS DataTime
+	,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
+	,'../HSSE/HiddenInspection/HiddenRectificationRectify.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl
+FROM HSSE_Hazard_HazardRegister AS register
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE register.ProjectId=@projectId AND
+((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') ))
+)
+UNION ALL
+
+SELECT HazardRegisterId AS DataId
+	,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
+	,'��ȫѲ���ȷ��' AS MenuName
+	,(case when len(register.RegisterDef)>15 then left(register.RegisterDef,15)+'...' else register.RegisterDef end) AS Content
+	,UserId
+	,users.UserName
+	,register.RegisterDate AS DataTime
+	,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
+	,'../HSSE/HiddenInspection/HiddenRectificationConfirm.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl
+FROM HSSE_Hazard_HazardRegister AS register
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE register.ProjectId=@projectId AND
+register.states = '2' AND register.CheckManId =@userId
+
+UNION ALL
+SELECT CheckControlCode AS DataId
+	,'B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306' AS MenuId
+	,'����Ѳ�������' AS MenuName
+	,checkControl.QuestionDef AS Content
+	,UserId
+	,users.UserName
+	,checkControl.CheckDate AS DataTime
+	,CONVERT(varchar(100),checkControl.CheckDate, 23) AS DataTimeStr
+	,'../CQMS/Check/ChecklistEdit.aspx?ToDo=ToDo&CheckControlCode='+checkControl.CheckControlCode AS PCUrl
+FROM Check_CheckControl AS checkControl
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE checkControl.ProjectId=@projectId AND
+checkControl.State != '7' AND checkControl.CheckControlCode in (select CheckControlCode from Check_CheckControlApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+
+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 Sys_User AS users ON users.UserId =@userId
+WHERE GJSX.ProjectId=@projectId AND
+GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0
+and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0)
+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
+--	,'�豸���ϱ����ȷ��' AS MenuName
+--	,Equipment.InspectionName AS Content
+--	,UserId
+--	,users.UserName
+--	,Equipment.InspectionDate AS DataTime
+--	,CONVERT(varchar(100),Equipment.InspectionDate, 23) AS DataTimeStr
+--	,'../CQMS/Comprehensive/InspectionEquipmentEdit.aspx?ToDo=ToDo&InspectionEquipmentId='+Equipment.InspectionEquipmentId AS PCUrl
+--FROM Comprehensive_InspectionEquipment AS Equipment
+--LEFT JOIN Sys_User AS users ON users.UserId =@userId
+--WHERE Equipment.ProjectId=@projectId and
+--Equipment.Status!='3' AND Equipment.InspectionEquipmentId in (select InspectionEquipmentId from Comprehensive_InspectionEquipmentApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+--UNION ALL
+--SELECT InspectionPersonId AS DataId
+--	,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
+--	,'��Ա�����ȷ��' AS MenuName
+--	,Person.PersonName AS Content
+--	,UserId
+--	,users.UserName
+--	,Person.CompileDate AS DataTime
+--	,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
+--	,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
+--FROM Comprehensive_InspectionPerson AS Person
+--LEFT JOIN Sys_User AS users ON users.UserId =@userId
+--WHERE Person.ProjectId=@projectId and
+--Person.Status!='3' AND Person.InspectionPersonId in (select InspectionPersonId from Comprehensive_InspectionPersonApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+--UNION ALL
+--SELECT InspectionMachineId AS DataId
+--	,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
+--	,'���߱����ȷ��' AS MenuName
+--	,Machine.InspectionMachineName AS Content
+--	,UserId
+--	,users.UserName
+--	,Machine.CompileDate AS DataTime
+--	,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
+--	,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
+--FROM Comprehensive_InspectionMachine AS Machine
+--LEFT JOIN Sys_User AS users ON users.UserId =@userId
+--WHERE Machine.ProjectId=@projectId and
+--Machine.Status!='3' AND Machine.InspectionMachineId in (select InspectionMachineId from Comprehensive_InspectionMachineApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+UNION ALL
+SELECT ConstructSolutionId AS DataId
+	,'91C4BFDB-0A51-4992-99CC-EB4EC185593D' AS MenuId
+	,'ʩ������������' AS MenuName
+	,Solution.SolutionName AS Content
+	,UserId
+	,users.UserName
+	,Solution.CompileDate AS DataTime
+	,CONVERT(varchar(100),Solution.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Solution/EditConstructSolution.aspx?ToDo=ToDo&ConstructSolutionId='+Solution.ConstructSolutionId AS PCUrl
+FROM Solution_CQMSConstructSolution AS Solution
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Solution.ProjectId=@projectId and
+Solution.State!='3'
+AND Solution.ConstructSolutionId in
+(select top 1 ConstructSolutionId from (
+SELECT Solution_CQMSConstructSolutionApprove.*
+FROM Solution_CQMSConstructSolutionApprove,
+(SELECT MIN([order]) AS [order],ConstructSolutionId FROM Solution_CQMSConstructSolutionApprove where ApproveType!='S' and  ApproveDate is null GROUP BY ConstructSolutionId )b
+WHERE Solution_CQMSConstructSolutionApprove.[order] = b.[order] and Solution_CQMSConstructSolutionApprove.ConstructSolutionId = b.ConstructSolutionId
+ ) approve
+where approve.ApproveMan=@userId )
+
+UNION ALL
+SELECT InspectionId AS DataId
+	,'4781f467-35bf-4cf2-aaa4-7960a175eb61' AS MenuId
+	,'����֪ͨ��������' AS MenuName
+	,InspectionManagement.AcceptanceSite AS Content
+	,UserId
+	,users.UserName
+	,InspectionManagement.CompileDate AS DataTime
+	,CONVERT(varchar(100),InspectionManagement.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/ProcessControl/InspectionNoticeEdit.aspx?View=View&InspectionId='+InspectionManagement.InspectionId AS PCUrl
+FROM ProcessControl_InspectionManagement AS InspectionManagement
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE InspectionManagement.ProjectId=@projectId and
+dateadd(day,3,InspectionManagement.CompileDate)>getdate() and InspectionManagement.AcceptanceCheckMan like '%'+@userId+'%'
+UNION ALL
+SELECT CheckSpecialId AS DataId
+	,'1B08048F-93ED-4E84-AE65-DB7917EA2DFB' AS MenuId
+	,'ר����' AS MenuName
+	,CheckItemSet.CheckItemName AS Content
+	,UserId
+	,users.UserName
+	,CheckSpecial.CheckTime AS DataTime
+	,CONVERT(varchar(100),CheckSpecial.CheckTime, 23) AS DataTimeStr
+	,'../HSSE/Check/CheckSpecialView.aspx?CheckSpecialId='+CheckSpecial.CheckSpecialId AS PCUrl
+FROM Check_CheckSpecial AS CheckSpecial
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId =CheckSpecial.CheckItemSetId
+WHERE CheckSpecial.ProjectId=@projectId and
+dateadd(day,3,CheckSpecial.CheckTime)>getdate() and CheckSpecial.PartInPersonIds like '%'+@userId+'%'
+UNION ALL
+SELECT CheckColligationId AS DataId
+	,'C198EBA8-9E23-4654-92E1-09C61105C522' AS MenuId
+	,'�ۺϼ�������' AS MenuName
+	,case CheckType when '0' then '�ܼ�' when '1' then '�¼�' else '����' end AS Content
+	,users.UserId
+	,users.UserName
+	,CheckColligation.CheckTime AS DataTime
+	,CONVERT(varchar(100),CheckColligation.CheckTime, 23) AS DataTimeStr
+	,'../HSSE/Check/CheckColligationEdit.aspx?CheckColligationId='+CheckColligation.CheckColligationId AS PCUrl
+FROM Check_CheckColligation AS CheckColligation
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Sys_FlowOperate AS FlowOperate ON CheckColligation.CheckColligationId=FlowOperate.DataId
+LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId
+WHERE CheckColligation.ProjectId=@projectId and FlowOperate.IsClosed <> 1 and FlowOperate.OperaterId=@userId
+UNION ALL
+SELECT PatrolPlanId AS DataId
+	,'D256E5C8-DC76-4F4D-BABE-A253418823F4' AS MenuId
+	,'����Ѳ�������' AS MenuName
+	,HazardListItem.HazardItems AS Content
+	,UserId
+	,users.UserName
+	,PatrolPlan.LimitCheckDate AS DataTime
+	,CONVERT(varchar(100),PatrolPlan.LimitCheckDate, 23) AS DataTimeStr
+	,'../HSSE/Hazard/RoutingInspectionEdit.aspx?PatrolPlanId='+PatrolPlan.PatrolPlanId AS PCUrl
+FROM Hazard_PatrolPlan AS PatrolPlan
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Hazard_HazardSelectedItem AS HazardListItem on HazardListItem.HazardSelectedItemId=PatrolPlan.HazardSelectedItemId
+WHERE HazardListItem.ProjectId=@projectId and
+dateadd(day,-3,PatrolPlan.LimitCheckDate)<getdate() and PatrolPlan.DutyPerson=@userId
+and (select COUNT(*) from Hazard_RoutingInspection ri where ri.PatrolPlanId=PatrolPlan.PatrolPlanId)=0
+UNION ALL
+SELECT PersonQuality.PersonId AS DataId
+	,'EBEA762D-1F46-47C5-9EAD-759E13D9B41C' AS MenuId
+	,'������ҵ��Ա���ʻ���'+convert(nvarchar(6),DATEDIFF(day,getdate(),PersonQuality.LimitDate))+'�����' AS MenuName
+	,Person.PersonName AS Content
+	,users.UserId
+	,users.UserName
+	,PersonQuality.LimitDate AS DataTime
+	,CONVERT(varchar(100),PersonQuality.LimitDate, 23) AS DataTimeStr
+	,'../HSSE/QualityAudit/PersonQualityEdit.aspx?PersonId='+PersonQuality.PersonId AS PCUrl
+FROM QualityAudit_PersonQuality AS PersonQuality
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN SitePerson_Person AS Person on Person.PersonId=PersonQuality.PersonId
+WHERE Person.ProjectId=@projectId and Person.IsUsed=1 and  Person.InTime<getdate() and (Person.OutTime is null or Person.OutTime  >getdate() ) and
+dateadd(day,-15,PersonQuality.LimitDate)<getdate() and getdate()<PersonQuality.LimitDate
+UNION ALL
+SELECT PersonQuality.PersonId AS DataId
+	,'EBEA762D-1F46-47C5-9EAD-759E13D9B41C' AS MenuId
+	,'������ҵ��Ա�����ѹ���'+convert(nvarchar(6),DATEDIFF(day,PersonQuality.LimitDate,getdate()))+'��' AS MenuName
+	,Person.PersonName AS Content
+	,users.UserId
+	,users.UserName
+	,PersonQuality.LimitDate AS DataTime
+	,CONVERT(varchar(100),PersonQuality.LimitDate, 23) AS DataTimeStr
+	,'../HSSE/QualityAudit/PersonQualityEdit.aspx?PersonId='+PersonQuality.PersonId AS PCUrl
+FROM QualityAudit_PersonQuality AS PersonQuality
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN SitePerson_Person AS Person on Person.PersonId=PersonQuality.PersonId
+WHERE Person.ProjectId=@projectId and Person.IsUsed=1 and  Person.InTime<getdate() and (Person.OutTime is null or Person.OutTime  >getdate() ) and
+PersonQuality.LimitDate<getdate()
+UNION ALL
+SELECT InspectionPersonId AS DataId
+	,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
+	,'��Ա���黹��'+convert(nvarchar(6),DATEDIFF(day,getdate(),Person.ValidityDate))+'�����' AS MenuName
+	,Person.PersonName AS Content
+	,UserId
+	,users.UserName
+	,Person.ValidityDate AS DataTime
+	,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
+FROM Comprehensive_InspectionPerson AS Person
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Person.ProjectId=@projectId and Person.IsOnSite=1 and
+dateadd(day,-15,Person.ValidityDate)<getdate() and getdate()<Person.ValidityDate
+UNION ALL
+SELECT InspectionPersonId AS DataId
+	,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
+	,'��Ա�����ѹ���'+convert(nvarchar(6),DATEDIFF(day,Person.ValidityDate,getdate()))+'��' AS MenuName
+	,Person.PersonName AS Content
+	,UserId
+	,users.UserName
+	,Person.ValidityDate AS DataTime
+	,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
+FROM Comprehensive_InspectionPerson AS Person
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Person.ProjectId=@projectId and Person.IsOnSite=1 and
+Person.ValidityDate<getdate()
+UNION ALL
+SELECT InspectionMachineId AS DataId
+	,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
+	,'���߱��黹��'+convert(nvarchar(6),DATEDIFF(day,getdate(),Machine.NextTestDate))+'�����' AS MenuName
+	,Machine.InspectionMachineName AS Content
+	,UserId
+	,users.UserName
+	,Machine.NextTestDate AS DataTime
+	,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
+FROM Comprehensive_InspectionMachine AS Machine
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Machine.ProjectId=@projectId and Machine.IsOnSite=1 and
+dateadd(day,-15,Machine.NextTestDate)<getdate() and getdate()<Machine.NextTestDate
+UNION ALL
+SELECT InspectionMachineId AS DataId
+	,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
+	,'���߱����ѹ���'+convert(nvarchar(6),DATEDIFF(day,Machine.NextTestDate,getdate()))+'��' AS MenuName
+	,Machine.InspectionMachineName AS Content
+	,UserId
+	,users.UserName
+	,Machine.NextTestDate AS DataTime
+	,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
+FROM Comprehensive_InspectionMachine AS Machine
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Machine.ProjectId=@projectId and Machine.IsOnSite=1 and
+Machine.NextTestDate<getdate()
+UNION ALL
+SELECT distinct Project.ProjectId AS DataId
+	,'2AE9D982-A499-497F-8F54-ADDA5856887E' AS MenuId
+	,'���¹�������������δ�' AS MenuName
+	,'' AS Content
+	,users.UserId
+	,users.UserName
+	,GETDATE() AS DataTime
+	,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
+	,'../JDGL/Check/QuantityCompletion.aspx?ToDo=ToDo' AS PCUrl
+FROM Base_Project AS Project
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
+WHERE Project.ProjectId=@projectId
+and (pu.RoleId like '%22F78A47-F59C-4FE8-9C43-2DD304CB2108%' or pu.RoleId like '%GCB64EF3-AB0A-40BC-824D-CC314598D5DC%') and ((DATENAME(DAY,GETDATE())>=22 and (select COUNT(*) from JDGL_QuantityCompletion WHERE ProjectId=@projectId and DATENAME(year,GETDATE())=DATENAME(year,EndDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,EndDate))=0)
+--or (DATEADD(day,60,(select top 1 EndDate from JDGL_QuantityCompletion WHERE ProjectId=@projectId order by EndDate desc))<GETDATE())
+)
+UNION ALL
+SELECT DISTINCT --MonthPlan.MonthPlanId AS DataId
+	'' AS DataId
+	,'94287B92-7E96-4B90-BC6F-DAF30AE3B314' AS MenuId
+	,'���ȹ������¶ȼƻ���δ���' AS MenuName
+	,'' AS Content
+	,users.UserId
+	,users.UserName
+	,GETDATE() AS DataTime
+	,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
+	,'../JDGL/Check/MonthPlanEditNew.aspx?ToDo=ToDo&Months='+CONVERT(varchar(100),Months, 23) AS PCUrl
+FROM JDGL_MonthPlan AS MonthPlan
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
+WHERE MonthPlan.ProjectId=@projectId
+and MonthPlan.DutyPerson like '%'+@userId+'%' and MonthPlan.RealDate is null and DATENAME(DAY,GETDATE())>=22 and 
+DATENAME(year,GETDATE())=DATENAME(year,MonthPlan.PlanDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,MonthPlan.PlanDate)
+
+UNION ALL
+SELECT DISTINCT --WeekPlan.WeekPlanId AS DataId
+	'' AS DataId
+	,'56A54B4B-BBA3-4249-9FFC-3A60DAC79059' AS MenuId
+	,'���ȹ������ܽ��ȼƻ���δ���' AS MenuName
+	,'' AS Content
+	,users.UserId
+	,users.UserName
+	,GETDATE() AS DataTime
+	,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
+	,'../JDGL/Check/WeekPlanEdit.aspx?ToDo=ToDo&WeekNo='+WeekPlan.WeekNo AS PCUrl
+FROM JDGL_WeekPlan AS WeekPlan
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
+WHERE WeekPlan.ProjectId=@projectId
+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)
+
+
+ORDER BY DataTime DESC
+END
+
+
+
+
+
+GO
+
+
+
+
+
+--��ȡ��ǰ�˹���̨����Ԥ��
+ALTER PROCEDURE [dbo].[Sp_WorkBench_GetToDoItems]
+	@userId NVARCHAR(200)=NULL,
+	@sType char(10)=null
+AS
+/*��ȡ��ǰ�˴�������*/
+BEGIN
+SELECT HazardRegisterId AS DataId
+	,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
+	,'��ȫѲ�������' AS MenuName
+	,project.ProjectCode
+	,register.RegisterDef AS Content
+	,users.UserId
+	,users.UserName
+	,register.RegisterDate AS DataTime
+	,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
+	,'HSSE/HiddenInspection/HiddenRectificationRectify.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl
+FROM HSSE_Hazard_HazardRegister AS register
+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 (@sType='1' or @sType='2') and register.ProjectId = projectUser.ProjectId and (project.ProjectState = '1' OR project.ProjectState IS NULL) and 
+((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') ))
+)
+UNION ALL
+
+SELECT HazardRegisterId AS DataId
+	,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
+	,'��ȫѲ���ȷ��' AS MenuName
+	,project.ProjectCode
+	,register.RegisterDef AS Content
+	,users.UserId
+	,users.UserName
+	,register.RegisterDate AS DataTime
+	,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
+	,'HSSE/HiddenInspection/HiddenRectificationConfirm.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl
+FROM HSSE_Hazard_HazardRegister AS register
+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 (@sType='1' or @sType='2') and register.ProjectId = projectUser.ProjectId and (project.ProjectState = '1' OR project.ProjectState IS NULL) and 
+register.states = '2' AND register.CheckManId =@userId
+
+UNION ALL
+SELECT CheckControlCode AS DataId
+	,'B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306' AS MenuId
+	,'����Ѳ�������' AS MenuName
+	,project.ProjectCode
+	,checkControl.QuestionDef AS Content
+	,users.UserId
+	,users.UserName
+	,checkControl.CheckDate AS DataTime
+	,CONVERT(varchar(100),checkControl.CheckDate, 23) AS DataTimeStr
+	,'CQMS/Check/ChecklistEdit.aspx?CheckControlCode='+checkControl.CheckControlCode AS PCUrl
+FROM Check_CheckControl AS checkControl
+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 (@sType='1' or @sType='2') and checkControl.ProjectId = projectUser.ProjectId and (project.ProjectState = '1' OR project.ProjectState IS NULL) and 
+checkControl.State != '7' AND checkControl.CheckControlCode in (select CheckControlCode from Check_CheckControlApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+
+UNION ALL
+SELECT GJSXID AS DataId
+	,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId
+	,'�ؼ����������' AS MenuName
+	,project.ProjectCode
+	,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 (@sType='1' or @sType='2') and GJSX.ProjectId = projectUser.ProjectId and (project.ProjectState = '1' OR project.ProjectState IS NULL) and 
+GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0
+and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0)
+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
+	,project.ProjectCode
+	,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 (@sType='1' or @sType='2') and 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 ConstructSolutionId AS DataId
+	,'91C4BFDB-0A51-4992-99CC-EB4EC185593D' AS MenuId
+	,'ʩ������������' AS MenuName
+	,project.ProjectCode
+	,Solution.SolutionName AS Content
+	,users.UserId
+	,users.UserName
+	,Solution.CompileDate AS DataTime
+	,CONVERT(varchar(100),Solution.CompileDate, 23) AS DataTimeStr
+	,'CQMS/Solution/EditConstructSolution.aspx?ConstructSolutionId='+Solution.ConstructSolutionId AS PCUrl
+FROM Solution_CQMSConstructSolution AS Solution
+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 (@sType='1' or @sType='2') and Solution.ProjectId = projectUser.ProjectId and (project.ProjectState = '1' OR project.ProjectState IS NULL) and 
+Solution.State!='3' 
+AND Solution.ConstructSolutionId in
+(select top 1 ConstructSolutionId from (
+SELECT Solution_CQMSConstructSolutionApprove.*
+FROM Solution_CQMSConstructSolutionApprove,
+(SELECT MIN([order]) AS [order],ConstructSolutionId FROM Solution_CQMSConstructSolutionApprove where ApproveType!='S' and  ApproveDate is null GROUP BY ConstructSolutionId )b
+WHERE Solution_CQMSConstructSolutionApprove.[order] = b.[order] and Solution_CQMSConstructSolutionApprove.ConstructSolutionId = b.ConstructSolutionId
+ ) approve
+where approve.ApproveMan=@userId )
+
+UNION ALL
+SELECT InspectionId AS DataId
+	,'4781f467-35bf-4cf2-aaa4-7960a175eb61' AS MenuId
+	,'����֪ͨ��������' AS MenuName
+	,project.ProjectCode
+	,InspectionManagement.AcceptanceSite AS Content
+	,users.UserId
+	,users.UserName
+	,InspectionManagement.CompileDate AS DataTime
+	,CONVERT(varchar(100),InspectionManagement.CompileDate, 23) AS DataTimeStr
+	,'CQMS/ProcessControl/InspectionNoticeEdit.aspx?View=View&InspectionId='+InspectionManagement.InspectionId AS PCUrl
+FROM ProcessControl_InspectionManagement AS InspectionManagement
+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 (@sType='1' or @sType='2') and InspectionManagement.ProjectId=projectUser.ProjectId and (project.ProjectState = '1' OR project.ProjectState IS NULL) and 
+dateadd(day,3,InspectionManagement.CompileDate)>getdate() and InspectionManagement.AcceptanceCheckMan like '%'+@userId+'%'
+UNION ALL
+SELECT CheckSpecialId AS DataId
+	,'1B08048F-93ED-4E84-AE65-DB7917EA2DFB' AS MenuId
+	,'ר����' AS MenuName
+	,project.ProjectCode
+	,CheckItemSet.CheckItemName AS Content
+	,users.UserId
+	,users.UserName
+	,CheckSpecial.CheckTime AS DataTime
+	,CONVERT(varchar(100),CheckSpecial.CheckTime, 23) AS DataTimeStr
+	,'HSSE/Check/CheckSpecialView.aspx?CheckSpecialId='+CheckSpecial.CheckSpecialId AS PCUrl
+FROM Check_CheckSpecial AS CheckSpecial
+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
+LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId =CheckSpecial.CheckItemSetId
+WHERE (@sType='1' or @sType='2') and (project.ProjectState = '1' OR project.ProjectState IS NULL) and 
+dateadd(day,3,CheckSpecial.CheckTime)>getdate() and CheckSpecial.PartInPersonIds like '%'+@userId+'%'
+and CheckSpecial.ProjectId = projectUser.ProjectId
+UNION ALL
+SELECT CheckColligationId AS DataId
+	,'C198EBA8-9E23-4654-92E1-09C61105C522' AS MenuId
+	,'�ۺϼ�������' AS MenuName
+	,project.ProjectCode
+	,case CheckType when '0' then '�ܼ�' when '1' then '�¼�' else '����' end AS Content
+	,users.UserId
+	,users.UserName
+	,CheckColligation.CheckTime AS DataTime
+	,CONVERT(varchar(100),CheckColligation.CheckTime, 23) AS DataTimeStr
+	,'HSSE/Check/CheckColligationEdit.aspx?CheckColligationId='+CheckColligation.CheckColligationId AS PCUrl
+FROM Check_CheckColligation AS CheckColligation
+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
+LEFT JOIN Sys_FlowOperate AS FlowOperate ON CheckColligation.CheckColligationId=FlowOperate.DataId
+LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId
+WHERE (@sType='1' or @sType='2') and (project.ProjectState = '1' OR project.ProjectState IS NULL) and 
+FlowOperate.IsClosed <> 1 and FlowOperate.OperaterId=@userId
+and CheckColligation.ProjectId = projectUser.ProjectId
+UNION ALL
+SELECT PatrolPlanId AS DataId
+	,'D256E5C8-DC76-4F4D-BABE-A253418823F4' AS MenuId
+	,'����Ѳ�������' AS MenuName
+	,project.ProjectCode
+	,HazardListItem.HazardItems AS Content
+	,users.UserId
+	,users.UserName
+	,PatrolPlan.LimitCheckDate AS DataTime
+	,CONVERT(varchar(100),PatrolPlan.LimitCheckDate, 23) AS DataTimeStr
+	,'HSSE/Hazard/RoutingInspectionEdit.aspx?PatrolPlanId='+PatrolPlan.PatrolPlanId AS PCUrl
+FROM Hazard_PatrolPlan AS PatrolPlan
+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
+LEFT JOIN Hazard_HazardSelectedItem AS HazardListItem on HazardListItem.HazardSelectedItemId=PatrolPlan.HazardSelectedItemId
+WHERE (@sType='1' or @sType='2') and (project.ProjectState = '1' OR project.ProjectState IS NULL) and 
+dateadd(day,-3,PatrolPlan.LimitCheckDate)<getdate() and PatrolPlan.DutyPerson=@userId
+and (select COUNT(*) from Hazard_RoutingInspection ri where ri.PatrolPlanId=PatrolPlan.PatrolPlanId)=0
+and HazardListItem.ProjectId=projectUser.ProjectId
+
+UNION ALL
+SELECT PersonQuality.PersonId AS DataId
+	,'EBEA762D-1F46-47C5-9EAD-759E13D9B41C' AS MenuId
+	,'������ҵ��Ա���ʻ���'+convert(nvarchar(6),DATEDIFF(day,getdate(),PersonQuality.LimitDate))+'�����' AS MenuName
+	,project.ProjectCode
+	,Person.PersonName AS Content
+	,users.UserId
+	,users.UserName
+	,PersonQuality.LimitDate AS DataTime
+	,CONVERT(varchar(100),PersonQuality.LimitDate, 23) AS DataTimeStr
+	,'HSSE/QualityAudit/PersonQualityEdit.aspx?PersonId='+PersonQuality.PersonId AS PCUrl
+FROM QualityAudit_PersonQuality AS PersonQuality
+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
+LEFT JOIN SitePerson_Person AS Person on Person.PersonId=PersonQuality.PersonId
+WHERE Person.IsUsed=1 and  Person.InTime<getdate() and (Person.OutTime is null or Person.OutTime  >getdate() ) and
+dateadd(day,-15,PersonQuality.LimitDate)<getdate() and getdate()<PersonQuality.LimitDate
+and (@sType='1' or @sType='3') and (project.ProjectState = '1' OR project.ProjectState IS NULL) and 
+Person.ProjectId = project.ProjectId
+UNION ALL
+SELECT PersonQuality.PersonId AS DataId
+	,'EBEA762D-1F46-47C5-9EAD-759E13D9B41C' AS MenuId
+	,'������ҵ��Ա�����ѹ���'+convert(nvarchar(6),DATEDIFF(day,PersonQuality.LimitDate,getdate()))+'��' AS MenuName
+	,project.ProjectCode
+	,Person.PersonName AS Content
+	,users.UserId
+	,users.UserName
+	,PersonQuality.LimitDate AS DataTime
+	,CONVERT(varchar(100),PersonQuality.LimitDate, 23) AS DataTimeStr
+	,'HSSE/QualityAudit/PersonQualityEdit.aspx?PersonId='+PersonQuality.PersonId AS PCUrl
+FROM QualityAudit_PersonQuality AS PersonQuality
+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
+LEFT JOIN SitePerson_Person AS Person on Person.PersonId=PersonQuality.PersonId
+WHERE Person.IsUsed=1 and  Person.InTime<getdate() and (Person.OutTime is null or Person.OutTime  >getdate() ) and
+PersonQuality.LimitDate<getdate() and (@sType='1' or @sType='2') and (project.ProjectState = '1' OR project.ProjectState IS NULL) and 
+Person.ProjectId =projectUser.ProjectId
+
+UNION ALL
+SELECT InspectionPersonId AS DataId
+	,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
+	,'��Ա���黹��'+convert(nvarchar(6),DATEDIFF(day,getdate(),Person.ValidityDate))+'�����  ' AS MenuName
+	,project.ProjectCode
+	,Person.PersonName AS Content
+	,users.UserId
+	,users.UserName
+	,Person.ValidityDate AS DataTime
+	,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
+	,'CQMS/Comprehensive/InspectionPersonEdit.aspx?projectId='+project.ProjectId+'&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
+FROM Comprehensive_InspectionPerson AS Person
+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 Person.IsOnSite=1 and (@sType='1' or @sType='3') and
+dateadd(day,-15,Person.ValidityDate)<getdate() and getdate()<Person.ValidityDate and
+Person.ProjectId = projectUser.ProjectId
+and project.ProjectState='1'
+
+UNION ALL
+SELECT InspectionPersonId AS DataId
+	,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
+	,'��Ա�����ѹ���'+convert(nvarchar(6),DATEDIFF(day,Person.ValidityDate,getdate()))+'��  ' AS MenuName
+	,project.ProjectCode
+	,Person.PersonName AS Content
+	,users.UserId
+	,users.UserName
+	,Person.ValidityDate AS DataTime
+	,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
+	,'CQMS/Comprehensive/InspectionPersonEdit.aspx?projectId='+project.ProjectId+'&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
+FROM Comprehensive_InspectionPerson AS Person
+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 Person.IsOnSite=1 and (@sType='1' or @sType='2') and (project.ProjectState = '1' OR project.ProjectState IS NULL) and 
+Person.ValidityDate<getdate() and 
+Person.ProjectId = projectUser.ProjectId
+and project.ProjectState='1'
+
+UNION ALL
+SELECT InspectionMachineId AS DataId
+	,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
+	,'���߱��黹��'+convert(nvarchar(6),DATEDIFF(day,getdate(),Machine.NextTestDate))+'����� ' AS MenuName
+	,project.ProjectCode
+	,Machine.InspectionMachineName AS Content
+	,users.UserId
+	,users.UserName
+	,Machine.NextTestDate AS DataTime
+	,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
+	,'CQMS/Comprehensive/InspectionMachineEdit.aspx?projectId='+project.ProjectId+'&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
+FROM Comprehensive_InspectionMachine AS Machine
+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 Machine.IsOnSite=1 and (@sType='1' or @sType='3') and (project.ProjectState = '1' OR project.ProjectState IS NULL) and 
+dateadd(day,-15,Machine.NextTestDate)<getdate() and getdate()<Machine.NextTestDate and
+Machine.ProjectId = projectUser.ProjectId
+and project.ProjectState='1'
+UNION ALL
+SELECT InspectionMachineId AS DataId
+	,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
+	,'���߱����ѹ���'+convert(nvarchar(6),DATEDIFF(day,Machine.NextTestDate,getdate()))+'��' AS MenuName
+	,project.ProjectCode
+	,Machine.InspectionMachineName AS Content
+	,users.UserId
+	,users.UserName
+	,Machine.NextTestDate AS DataTime
+	,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
+	,'CQMS/Comprehensive/InspectionMachineEdit.aspx?projectId='+project.ProjectId+'&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
+FROM Comprehensive_InspectionMachine AS Machine
+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 Machine.IsOnSite=1 and Machine.ProjectId=projectUser.ProjectId and (project.ProjectState = '1' OR project.ProjectState IS NULL) and 
+Machine.NextTestDate<getdate() and (@sType='1' or @sType='2') 
+and project.ProjectState='1'
+UNION ALL
+SELECT distinct Project.ProjectId AS DataId
+	,'2AE9D982-A499-497F-8F54-ADDA5856887E' AS MenuId
+	,'���¹�������������δ�' AS MenuName
+	,project.ProjectCode
+	,'' AS Content
+	,users.UserId
+	,users.UserName
+	,GETDATE() AS DataTime
+	,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
+	,'JDGL/Check/QuantityCompletion.aspx?ToDo=ToDo' AS PCUrl
+FROM Base_Project AS Project
+LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
+LEFT JOIN Sys_User AS users ON users.UserId = pu.UserId
+WHERE (project.ProjectState = '1' OR project.ProjectState IS NULL) and (pu.RoleId like '%22F78A47-F59C-4FE8-9C43-2DD304CB2108%' or pu.RoleId like '%GCB64EF3-AB0A-40BC-824D-CC314598D5DC%') and ((DATENAME(DAY,GETDATE())>=22 and (select COUNT(*) from JDGL_QuantityCompletion WHERE DATENAME(year,GETDATE())=DATENAME(year,EndDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,EndDate))=0)
+and (@sType='1' or @sType='2') and Project.ProjectId = pu.ProjectId --or (DATEADD(day,60,(select top 1 EndDate from JDGL_QuantityCompletion WHERE ProjectId=@projectId order by EndDate desc))<GETDATE())
+)
+UNION ALL
+SELECT DISTINCT --MonthPlan.MonthPlanId AS DataId
+	'' AS DataId
+	,'94287B92-7E96-4B90-BC6F-DAF30AE3B314' AS MenuId
+	,'���ȹ������¶ȼƻ���δ���' AS MenuName
+	,project.ProjectCode
+	,'' AS Content
+	,users.UserId
+	,users.UserName
+	,GETDATE() AS DataTime
+	,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
+	,'JDGL/Check/MonthPlanEditNew.aspx?Months='+CONVERT(varchar(100),Months, 23) AS PCUrl
+FROM JDGL_MonthPlan AS MonthPlan
+LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
+LEFT JOIN Sys_User AS users ON users.UserId =pu.UserId
+LEFT JOIN Base_Project as project on project.ProjectId =pu.ProjectId
+WHERE MonthPlan.ProjectId=pu.ProjectId 
+and MonthPlan.DutyPerson like '%'+@userId+'%' and MonthPlan.RealDate is null and DATENAME(DAY,GETDATE())>=22 and 
+DATENAME(year,GETDATE())=DATENAME(year,MonthPlan.PlanDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,MonthPlan.PlanDate)
+and (project.ProjectState = '1' OR project.ProjectState IS NULL) and (@sType='1' or @sType='2')
+UNION ALL
+SELECT DISTINCT --WeekPlan.WeekPlanId AS DataId
+	'' AS DataId
+	,'56A54B4B-BBA3-4249-9FFC-3A60DAC79059' AS MenuId
+	,'���ȹ������ܽ��ȼƻ���δ���' AS MenuName
+	,project.ProjectCode
+	,'' AS Content
+	,users.UserId
+	,users.UserName
+	,GETDATE() AS DataTime
+	,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
+	,'JDGL/Check/WeekPlanEdit.aspx?WeekNo='+WeekPlan.WeekNo AS PCUrl
+FROM JDGL_WeekPlan AS WeekPlan
+LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
+LEFT JOIN Sys_User AS users ON users.UserId =pu.UserId
+LEFT JOIN Base_Project as project on project.ProjectId =pu.ProjectId
+WHERE WeekPlan.ProjectId = pu.ProjectId
+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 (project.ProjectState = '1' OR project.ProjectState IS NULL) and (@sType='1' or @sType='2')
+
+ORDER BY DataTime DESC
+END
+
+
+
+
+
+GO
+
+
diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs
index 03bbdcce..07d89036 100644
--- a/SGGL/BLL/SysManage/UnitService.cs
+++ b/SGGL/BLL/SysManage/UnitService.cs
@@ -684,6 +684,12 @@ namespace BLL
                 Funs.FineUIPleaseSelect(dropName);
             }
         }
+
+        /// <summary>
+        /// 获取所有单位名称下拉选择项
+        /// </summary>
+        /// <param name="dropName"></param>
+        /// <param name="isShowPlease"></param>
         public static void InitAllUnitDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
         {
             dropName.DataValueField = "UnitId";
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataInNew.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataInNew.aspx.cs
index e549ac0f..241e9e32 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataInNew.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataInNew.aspx.cs
@@ -1,5 +1,6 @@
 using Aspose.Words;
 using BLL;
+using FineUIPro.Web.Comprehensive;
 using FineUIPro.Web.ProjectData;
 using Model;
 using NPOI.SS.Formula.Functions;
@@ -9,6 +10,7 @@ using System.Data;
 using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Security.Cryptography;
 using System.Threading;
 using System.Web;
@@ -473,6 +475,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         if (isExitISOValue != null) ///已存在
                         {
                             Ins.DesignDetailsId = isExitISOValue.DesignDetailsId;
+                            Ins.Status = isExitISOValue.Status;
                             BLL.DesignDetailsService.UpdateDesignDetails(Ins);
                         }
                         else
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx
index 7bfdbede..a5b90b09 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx
@@ -82,6 +82,9 @@
                         </f:TemplateField>
                         <f:RenderField ColumnID="ReceiveMan" DataField="ReceiveMan" FieldType="String" HeaderText="接收人" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="RemarkCode" DataField="RemarkCode" SortField="RemarkCode" FieldType="String" HeaderText="标志编号" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                                <%--<f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataInNew.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataInNew.aspx.cs
index 81e0e9ce..30351edc 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataInNew.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataInNew.aspx.cs
@@ -496,6 +496,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                         if (isExitISOValue != null) ///已存在
                         {
                             Ins.DesignDrawingsId = isExitISOValue.DesignDrawingsId;
+                            Ins.Status = isExitISOValue.Status;
                             BLL.DesignDrawingsService.UpdateDesignDrawings(Ins);
                         }
                         else
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs
index 253cbdeb..ce4162ac 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs
@@ -37,11 +37,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 GetButtonPower();
                 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
                 BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, false);
-                BLL.UnitService.InitUnitDownList(this.drpUnitIds, this.CurrUser.LoginProjectId, false);
+                //BLL.UnitService.InitUnitDownList(this.drpUnitIds, this.CurrUser.LoginProjectId, false);//总包、分包单位
+                BLL.UnitService.InitAllUnitDownList(this.drpUnitIds, this.CurrUser.LoginProjectId, false);//所有单位
                 //LoadAuditSelect();
                 //this.agree.Hidden = true;
                 //this.options.Hidden = true;
-                
+
                 //this.btnSave.Hidden = true;
                 //this.btnSubmit.Hidden = true;
                 this.DesignDrawingsId = Request.Params["DesignDrawingsId"];
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 6b79b476..a3ef433f 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1918,6 +1918,7 @@
     <Content Include="SHIYE\InformationProject\SafetyBriefingEdit.aspx" />
     <Content Include="SysManage\HttpLog.aspx" />
     <Content Include="SysManage\ProjectToDo.aspx" />
+    <Content Include="SysManage\UnitCleanupMerge.aspx" />
     <Content Include="TaskScheduling\InterFace\IFLogList.aspx" />
     <Content Include="TaskScheduling\InterFace\InterFaceEdit.aspx" />
     <Content Include="TaskScheduling\InterFace\InterFaceSet.aspx" />
@@ -16639,6 +16640,13 @@
     <Compile Include="SysManage\Unit.aspx.designer.cs">
       <DependentUpon>Unit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="SysManage\UnitCleanupMerge.aspx.cs">
+      <DependentUpon>UnitCleanupMerge.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="SysManage\UnitCleanupMerge.aspx.designer.cs">
+      <DependentUpon>UnitCleanupMerge.aspx</DependentUpon>
+    </Compile>
     <Compile Include="SysManage\UnitEdit.aspx.cs">
       <DependentUpon>UnitEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -20155,7 +20163,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
index 9fef9d07..b2d051b9 100644
--- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
@@ -405,6 +405,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
             txtUserID.Enabled = isStart;
             Date_CreateDate.Enabled = isStart;
             DropQuestionTypeID.Enabled = isStart;
+            rblNotice.Enabled = isStart;
             DropGJSXTypeID.Enabled = isStart;
             DropUser_Acceptance.Enabled = isStart;
             Date_CompleteDate.Enabled = isStart;
@@ -996,7 +997,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
             string sortField = Grid4.SortField;
             string sortDirection = Grid4.SortDirection;
 
-            var userList = (from x in Funs.DB.Sys_User
+           /* var userList = (from x in Funs.DB.Sys_User
                             join y in Funs.DB.Project_ProjectUnit
                                 on x.UnitId equals y.UnitId
                             join p in Funs.DB.Project_ProjectUser
@@ -1004,9 +1005,14 @@ namespace FineUIPro.Web.PZHGL.GJSX
                             where p.ProjectId == CurrUser.LoginProjectId &&
                                   y.ProjectId == CurrUser.LoginProjectId
                             orderby x.UserCode
-                            select x);
-
+                            select x);*/
+            var userList = (from x in Funs.DB.Project_ProjectUser
+                        join y in Funs.DB.Sys_User on x.UserId equals y.UserId
+                        where x.ProjectId == CurrUser.LoginProjectId
+                        orderby y.UserCode
+                        select y);
             DataTable table2 = LINQToDataTable(userList);
+            if (table2 == null|| table2.Rows.Count==0) return table2;
             DataView view2 = table2.DefaultView;
             view2.Sort = String.Format("{0} {1}", sortField, sortDirection);
 
diff --git a/SGGL/FineUIPro.Web/SysManage/Unit.aspx b/SGGL/FineUIPro.Web/SysManage/Unit.aspx
index bc6023ae..bbddb6af 100644
--- a/SGGL/FineUIPro.Web/SysManage/Unit.aspx
+++ b/SGGL/FineUIPro.Web/SysManage/Unit.aspx
@@ -30,12 +30,14 @@
                         <Items>
                              <f:TextBox runat="server" Label="单位名称" ID="txtUnitName" EmptyText="输入查询条件" 
                                 AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"></f:TextBox>                       
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>    
+                            <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
                             <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Hidden="true">
-                            </f:Button>   
+                            </f:Button>
                             <f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationGet" Hidden="true" runat="server"
                                 OnClick="btnImport_Click">
-                            </f:Button>                     
+                            </f:Button>
+                            <f:Button ID="btnDataBase" ToolTip="数据清理" Icon="DatabaseWrench"  runat="server" Hidden="true"  OnClick="btnDataBase_Click">
+                            </f:Button>    
                         </Items>
                     </f:Toolbar>
                 </Toolbars>
diff --git a/SGGL/FineUIPro.Web/SysManage/Unit.aspx.cs b/SGGL/FineUIPro.Web/SysManage/Unit.aspx.cs
index 92c1b208..bf28c11c 100644
--- a/SGGL/FineUIPro.Web/SysManage/Unit.aspx.cs
+++ b/SGGL/FineUIPro.Web/SysManage/Unit.aspx.cs
@@ -10,9 +10,9 @@ namespace FineUIPro.Web.SysManage
     public partial class Unit : PageBase
     {
         protected void Page_Load(object sender, EventArgs e)
-        {            
+        {
             if (!IsPostBack)
-            { 
+            {
                 ////权限按钮方法
                 this.GetButtonPower();
                 this.btnNew.OnClientClick = Window1.GetShowReference("UnitEdit.aspx") + "return false;";
@@ -20,14 +20,14 @@ namespace FineUIPro.Web.SysManage
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
                     Grid1.PageSize = this.CurrUser.PageSize.Value;
-                }           
+                }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 this.BindGrid();
             }
         }
-        
-             /// <summary>
+
+        /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.SysManage
                                 + @" LEFT JOIN Base_UnitType AS UnitType ON UnitType.UnitTypeId=Unit.UnitTypeId"
                                 + @" LEFT JOIN Base_Unit AS supUnit ON Unit.SupUnitId=supUnit.UnitId"
                                 + @" WHERE 1=1";
-            List<SqlParameter> listStr = new List<SqlParameter>();           
+            List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(this.txtUnitName.Text.Trim()))
             {
                 strSql += " AND Unit.UnitName LIKE @UnitName";
@@ -80,7 +80,7 @@ namespace FineUIPro.Web.SysManage
                     this.btnNew.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify))
-                {                    
+                {
                     this.btnMenuEdit.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnDelete))
@@ -92,9 +92,14 @@ namespace FineUIPro.Web.SysManage
                     this.btnImport.Hidden = false;
                 }
             }
+
+            //if (this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.fuweiId || this.CurrUser.UserId == Const.shenyinhangId)
+            //{//系统管理员、合肥诺必达、付伟、申银行
+            this.btnDataBase.Hidden = false;
+            //}
         }
         #endregion
-               
+
         /// <summary>
         /// 右键删除事件
         /// </summary>
@@ -127,7 +132,7 @@ namespace FineUIPro.Web.SysManage
                         }
                         else
                         {
-                            strShowNotify += unit.UnitName +"："+ cont;
+                            strShowNotify += unit.UnitName + "：" + cont;
                         }
                     }
                 }
@@ -174,7 +179,7 @@ namespace FineUIPro.Web.SysManage
         {
             BindGrid();
         }
-        
+
         /// <summary>
         /// Grid行双击事件
         /// </summary>
@@ -208,7 +213,7 @@ namespace FineUIPro.Web.SysManage
             if (!this.btnMenuEdit.Hidden)   ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
             {
                 PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("UnitEdit.aspx?UnitId={0}", Grid1.SelectedRowID, "编辑 - ")));
-            }            
+            }
             else
             {
                 Alert.ShowInTop("您没有权限修改别单位信息！", MessageBoxIcon.Warning);
@@ -229,11 +234,11 @@ namespace FineUIPro.Web.SysManage
                 content += "【本单位】，不能删除！";
             }
 
-            var getpUnits= from x in Funs.DB.Project_ProjectUnit where x.UnitId == id select x;
+            var getpUnits = from x in Funs.DB.Project_ProjectUnit where x.UnitId == id select x;
             foreach (var item in getpUnits)
             {
                 var getprojectiname = ProjectService.GetProjectNameByProjectId(item.ProjectId);
-                content += getprojectiname+ "【项目单位】已使用！";
+                content += getprojectiname + "【项目单位】已使用！";
             }
             var getSpecialEquipment = from x in Funs.DB.Comprehensive_SpecialEquipment where x.UnitId == id select x;
             foreach (var item in getSpecialEquipment)
@@ -259,7 +264,7 @@ namespace FineUIPro.Web.SysManage
             foreach (var item in getSafetyOrganization)
             {
                 var getprojectiname = ProjectService.GetProjectNameByProjectId(item.ProjectId);
-                content += getprojectiname + "【安全组织机构】" + item.Names+ "已使用！";
+                content += getprojectiname + "【安全组织机构】" + item.Names + "已使用！";
             }
             var getRectifyNotices = from x in Funs.DB.Check_RectifyNotices where x.UnitId == id select x;
             foreach (var item in getRectifyNotices)
@@ -331,7 +336,8 @@ namespace FineUIPro.Web.SysManage
             }
             var getMonthReport = from x in Funs.DB.SitePerson_MonthReportDetail
                                  join y in Funs.DB.SitePerson_MonthReport on x.MonthReportId equals y.MonthReportId
-                                 where x.UnitId == id select y;
+                                 where x.UnitId == id
+                                 select y;
             foreach (var item in getMonthReport)
             {
                 var getprojectiname = ProjectService.GetProjectNameByProjectId(item.ProjectId);
@@ -339,26 +345,27 @@ namespace FineUIPro.Web.SysManage
             }
 
             var getCheckDay = from x in Funs.DB.Check_CheckDayDetail
-                                 join y in Funs.DB.Check_CheckDay on x.CheckDayId equals y.CheckDayId
-                              where x.UnitId == id select y;
+                              join y in Funs.DB.Check_CheckDay on x.CheckDayId equals y.CheckDayId
+                              where x.UnitId == id
+                              select y;
             foreach (var item in getCheckDay)
             {
                 var getprojectiname = ProjectService.GetProjectNameByProjectId(item.ProjectId);
                 content += getprojectiname + "【日常巡检】" + item.CheckDayCode + "已使用！";
             }
             var getCheckColligation = from x in Funs.DB.Check_CheckColligationDetail
-                              join y in Funs.DB.Check_CheckColligation on x.CheckColligationId equals y.CheckColligationId
-                              where x.UnitId == id
-                              select y;
+                                      join y in Funs.DB.Check_CheckColligation on x.CheckColligationId equals y.CheckColligationId
+                                      where x.UnitId == id
+                                      select y;
             foreach (var item in getCheckColligation)
             {
                 var getprojectiname = ProjectService.GetProjectNameByProjectId(item.ProjectId);
                 content += getprojectiname + "【综合大检查】" + item.CheckColligationCode + "已使用！";
             }
             var getCheckSpecial = from x in Funs.DB.Check_CheckSpecialDetail
-                                      join y in Funs.DB.Check_CheckSpecial on x.CheckSpecialId equals y.CheckSpecialId
-                                      where x.UnitId == id
-                                      select y;
+                                  join y in Funs.DB.Check_CheckSpecial on x.CheckSpecialId equals y.CheckSpecialId
+                                  where x.UnitId == id
+                                  select y;
             foreach (var item in getCheckSpecial)
             {
                 var getprojectiname = ProjectService.GetProjectNameByProjectId(item.ProjectId);
@@ -408,7 +415,7 @@ namespace FineUIPro.Web.SysManage
                 content += getprojectiname + "【超过一定规模的危大施工方案】" + item.PlanCode + "已使用！";
             }
             var getUsers = from x in Funs.DB.Sys_User where x.UnitId == id select x;
-           foreach(var item in getUsers)
+            foreach (var item in getUsers)
             {
                 content += "【用户信息】" + item.UserName + "已使用！";
             }
@@ -424,7 +431,7 @@ namespace FineUIPro.Web.SysManage
         /// <param name="e"></param>
         protected void btnImport_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("UnitIn.aspx","","导入 - ")));
+            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("UnitIn.aspx", "", "导入 - ")));
         }
 
         /// <summary>
@@ -437,5 +444,19 @@ namespace FineUIPro.Web.SysManage
             BindGrid();
         }
         #endregion
+
+        #region 数据清理
+
+        /// <summary>
+        /// 数据清理
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDataBase_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window2.GetShowReference($"UnitCleanupMerge.aspx", "单位清理合并"));
+        }
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/SysManage/Unit.aspx.designer.cs b/SGGL/FineUIPro.Web/SysManage/Unit.aspx.designer.cs
index 84c19cd3..0707019a 100644
--- a/SGGL/FineUIPro.Web/SysManage/Unit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/SysManage/Unit.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.SysManage {
-    
-    
-    public partial class Unit {
-        
+namespace FineUIPro.Web.SysManage
+{
+
+
+    public partial class Unit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtUnitName 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUnitName;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -92,7 +94,16 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
-        
+
+        /// <summary>
+        /// btnDataBase 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDataBase;
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// WindowSubUnit 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowSubUnit;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.SysManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/SysManage/UnitCleanupMerge.aspx b/SGGL/FineUIPro.Web/SysManage/UnitCleanupMerge.aspx
new file mode 100644
index 00000000..6831ad8e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/SysManage/UnitCleanupMerge.aspx
@@ -0,0 +1,95 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="UnitCleanupMerge.aspx.cs" Inherits="FineUIPro.Web.SysManage.UnitCleanupMerge" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>单位清理合并</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" LabelWidth="140px"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpUnitId" runat="server" Label="合并后单位" EnableEdit="true" ForceSelection="false" Required="true" ShowRedStar="true">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpMergeUnitId" runat="server" Label="需要合并的单位" EnableEdit="true" ForceSelection="false" Required="true" ShowRedStar="true">
+                        </f:DropDownList>
+                    </Items>
+
+                    <%--<Items>
+                        <f:DropDownBox runat="server" ID="drpMergeUnitBox" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Label="需要合并的单位" EmptyText="请从下拉表格中选择需要合并的单位" DataControlID="Grid2"
+                            EnableMultiSelect="false" MatchFieldWidth="false" Required="true" ShowRedStar="true">
+                            <PopPanel>
+                                <f:Panel ID="Panel1" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true"
+                                    ShowBorder="true" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+                                    <Items>
+                                        <f:Form ID="Form2" ShowBorder="False" ShowHeader="False" runat="server">
+                                            <Rows>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:TwinTriggerBox Width="200px" runat="server" EmptyText="按单位代码、名称查找" ShowLabel="false" ID="ttbPmpProCodeSearch"
+                                                            ShowTrigger1="false" OnTrigger1Click="ttbPmpProCodeSearch_Trigger1Click" OnTrigger2Click="ttbPmpProCodeSearch_Trigger2Click" Trigger1Icon="Clear" Trigger2Icon="Search">
+                                                        </f:TwinTriggerBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                            </Rows>
+                                        </f:Form>
+                                        <f:Grid ID="Grid2" BoxFlex="1" DataKeyNames="Name"
+                                            DataIDField="Name" DataTextField="Name" EnableMultiSelect="false"
+                                            PageSize="50" ShowBorder="true" ShowHeader="false"
+                                            AllowPaging="true" IsDatabasePaging="true" OnPageIndexChange="Grid2_PageIndexChange" runat="server" EnableCheckBoxSelect="true"
+                                            AllowSorting="false" SortField="StNum" SortDirection="DESC"
+                                            OnSort="Grid2_Sort">
+                                            <Columns>
+                                                <f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                                    EnableLock="true" Locked="true">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid2.PageIndex * Grid2.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                                    </ItemTemplate>
+                                                </f:TemplateField>
+                                                <f:BoundField Width="80px" DataField="StNum" HeaderText="项目编号" />
+                                                <f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="Name" HeaderText="项目名称" />
+                                                <f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="Address" HeaderText="地址" />
+                                            </Columns>
+                                        </f:Grid>
+                                    </Items>
+                                </f:Panel>
+                            </PopPanel>
+                        </f:DropDownBox>
+                    </Items>--%>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtRemark" runat="server" Label="备注说明" Height="120px" EmptyText="100字内">
+                        </f:TextArea>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Label ID="Label4" runat="server" Text="请谨慎操作，合并后数据无法恢复！！！"></f:Label>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1" Hidden="true"
+                            OnClick="btnSave_Click" ToolTip="开始清理">
+                        </f:Button>
+                        <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/SysManage/UnitCleanupMerge.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UnitCleanupMerge.aspx.cs
new file mode 100644
index 00000000..3c26c1af
--- /dev/null
+++ b/SGGL/FineUIPro.Web/SysManage/UnitCleanupMerge.aspx.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Linq;
+using System.Web.UI.WebControls;
+using BLL;
+using NPOI.Util;
+
+namespace FineUIPro.Web.SysManage
+{
+    public partial class UnitCleanupMerge : PageBase
+    {
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                ////权限按钮方法
+                this.GetButtonPower();
+                //
+                BLL.UnitService.InitAllUnitDownList(this.drpUnitId, false);
+                BLL.UnitService.InitAllUnitDownList(this.drpMergeUnitId, false);
+            }
+        }
+
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (this.drpUnitId.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("请选择合并后单位！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.drpMergeUnitId.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("需要合并的单位！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            string unitId = this.drpUnitId.SelectedValue;
+            string unitMergeId = this.drpMergeUnitId.SelectedValue;
+
+            string txtRemark = this.txtRemark.Text.Trim();
+            //BLL.LogService.AddSys_Log(this.CurrUser, unit.UnitCode, unit.UnitId, BLL.Const.UnitMenuId, Const.BtnAdd);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+        }
+
+        #region 获取按钮权限
+
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.fuweiId || this.CurrUser.UserId == Const.shenyinhangId)
+            {//系统管理员、合肥诺必达、付伟、申银行
+                this.btnSave.Hidden = false;
+            }
+        }
+
+        #endregion        
+
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/SysManage/UnitCleanupMerge.aspx.designer.cs b/SGGL/FineUIPro.Web/SysManage/UnitCleanupMerge.aspx.designer.cs
new file mode 100644
index 00000000..fbaa39fc
--- /dev/null
+++ b/SGGL/FineUIPro.Web/SysManage/UnitCleanupMerge.aspx.designer.cs
@@ -0,0 +1,107 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.SysManage
+{
+
+
+    public partial class UnitCleanupMerge
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// drpUnitId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitId;
+
+        /// <summary>
+        /// drpMergeUnitId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpMergeUnitId;
+
+        /// <summary>
+        /// txtRemark 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label4;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
index 3046cefa..0c4008ef 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -93,4 +93,10 @@
 <TreeNode id="F2133BD6-C786-407A-AD6F-3EEF613229A8" Text="施工管理绩效数据" NavigateUrl="ZHGL/Performance/PerformanceAllData.aspx"></TreeNode>
 <TreeNode id="53D8CED2-9AA7-43EA-B27D-EA10A06DF713" Text="开车人员绩效管理" NavigateUrl=""><TreeNode id="383290E0-60AE-4D16-8B5E-3899B85EC2ED" Text="开车绩效评分标准" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceStandard.aspx"></TreeNode>
 </TreeNode>
+<TreeNode id="E64D67C1-BA8E-4329-AFEE-23F9BC45CDDD" Text="现场质量数据" NavigateUrl=""><TreeNode id="51EA8258-C81D-4C33-B939-769450979D14" Text="质量基本信息" NavigateUrl="ZHGL/CQMSData/CQMSBasicData.aspx"></TreeNode>
+<TreeNode id="6E1F4EF5-47CA-4DF8-B561-3C98DBD88EA2" Text="焊接管理" NavigateUrl="ZHGL/CQMSData/WeldingData.aspx"></TreeNode>
+<TreeNode id="C9076E93-29DB-419C-8902-789163C6554A" Text="现场质量检查" NavigateUrl="ZHGL/CQMSData/CQMSCheckData.aspx"></TreeNode>
+<TreeNode id="64FED633-2436-426B-A230-7C0038E44AD4" Text="设备材料计量器具质量文件上报" NavigateUrl="ZHGL/CQMSData/CQMSEquipAndMachineData.aspx"></TreeNode>
+<TreeNode id="12E7E1FD-6D8D-41D8-801C-E15B68805213" Text="共检点明细" NavigateUrl="ZHGL/CQMSData/CQMSNoticeDetailsData.aspx"></TreeNode>
+</TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
index fb16822d..23c72aef 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
@@ -1642,7 +1642,24 @@ left join (select PlanNum,RealNum,QuantityListId from JDGL_QuantityCompletion wh
                         GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0
                         and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0)
                         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 ) 
+                        ORDER BY DataTime DESC ";
                     List<SqlParameter> listStr = new List<SqlParameter>();
 
                     listStr.Add(new SqlParameter("@userId", CurrUser.UserId));
@@ -1707,7 +1724,24 @@ left join (select PlanNum,RealNum,QuantityListId from JDGL_QuantityCompletion wh
                 GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0
                 and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0)
                 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 ) 
+                ORDER BY DataTime DESC ";
                     List<SqlParameter> listStr = new List<SqlParameter>();
 
                     listStr.Add(new SqlParameter("@userId", CurrUser.UserId));