From 42f0783efa7ddaca12344847f6de56ba1eb80f94 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 15 May 2024 16:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SGGLDB_WH_2024-05-15-gaofei.sql           | 350 ++++++++++++++++++
 .../SitePerson_MonthReportService.cs          |  42 +++
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |   8 +
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user  |   2 +-
 SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx   | 224 +++++++----
 .../FineUIPro.Web/JDGL/Check/WeekPlan.aspx.cs |  69 +++-
 .../JDGL/Check/WeekPlan.aspx.designer.cs      |  81 +++-
 .../JDGL/Check/WeekPlanEdit.aspx.cs           |   7 +-
 .../JDGL/Check/WeekPlanStatisc.aspx           |  85 +++++
 .../JDGL/Check/WeekPlanStatisc.aspx.cs        | 320 ++++++++++++++++
 .../Check/WeekPlanStatisc.aspx.designer.cs    | 150 ++++++++
 SGGL/FineUIPro.Web/Web.config                 |   4 +-
 .../FineUIPro.Web/common/mainProject2.aspx.cs |   6 +-
 SGGL/WebAPI/WebAPI.csproj.user                |   2 +-
 14 files changed, 1242 insertions(+), 108 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-05-15-gaofei.sql
 create mode 100644 SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx
 create mode 100644 SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx.designer.cs

diff --git a/DataBase/版本日志/SGGLDB_WH_2024-05-15-gaofei.sql b/DataBase/版本日志/SGGLDB_WH_2024-05-15-gaofei.sql
new file mode 100644
index 00000000..92fdde3f
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-05-15-gaofei.sql
@@ -0,0 +1,350 @@
+
+--��ȡ��ǰ�˴�������
+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
+	,register.RegisterDef 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
+	,register.RegisterDef 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 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
+	,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
+	,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.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.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.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.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.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.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.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.IsOnSite=1 and
+Machine.NextTestDate<getdate()
+UNION ALL
+SELECT 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 MonthPlan.MonthPlanId 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/MonthPlanEdit.aspx?ToDo=ToDo' 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=@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 WeekPlan.WeekPlanId 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=@userId and (WeekPlan.IsOK is null or WeekPlan.IsOK=0) and dateadd(day,2,WeekPlan.PlanDate)>getdate()
+
+ORDER BY DataTime DESC
+END
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+GO
+
+
diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportService.cs
index f68c1733..700ef511 100644
--- a/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportService.cs
+++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_MonthReportService.cs
@@ -152,6 +152,48 @@ namespace BLL
             return reports;
         }
 
+        /// <summary>
+        ///  获取出入记录人工时-月报
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.SitePerson_MonthReport> getAllMonthReports(string projectId, DateTime? sDate)
+        {
+            Model.SGGLDB db = Funs.DB;
+            List<Model.SitePerson_MonthReport> reports = new List<Model.SitePerson_MonthReport>();
+            var getAllPersonInOutList = from x in db.SitePerson_PersonInOutNumber
+                                        where x.ProjectId == projectId
+                                        select x;
+            if (getAllPersonInOutList.Count() > 0)
+            {
+                var getInMonths = (from x in getAllPersonInOutList select new { x.InOutDate.Year, x.InOutDate.Month }).Distinct();
+                if (sDate.HasValue)
+                {
+                    getInMonths = getInMonths.Where(x => x.Year <= sDate.Value.Year && x.Month <= sDate.Value.Month);
+                }
+                foreach (var item in getInMonths)
+                {
+                    DateTime compileDate = Funs.GetNewDateTimeOrNow(item.Year.ToString() + "-" + item.Month.ToString());
+                    var getNow = getAllPersonInOutList.Where(x => x.InOutDate.Year == compileDate.Year && x.InOutDate.Month == compileDate.Month).Max(x => x.WorkHours);
+                    if (getNow.HasValue)
+                    {
+                        Model.SitePerson_MonthReport reportItem = new Model.SitePerson_MonthReport
+                        {
+                            MonthReportId = SQLHelper.GetNewID(),
+                            ProjectId = projectId,
+                            CompileDate = Funs.GetNewDateTime(item.Year.ToString() + "-" + item.Month.ToString()),
+                            TotalPersonWorkTime = getNow,
+                        };
+                        DateTime upDate = compileDate.AddMonths(-1);
+                        var getMax = getAllPersonInOutList.Where(x => x.InOutDate.Year == upDate.Year && x.InOutDate.Month == upDate.Month).Max(x => x.WorkHours) ?? 0;
+                        reportItem.DayWorkTime = (getNow ?? 0) - getMax;
+                        reports.Add(reportItem);
+                    }
+
+                }
+            }
+            return reports;
+        }
+
         /// <summary>
         ///  获取出入记录人工时-月报累计
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 9a063def..1e2448d5 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1408,6 +1408,7 @@
     <Content Include="JDGL\Check\WeekPlan.aspx" />
     <Content Include="JDGL\Check\WeekPlanEdit.aspx" />
     <Content Include="JDGL\Check\WeekPlanIn.aspx" />
+    <Content Include="JDGL\Check\WeekPlanStatisc.aspx" />
     <Content Include="JDGL\CostAnalysis\EarnedValueCurve.aspx" />
     <Content Include="JDGL\CostAnalysis\JDReport.aspx" />
     <Content Include="JDGL\CostAnalysis\PlanAdjust.aspx" />
@@ -13962,6 +13963,13 @@
     <Compile Include="JDGL\Check\WeekPlanIn.aspx.designer.cs">
       <DependentUpon>WeekPlanIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="JDGL\Check\WeekPlanStatisc.aspx.cs">
+      <DependentUpon>WeekPlanStatisc.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JDGL\Check\WeekPlanStatisc.aspx.designer.cs">
+      <DependentUpon>WeekPlanStatisc.aspx</DependentUpon>
+    </Compile>
     <Compile Include="JDGL\CostAnalysis\EarnedValueCurve.aspx.cs">
       <DependentUpon>EarnedValueCurve.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index b8cc84be..b52b49a8 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx
index f1387b45..698eedbc 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx
+++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx
@@ -12,85 +12,143 @@
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                    <Items>
+                        <f:DropDownList runat="server" ID="drpWeekNo" Label="周号" LabelAlign="Right" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="drpWeekNo_SelectedIndexChanged"></f:DropDownList>
+                        <f:DatePicker ID="txtStartDate" runat="server" Readonly="true" Label="开始日期" LabelAlign="Right">
+                        </f:DatePicker>
+                        <f:DatePicker ID="txtEndDate" runat="server" Readonly="true" Label="结束日期" LabelAlign="Right">
+                        </f:DatePicker>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" Hidden="true"
+                            OnClick="btnSave_Click">
+                        </f:Button>
+                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                        <f:Button ID="BtnAnalyse" ToolTip="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click">
+                        </f:Button>
+                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
+                            Hidden="true">
+                        </f:Button>
+                        <f:Button ID="btnModify" ToolTip="修改" Icon="Pencil" OnClick="btnModify_Click" runat="server"
+                            Hidden="true">
+                        </f:Button>
+                        <f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationGet" runat="server"
+                            OnClick="btnImport_Click">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
             <Items>
-
-                <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="周进度计划" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="WeekPlanId" AllowCellEditing="true" ForceFit="true"
-                    ClicksToEdit="1" DataIDField="WeekPlanId" AllowSorting="true" SortField="SortIndex"
-                    SortDirection="ASC" EnableColumnLines="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="1000"
-                     AllowFilters="true" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" ShowBorder="true"
+                    TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
+                    <Tabs>
+                        <f:Tab ID="Tab1" Title="本周计划完成情况" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
+                            TitleToolTip="本周计划完成情况">
                             <Items>
-                                <f:DropDownList runat="server" ID="drpWeekNo" Label="周号" LabelAlign="Right" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="drpWeekNo_SelectedIndexChanged"></f:DropDownList>
-                                <f:DatePicker ID="txtStartDate" runat="server" Readonly="true" Label="开始日期" LabelAlign="Right"
-                                                >
-                                            </f:DatePicker>
-                    <f:DatePicker ID="txtEndDate" runat="server" Readonly="true" Label="结束日期" LabelAlign="Right"
-                                                >
-                                            </f:DatePicker>
-                                <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" Hidden="true"
-                                    OnClick="btnSave_Click">
-                                </f:Button>
-                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="BtnAnalyse" ToolTip="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click">
-                            </f:Button>
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
-                                    Hidden="true">
-                                </f:Button>
-                                <f:Button ID="btnModify" ToolTip="修改" Icon="Pencil" OnClick="btnModify_Click" runat="server"
-                                    Hidden="true">
-                                </f:Button>
-                                <f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationGet" runat="server"
-                                            OnClick="btnImport_Click">
-                                        </f:Button>
+                                <f:Grid ID="Grid2" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false"
+                                    DataKeyNames="WeekPlanId" DataIDField="WeekPlanId" EnableColumnLines="true" ForceFit="true" AllowCellEditing="true" ClicksToEdit="1">
+                                    <Columns>
+                                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:Label ID="Label1" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:RenderField Width="100px" ColumnID="UnitWorkName" DataField="UnitWorkName"
+                                            SortField="UnitWorkName" FieldType="String" HeaderText="工序/单位工程" TextAlign="center"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="80px" ColumnID="ProfessionalName" DataField="ProfessionalName"
+                                            SortField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="center"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="250px" ColumnID="WorkContent" DataField="WorkContent"
+                                            SortField="WorkContent" FieldType="String" HeaderText="工作项" TextAlign="Center"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="150px" ColumnID="UnitName" DataField="UnitName"
+                                            SortField="UnitName" FieldType="String" HeaderText="责任单位" TextAlign="center"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="DutyPersonName" DataField="DutyPersonName"
+                                            SortField="DutyPersonName" FieldType="String" HeaderText="五环责任人" TextAlign="Center"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="95px" ColumnID="PlanDate" DataField="PlanDate" SortField="PlanDate"
+                                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="计划完成时间" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="IsOKStr" DataField="IsOKStr"
+                                            SortField="IsOKStr" FieldType="String" HeaderText="完成状态" TextAlign="Center"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="Remark" DataField="Remark"
+                                            SortField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                    </Columns>
+                                    <Listeners>
+                                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu2" />
+                                    </Listeners>
+                                </f:Grid>
                             </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="100px" ColumnID="UnitWorkName" DataField="UnitWorkName"
-                            SortField="UnitWorkName" FieldType="String" HeaderText="工序/单位工程" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="80px" ColumnID="ProfessionalName" DataField="ProfessionalName"
-                            SortField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="250px" ColumnID="WorkContent" DataField="WorkContent"
-                            SortField="WorkContent" FieldType="String" HeaderText="工作项" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="UnitName" DataField="UnitName"
-                            SortField="UnitName" FieldType="String" HeaderText="责任单位" TextAlign="center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="DutyPersonName" DataField="DutyPersonName"
-                            SortField="DutyPersonName" FieldType="String" HeaderText="五环责任人" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="95px" ColumnID="PlanDate" DataField="PlanDate" SortField="PlanDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="计划完成时间" TextAlign="Center" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="IsOKStr" DataField="IsOKStr"
-                            SortField="IsOKStr" FieldType="String" HeaderText="完成状态" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="Remark" DataField="Remark"
-                            SortField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                </f:Grid>
+                        </f:Tab>
+                        <f:Tab ID="Tab2" Title="下周计划" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" TitleToolTip="下周计划"
+                            runat="server">
+                            <Items>
+                                <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="周进度计划" EnableCollapse="true"
+                                    runat="server" BoxFlex="1" DataKeyNames="WeekPlanId" AllowCellEditing="true" ForceFit="true"
+                                    ClicksToEdit="1" DataIDField="WeekPlanId" AllowSorting="true" SortField="SortIndex"
+                                    SortDirection="ASC" EnableColumnLines="true"
+                                    PageSize="1000"
+                                    AllowFilters="true" EnableTextSelection="True">
+
+                                    <Columns>
+                                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                            EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:RenderField Width="100px" ColumnID="UnitWorkName" DataField="UnitWorkName"
+                                            SortField="UnitWorkName" FieldType="String" HeaderText="工序/单位工程" TextAlign="center"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="80px" ColumnID="ProfessionalName" DataField="ProfessionalName"
+                                            SortField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="center"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="250px" ColumnID="WorkContent" DataField="WorkContent"
+                                            SortField="WorkContent" FieldType="String" HeaderText="工作项" TextAlign="Center"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="150px" ColumnID="UnitName" DataField="UnitName"
+                                            SortField="UnitName" FieldType="String" HeaderText="责任单位" TextAlign="center"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="DutyPersonName" DataField="DutyPersonName"
+                                            SortField="DutyPersonName" FieldType="String" HeaderText="五环责任人" TextAlign="Center"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="95px" ColumnID="PlanDate" DataField="PlanDate" SortField="PlanDate"
+                                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="计划完成时间" TextAlign="Center" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="IsOKStr" DataField="IsOKStr"
+                                            SortField="IsOKStr" FieldType="String" HeaderText="完成状态" TextAlign="Center"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="Remark" DataField="Remark"
+                                            SortField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                    </Columns>
+                                    <Listeners>
+                                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                    </Listeners>
+                                </f:Grid>
+                            </Items>
+                        </f:Tab>
+                    </Tabs>
+                </f:TabStrip>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="录入" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@@ -104,15 +162,27 @@
                 </f:MenuButton>
             </Items>
         </f:Menu>
+        <f:Menu ID="Menu2" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuDel2" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
+                    OnClick="btnMenuDel2_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
-
+              var menuID2 = '<%= Menu2.ClientID %>';
         // 返回false，来阻止浏览器右键菜单
         function onRowContextMenu(event, rowId) {
             F(menuID).show();  //showAt(event.pageX, event.pageY);
             return false;
         }
+
+          function onRowContextMenu2(event, rowId) {
+            F(menuID2).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
     </script>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.cs
index 9a1fca1c..392a1650 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.cs
@@ -62,6 +62,7 @@ namespace FineUIPro.Web.JDGL.Check
                     this.btnNew.Hidden = false;
                     this.btnModify.Hidden = false;
                     this.btnMenuDel.Hidden = false;
+                    this.btnMenuDel2.Hidden = false;
                 }
             }
         }
@@ -78,6 +79,7 @@ namespace FineUIPro.Web.JDGL.Check
         /// </summary>
         private void BindGrid()
         {
+            string weekNo2 = string.Empty;
             var weekPlan = Funs.DB.JDGL_WeekPlan.FirstOrDefault(x => x.WeekNo == this.drpWeekNo.SelectedValue);
             if (weekPlan != null)
             {
@@ -89,6 +91,11 @@ namespace FineUIPro.Web.JDGL.Check
                 {
                     this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekPlan.EndDate);
                 }
+                var lastWeekPlan = (from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.StartDate < weekPlan.StartDate orderby x.StartDate descending select x).FirstOrDefault();
+                if (lastWeekPlan != null)
+                {
+                    weekNo2 = lastWeekPlan.WeekNo;
+                }
             }
             else
             {
@@ -116,6 +123,24 @@ where mp.ProjectId=@ProjectId and mp.WeekNo=@WeekNo order by mp.SortIndex";
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
             Grid1.DataBind();
+
+            string strSql2 = @"select mp.*,u.UnitName,us.UserName as DutyPersonName,uw.UnitWorkName,cn.ProfessionalName,case mp.IsOK when 1 then '已完成' when 0 then '未完成' else '' end as IsOKStr from [dbo].[JDGL_WeekPlan] mp
+left join Base_Unit u on u.UnitId=mp.UnitId
+left join Sys_User us on us.UserId=mp.DutyPerson
+left join WBS_UnitWork uw on uw.UnitWorkId=mp.UnitWork
+left join Base_CNProfessional cn on cn.CNProfessionalId=mp.Major
+where mp.ProjectId=@ProjectId2 and mp.WeekNo=@WeekNo2 order by mp.SortIndex";
+            List<SqlParameter> listStr2 = new List<SqlParameter>();
+            listStr2.Add(new SqlParameter("@ProjectId2", this.CurrUser.LoginProjectId));
+
+            listStr2.Add(new SqlParameter("@WeekNo2", weekNo2));
+            SqlParameter[] parameter2 = listStr2.ToArray();
+            DataTable tb2 = SQLHelper.GetDataTableRunText(strSql2, parameter2);
+            Grid2.RecordCount = tb2.Rows.Count;
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table2 = this.GetPagedDataTable(Grid2, tb2);
+            Grid2.DataSource = table2;
+            Grid2.DataBind();
         }
 
         #region  月份选择事件
@@ -172,22 +197,36 @@ where mp.ProjectId=@ProjectId and mp.WeekNo=@WeekNo order by mp.SortIndex";
                     string rowID = Grid1.DataKeys[rowIndex][0].ToString();
                     BLL.WeekPlanService.DeleteWeekPlanByWeekPlanId(rowID);
                 }
-                var weekPlans = (from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == this.CurrUser.LoginProjectId orderby x.StartDate descending select x.WeekNo).Distinct().OrderByDescending(x => x).ToList();
-                if (weekPlans.Count() > 0)
+                //var weekPlans = (from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == this.CurrUser.LoginProjectId orderby x.StartDate descending select x.WeekNo).Distinct().OrderByDescending(x => x).ToList();
+                //if (weekPlans.Count() > 0)
+                //{
+                //    ListItem[] list = new ListItem[weekPlans.Count()];
+                //    for (int i = 0; i < weekPlans.Count(); i++)
+                //    {
+                //        list[i] = new ListItem(weekPlans[i], weekPlans[i]);
+                //    }
+                //    this.drpWeekNo.DataSource = list;
+                //    this.drpWeekNo.DataBind();
+                //    this.drpWeekNo.SelectedValue = list[0].Value;
+                //}
+                //else
+                //{
+                //    this.drpWeekNo.DataSource = null;
+                //    this.drpWeekNo.DataBind();
+                //}
+                BindGrid();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
+
+        protected void btnMenuDel2_Click(object sender, EventArgs e)
+        {
+            if (Grid2.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid2.SelectedRowIndexArray)
                 {
-                    ListItem[] list = new ListItem[weekPlans.Count()];
-                    for (int i = 0; i < weekPlans.Count(); i++)
-                    {
-                        list[i] = new ListItem(weekPlans[i], weekPlans[i]);
-                    }
-                    this.drpWeekNo.DataSource = list;
-                    this.drpWeekNo.DataBind();
-                    this.drpWeekNo.SelectedValue = list[0].Value;
-                }
-                else
-                {
-                    this.drpWeekNo.DataSource = null;
-                    this.drpWeekNo.DataBind();
+                    string rowID = Grid2.DataKeys[rowIndex][0].ToString();
+                    BLL.WeekPlanService.DeleteWeekPlanByWeekPlanId(rowID);
                 }
                 BindGrid();
                 ShowNotify("删除数据成功!", MessageBoxIcon.Success);
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.designer.cs
index d2ac62ae..e6f63a39 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.designer.cs
@@ -39,15 +39,6 @@ namespace FineUIPro.Web.JDGL.Check {
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
         
-        /// <summary>
-        /// Grid1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Grid Grid1;
-        
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -129,6 +120,60 @@ namespace FineUIPro.Web.JDGL.Check {
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
         
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+        
+        /// <summary>
+        /// Tab1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab1;
+        
+        /// <summary>
+        /// Grid2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid2;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+        
+        /// <summary>
+        /// Tab2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab2;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -164,5 +209,23 @@ namespace FineUIPro.Web.JDGL.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuDel;
+        
+        /// <summary>
+        /// Menu2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu2;
+        
+        /// <summary>
+        /// btnMenuDel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDel2;
     }
 }
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx.cs
index a1564936..c470519b 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanEdit.aspx.cs
@@ -50,6 +50,11 @@ namespace FineUIPro.Web.JDGL.Check
                     {
                         this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekPlan.EndDate);
                     }
+                    var lastWeekPlan = (from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.StartDate < weekPlan.StartDate orderby x.StartDate descending select x).FirstOrDefault();
+                    if (lastWeekPlan != null)
+                    {
+                        BindGrid2(lastWeekPlan.WeekNo);
+                    }
                 }
                 else
                 {
@@ -220,7 +225,7 @@ namespace FineUIPro.Web.JDGL.Check
             foreach (JObject mergedRow in Grid2.GetMergedData())
             {
                 JObject values = mergedRow.Value<JObject>("values");
-                int a= mergedRow.Value<int>("index");
+                int a = mergedRow.Value<int>("index");
                 Model.JDGL_WeekPlan ql = BLL.WeekPlanService.GetWeekPlanById(Grid2.Rows[a].RowID);
                 if (!string.IsNullOrEmpty(values.Value<string>("IsOK")))
                 {
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx
new file mode 100644
index 00000000..6075d454
--- /dev/null
+++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx
@@ -0,0 +1,85 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeekPlanStatisc.aspx.cs" Inherits="FineUIPro.Web.JDGL.Check.WeekPlanStatisc" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" Title="月度计划情况统计" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="true" SortDirection="DESC" BoxFlex="1" AllowCellEditing="true"
+                    DataKeyNames="DesignId" EnableColumnLines="true" ClicksToEdit="2" AllowSorting="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true"
+                    AllowFilters="true" EnableTextSelection="True" >
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList runat="server" ID="drpWeekNo" Label="周号" LabelAlign="Right" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="ckType_SelectedIndexChanged"></f:DropDownList>
+                        <f:DatePicker ID="txtStartDate" runat="server" Readonly="true" Label="开始日期" LabelAlign="Right">
+                        </f:DatePicker>
+                        <f:DatePicker ID="txtEndDate" runat="server" Readonly="true" Label="结束日期" LabelAlign="Right">
+                        </f:DatePicker>
+                                
+                                <f:RadioButtonList runat="server" ID="ckType" AutoPostBack="True" Width="300px"
+                                    OnSelectedIndexChanged="ckType_SelectedIndexChanged">
+                                    <f:RadioItem Value="1" Text="按责任单位" Selected="True"></f:RadioItem>
+                                    <f:RadioItem Value="2" Text="按五环责任人" ></f:RadioItem>
+                                </f:RadioButtonList>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="查询" Hidden="true"
+                                    EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
+                                </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Hidden="true"
+                                Icon="TableGo" EnableAjax="false" DisableControlBeforePostBack="false">
+                            </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="200px" ColumnID="WorkContent" DataField="WorkContent"
+                            FieldType="String" HeaderText="责任单位" TextAlign="Center"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="UnitId" DataField="UnitId"
+                            FieldType="String" HeaderText="计划项总数" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="110px" ColumnID="DutyPerson" DataField="DutyPerson"
+                            FieldType="String" HeaderText="累计完成总数" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="80px" ColumnID="Remark" DataField="Remark"
+                            FieldType="String" HeaderText="完成比例" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                    </Columns>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server"> 
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="所有行" Value="100000" />
+                        </f:DropDownList>
+                        <f:ToolbarFill runat="server">
+                        </f:ToolbarFill>
+
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx.cs
new file mode 100644
index 00000000..c9bf0b46
--- /dev/null
+++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx.cs
@@ -0,0 +1,320 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using BLL;
+using AspNet = System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.JDGL.Check
+{
+    public partial class WeekPlanStatisc : PageBase
+    {
+        private static List<Model.JDGL_WeekPlan> StatisticsList = new List<Model.JDGL_WeekPlan>();
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.drpWeekNo.DataTextField = "Text";
+                this.drpWeekNo.DataValueField = "Value";
+                var weekPlans = (from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == this.CurrUser.LoginProjectId orderby x.StartDate descending select x.WeekNo).Distinct().OrderByDescending(x => x).ToList();
+                if (weekPlans.Count() > 0)
+                {
+                    ListItem[] list = new ListItem[weekPlans.Count()];
+                    for (int i = 0; i < weekPlans.Count(); i++)
+                    {
+                        list[i] = new ListItem(weekPlans[i], weekPlans[i]);
+                    }
+                    this.drpWeekNo.DataSource = list;
+                    this.drpWeekNo.DataBind();
+                    this.drpWeekNo.SelectedValue = list[0].Value;
+                }
+                else
+                {
+                    this.drpWeekNo.DataSource = null;
+                    this.drpWeekNo.DataBind();
+                }
+                BindStatisc();
+            }
+        }
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(this.drpWeekNo.SelectedValue))
+            {
+                Alert.ShowInTop("周号不能为空！", MessageBoxIcon.Warning);
+                return;
+            }
+            BindStatisc();
+        }
+        #region 绑定GridView
+        /// <summary>
+        /// 绑定
+        /// </summary>
+        /// <param name="cNProfessionalId"></param>
+        public void BindStatisc()
+        {
+            Model.SGGLDB db = Funs.DB;
+            string weekNo2 = string.Empty;
+            var weekPlan = db.JDGL_WeekPlan.FirstOrDefault(x => x.WeekNo == this.drpWeekNo.SelectedValue);
+            if (weekPlan != null)
+            {
+                if (weekPlan.StartDate != null)
+                {
+                    this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", weekPlan.StartDate);
+                }
+                if (weekPlan.EndDate != null)
+                {
+                    this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekPlan.EndDate);
+                }
+                var lastWeekPlan = (from x in db.JDGL_WeekPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.StartDate < weekPlan.StartDate orderby x.StartDate descending select x).FirstOrDefault();
+                if (lastWeekPlan != null)
+                {
+                    weekNo2 = lastWeekPlan.WeekNo;
+                }
+            }
+            else
+            {
+                this.txtStartDate.Text = string.Empty;
+                this.txtEndDate.Text = string.Empty;
+            }
+            StatisticsList = new List<Model.JDGL_WeekPlan>();
+            int i = 1;
+            //所有集合
+            var totalList = from x in db.JDGL_WeekPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.WeekNo == weekNo2 select x;
+            if (this.ckType.SelectedValue == "1")  //按责任单位
+            {
+                var pUnit = from x in db.Project_ProjectUnit
+                            join y in db.Base_Unit on x.UnitId equals y.UnitId
+                            where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2
+                            orderby y.UnitCode
+                            select y;
+                foreach (var item in pUnit)
+                {
+                    //当期集合
+                    var list = totalList.Where(x => x.UnitId == item.UnitId);
+                    Model.JDGL_WeekPlan JDGL_WeekPlan = new Model.JDGL_WeekPlan();
+                    JDGL_WeekPlan.WorkContent = item.UnitName;
+                    int a = list.Count();
+                    int b = list.Count(x => x.IsOK == true);
+                    JDGL_WeekPlan.UnitId = a.ToString();
+                    JDGL_WeekPlan.DutyPerson = b.ToString();
+                    if (a != 0)//被除数不能为零
+                    {
+                        JDGL_WeekPlan.Remark = Math.Round((double)b / (double)a * 100, 2) + "%";//保留两位小数、后四舍五入
+                    }
+                    else
+                    {
+                        JDGL_WeekPlan.Remark = "0%";
+                    }
+                    StatisticsList.Add(JDGL_WeekPlan);
+                    i++;
+                }
+            }
+            else   //按五环责任人
+            {
+                var user = (from x in db.Sys_User
+                            join y in db.JDGL_WeekPlan on x.UserId equals y.DutyPerson
+                            where y.ProjectId == this.CurrUser.LoginProjectId
+                            orderby x.UserId
+                            select x).Distinct().ToList();
+                foreach (var item in user)
+                {
+                    //所有集合
+                    var list = totalList.Where(x => x.DutyPerson == item.UserId);
+                    Model.JDGL_WeekPlan JDGL_WeekPlan = new Model.JDGL_WeekPlan();
+                    JDGL_WeekPlan.WorkContent = item.UserName;
+                    int a = list.Count();
+                    int b = list.Count(x => x.IsOK == true);
+                    JDGL_WeekPlan.UnitId = a.ToString();
+                    JDGL_WeekPlan.DutyPerson = b.ToString();
+                    if (a != 0)//被除数不能为零
+                    {
+                        JDGL_WeekPlan.Remark = Math.Round((double)b / (double)a * 100, 2) + "%";//保留两位小数、后四舍五入
+                    }
+                    else
+                    {
+                        JDGL_WeekPlan.Remark = "0%";
+                    }
+                    StatisticsList.Add(JDGL_WeekPlan);
+                    i++;
+                }
+            }
+            if (StatisticsList.Count() > 0)   //增加总计
+            {
+                Model.JDGL_WeekPlan StatisticsLast = new Model.JDGL_WeekPlan();
+                StatisticsLast.WorkContent = "合计";
+                int a = totalList.Count();
+                int b = totalList.Count(x => x.IsOK == true);
+                StatisticsLast.UnitId = a.ToString();
+                StatisticsLast.DutyPerson = b.ToString();
+                if (a != 0)//被除数不能为零
+                {
+                    StatisticsLast.Remark = Math.Round((double)b / (double)a * 100, 2) + "%";//保留两位小数、后四舍五入
+                }
+                else
+                {
+                    StatisticsLast.Remark = "0%";
+                }
+                StatisticsList.Add(StatisticsLast);
+            }
+            this.Grid1.DataSource = StatisticsList;
+            this.Grid1.DataBind();
+        }
+        #endregion
+        protected void ckType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this.ckType.SelectedValue == "1")
+            {
+                this.Grid1.Columns[1].HeaderText = "责任单位";
+            }
+            else
+            {
+                this.Grid1.Columns[1].HeaderText = "五环责任人";
+            }
+            BindStatisc();
+        }
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BindStatisc();
+        }
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            //string rootPath = Server.MapPath("~/");
+            //string initTemplatePath = Const.JDGL_WeekPlanTemlUrl;
+            //string uploadfilepath = string.Empty;
+            //string newUrl = string.Empty;
+            //uploadfilepath = rootPath + initTemplatePath;
+
+            //if (StatisticsList != null)
+            //{
+            //    string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
+            //    newUrl = uploadfilepath.Replace("NCR统计模板", "NCR统计（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）");
+            //    File.Copy(uploadfilepath, newUrl);
+            //    // 第一步：读取文件流
+            //    NPOI.SS.UserModel.IWorkbook workbook;
+            //    using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read))
+            //    {
+            //        //workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream);
+            //        workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream);
+            //    }
+            //    // 创建单元格样式
+            //    NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle();
+            //    cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+            //    cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+            //    cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+            //    cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+            //    cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+            //    cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+            //    cellStyle.WrapText = true;//自动换行
+            //    var font = workbook.CreateFont();
+            //    font.FontHeightInPoints = 11;
+            //    cellStyle.SetFont(font);
+            //    // 第二步：创建新数据行
+            //    NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
+            //    NPOI.SS.UserModel.IRow row = sheet.GetRow(0);
+            //    NPOI.SS.UserModel.ICell cell;
+            //    int i = 2;
+            //    foreach (var item in StatisticsList)
+            //    {
+            //        // 第二步：创建新数据行
+            //        row = sheet.CreateRow(i);
+            //        // 添加数据
+            //        cell = row.CreateCell(0);
+            //        cell.CellStyle = cellStyle;
+            //        cell.SetCellValue(item.WorkName);//工作名称
+
+            //        cell = row.CreateCell(1);
+            //        cell.CellStyle = cellStyle;
+            //        cell.SetCellValue(item.CheckNum);
+
+            //        cell = row.CreateCell(2);
+            //        cell.CellStyle = cellStyle;
+            //        cell.SetCellValue(item.OKNum);
+
+            //        cell = row.CreateCell(3);
+            //        cell.CellStyle = cellStyle;
+            //        cell.SetCellValue(item.NotOKNum);
+
+            //        cell = row.CreateCell(4);
+            //        cell.CellStyle = cellStyle;
+            //        cell.SetCellValue(item.OKRate);
+
+            //        cell = row.CreateCell(5);
+            //        cell.CellStyle = cellStyle;
+            //        cell.SetCellValue(item.Remark);
+            //        i++;
+            //    }
+            //    // 第三步：写入文件流
+            //    using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
+            //    {
+            //        workbook.Write(stream);
+            //        workbook.Close();
+            //    }
+            //    string fileName = Path.GetFileName(newUrl);
+            //    FileInfo info = new FileInfo(newUrl);
+            //    long fileSize = info.Length;
+            //    Response.Clear();
+            //    Response.ContentType = "application/x-zip-compressed";
+            //    Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+            //    Response.AddHeader("Content-Length", fileSize.ToString());
+            //    Response.TransmitFile(newUrl, 0, fileSize);
+            //    Response.Flush();
+            //    Response.Close();
+            //    File.Delete(newUrl);
+            //}
+            //else
+            //{
+            //    Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning);
+            //}
+        }
+
+        /// <summary>
+        /// 导出方法
+        /// </summary>
+        /// <param name="grid"></param>
+        /// <returns></returns>
+        //private string GetGridTableHtml(Grid grid)
+        //{
+        //    StringBuilder sb = new StringBuilder();
+        //    sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+        //    sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+        //    sb.Append("<tr>");
+        //    grid.PageSize = 10000;
+        //    BindStatisc();
+        //    foreach (GridColumn column in grid.Columns)
+        //    {
+        //        sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+        //    }
+        //    sb.Append("</tr>");
+        //    foreach (GridRow row in grid.Rows)
+        //    {
+        //        sb.Append("<tr>");
+        //        foreach (GridColumn column in grid.Columns)
+        //        {
+        //            string html = row.Values[column.ColumnIndex].ToString();
+        //            if (column.ColumnID == "tfNumber")
+        //            {
+        //                html = (row.FindControl("labNumber") as AspNet.Label).Text;
+        //            }
+        //            sb.AppendFormat("<td>{0}</td>", html);
+        //        }
+
+        //        sb.Append("</tr>");
+        //    }
+
+        //    sb.Append("</table>");
+
+        //    return sb.ToString();
+        //}
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx.designer.cs
new file mode 100644
index 00000000..4541b16d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/JDGL/Check/WeekPlanStatisc.aspx.designer.cs
@@ -0,0 +1,150 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.JDGL.Check {
+    
+    
+    public partial class WeekPlanStatisc {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// drpWeekNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpWeekNo;
+        
+        /// <summary>
+        /// txtStartDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartDate;
+        
+        /// <summary>
+        /// txtEndDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndDate;
+        
+        /// <summary>
+        /// ckType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList ckType;
+        
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+        
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+        
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+        
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+        
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 9fc55c34..963148f2 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -12,7 +12,7 @@
   <appSettings>
     <!--连接字符串-->
     <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
-    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1"/>
+    <compilation debug="false" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
index fedb045c..e8d5b757 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
@@ -46,12 +46,14 @@ namespace FineUIPro.Web.common
                 ProjectId = CurrUser.LoginProjectId;
                 Model.SGGLDB db = Funs.DB;
                 //安全人工时
-                int wHours = db.SitePerson_PersonInOutNumber.Where(x => x.ProjectId == ProjectId).Max(x => x.WorkHours) ?? 0;
+                //int wHours = db.SitePerson_PersonInOutNumber.Where(x => x.ProjectId == ProjectId).Max(x => x.WorkHours) ?? 0;
+                int wHours = 0;
+                DateTime? sDate = Funs.GetNewDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString());
+                wHours = (from x in db.T_d_EmployInOutRecord where x.ProjectId == ProjectId select x.ManHours ?? 0).ToList().Sum();
                 this.divSafeWorkTime.InnerHtml = wHours.ToString();
 
                 //本月安全人工时
                 int wHoursMonth = 0;
-                DateTime? sDate = Funs.GetNewDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString());
                 var dayReports = BLL.SitePerson_MonthReportService.getMonthReports(this.ProjectId, sDate);
                 if (dayReports.Count > 0)
                 {
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 5108706c..46dcc0c6 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />