20230915新增项目当前在场人员统计页面

2023-09-15 11:27:02 +08:00 · 2023-09-15 11:27:02 +08:00 · 5bb940a5cc
parent 508d10c3e5
commit 5bb940a5cc
14 changed files with 553 additions and 10 deletions
--- a/DataBase/版本日志/SGGLDB_V2023-09-15.sql
+++ b/DataBase/版本日志/SGGLDB_V2023-09-15.sql
@ -0,0 +1,3 @@
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('70282169-C09D-4D46-BAA3-9457535EAEA2','当前现场人员统计','HSSE/SitePerson/SitePersonNowStatistic.aspx',62,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1)
+GO
--- a/DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql
+++ b/DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql
@ -341,6 +341,9 @@ GO
 	VALUES('7D36E853-CC79-48B9-9E7F-E34797B4E87E','现场人员考勤统计','HSSE/SitePerson/PersonStatistic.aspx',60,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1)
 	GO

+	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+	VALUES('70282169-C09D-4D46-BAA3-9457535EAEA2','当前现场人员统计','HSSE/SitePerson/SitePersonNowStatistic.aspx',62,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1)
+	GO
 	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
 	VALUES('F291CAE4-2E53-48FC-BF44-382D42EA4DEC','现场岗位人工时统计','HSSE/SitePerson/WorkPostStatistic.aspx',65,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1)
 	GO
--- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
+++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
@ -137,7 +137,7 @@ namespace BLL
        /// <param name="PageIndex">页码</param>
        /// <param name="PageSize">每页数量</param>
        /// <returns></returns>
-        public static IEnumerable getInPsersonListData(string projectId, string unitId, string personName, string identityCard, Grid Grid1)
+        public static IEnumerable getInPersonListData(string projectId, string unitId, string personName, string identityCard, Grid Grid1)
        {
            IQueryable<Model.SitePerson_Person> getInPersonList = getInPersonLists.Where(x => x.ProjectId == projectId);
            if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
@ -183,6 +183,103 @@ namespace BLL
        }
        #endregion

+        #region 现场当前人员列表
+        /// <summary>
+        /// 记录数
+        /// </summary>
+        public static int nowCount
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 定义变量
+        /// </summary>
+        private static IQueryable<Model.SitePerson_PersonInOutNow> getNowPersonLists = from x in db.SitePerson_PersonInOutNow
+                                                                               select x;
+
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="PageIndex">页码</param>
+        /// <param name="PageSize">每页数量</param>
+        /// <returns></returns>
+        public static IEnumerable getNowPersonListData(string projectId, string unitId, string workPostId, string personName, string identityCard, DateTime dateValue, Grid Grid1)
+        {
+            IQueryable<Model.SitePerson_PersonInOutNow> getDayAll = getNowPersonLists.Where(x=>x.ProjectId == projectId 
+                            && x.ChangeTime.Value.Year == dateValue.Year && x.ChangeTime.Value.Month == dateValue.Month
+                            && x.ChangeTime.Value.Day == dateValue.Day);
+            if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
+            {
+                getDayAll = getDayAll.Where(x => x.UnitId == unitId);
+            }
+            if (!string.IsNullOrEmpty(personName))
+            {
+                getDayAll = getDayAll.Where(x => x.PersonName.Contains(personName));
+            }
+            if (!string.IsNullOrEmpty(identityCard))
+            {
+                getDayAll = getDayAll.Where(x => x.IdentityCard.Contains(identityCard));
+            }
+            if (!string.IsNullOrEmpty(workPostId) && workPostId != Const._Null)
+            {
+                getDayAll = getDayAll.Where(x => x.WorkPostId == workPostId);
+            }
+
+            if (getDayAll.Count() > 0)
+            {
+                var getInMaxs = from x in getDayAll
+                                group x by x.PersonId into g
+                                select new
+                                {
+                                    ProjectId = g.First().ProjectId, 
+                                    PersonId = g.First().PersonId,
+                                    personName = g.First().PersonName,
+                                    identityCard = g.First().IdentityCard,
+                                    UnitId = g.First().UnitId,
+                                    UnitName = g.First().UnitName,
+                                    WorkPostName = g.First().WorkPostName,
+                                    ChangeTime = g.Max(x => x.ChangeTime),
+                                    IsIn = g.First().IsIn,
+                                    PostType = g.First().PostType,
+                                    WorkPostId = g.First().WorkPostId,
+                                };
+
+                if (getInMaxs.Count() > 0)
+                {
+                    getInMaxs = getInMaxs.Where(x => x.IsIn == true);
+                }
+                inCount = getInMaxs.Count();
+                if (inCount == 0)
+                {
+                    return null;
+                }
+
+                getInMaxs = SortConditionHelper.SortingAndPaging(getInMaxs, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
+                return from x in getInMaxs
+                       select new
+                       {
+                           x.PersonId,
+                           x.personName,
+                           x.identityCard,
+                           CardNo =db.SitePerson_Person.First(p=>p.PersonId == x.PersonId && p.ProjectId ==x.ProjectId).CardNo,
+                           x.UnitName,
+                           x.UnitId,
+                           x.WorkPostId,
+                           x.WorkPostName,
+                           TeamGroupName=TeamGroupService.GetTeamGroupNameByPersonId(x.ProjectId,x.PersonId),
+                           x.ChangeTime,
+                       };
+            }
+            else
+            {
+                inCount =0;
+                return null;
+            }
+        }
+        #endregion
+
        #region 获取项目人员 -- 按条件查询
        #region 根据现场人员主键获取现场人员信息
        /// <summary>
--- a/SGGL/BLL/ProjectData/TeamGroupService.cs
+++ b/SGGL/BLL/ProjectData/TeamGroupService.cs
@ -167,5 +167,20 @@ namespace BLL
            }
            return name;
        }
+
+        public static string GetTeamGroupNameByPersonId(string projectId, string personId)
+        {
+            string name = string.Empty;
+            var getSitePerson = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == projectId && x.PersonId == personId);
+            if (getSitePerson != null)
+            {
+                var TeamGroup = Funs.DB.ProjectData_TeamGroup.FirstOrDefault(x => x.TeamGroupId == getSitePerson.TeamGroupId);
+                if (TeamGroup != null)
+                {
+                    name = TeamGroup.TeamGroupName;
+                }
+            }
+            return name;
+        }
    }
 }
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@ -0,0 +1,32 @@
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 (Object )
+   在 FineUIPro.GridRow.kxpUEMXYxcbykrOznAFBzkoxlAnb()
+   在 (GridRow )
+   在 FineUIPro.GridRow.InitTemplateContainers()
+   在 (GridRow )
+   在 FineUIPro.Grid.BkpgFeAELTFlAvoTrOBrConfcLJbA(Int32 , Object )
+   在 (Grid , Int32 , Object )
+   在 FineUIPro.Grid.CRTRkdQFrrBRFQuCddjZPswlTORP(IEnumerable , Boolean )
+   在 (Grid , IEnumerable , Boolean )
+   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+   在 (Grid , Boolean )
+   在 FineUIPro.Grid.DataBind()
+   在 FineUIPro.Web.HSSE.SitePerson.SitePersonNowStatistic.BindGrid() 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\HSSE\SitePerson\SitePersonNowStatistic.aspx.cs:行号 58
+   在 FineUIPro.Web.HSSE.SitePerson.SitePersonNowStatistic.btnSearch_Click(Object sender, EventArgs e) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\HSSE\SitePerson\SitePersonNowStatistic.aspx.cs:行号 65
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/15/2023 11:18:13
+出错文件:http://localhost:9243/HSSE/SitePerson/SitePersonNowStatistic.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/15/2023 11:18:13
+
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@ -1058,6 +1058,7 @@
    <Content Include="HSSE\SitePerson\PersonList.aspx" />
    <Content Include="HSSE\SitePerson\PersonListEdit.aspx" />
    <Content Include="HSSE\SitePerson\PersonOut.aspx" />
+    <Content Include="HSSE\SitePerson\SitePersonNowStatistic.aspx" />
    <Content Include="HSSE\SitePerson\WorkPostStatistic.aspx" />
    <Content Include="HSSE\SitePerson\PersonStatistic.aspx" />
    <Content Include="HSSE\SitePerson\PersonUnitRefresh.aspx" />
@ -11319,6 +11320,13 @@
    <Compile Include="HSSE\SitePerson\PersonOut.aspx.designer.cs">
      <DependentUpon>PersonOut.aspx</DependentUpon>
    </Compile>
+    <Compile Include="HSSE\SitePerson\SitePersonNowStatistic.aspx.cs">
+      <DependentUpon>SitePersonNowStatistic.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\SitePerson\SitePersonNowStatistic.aspx.designer.cs">
+      <DependentUpon>SitePersonNowStatistic.aspx</DependentUpon>
+    </Compile>
    <Compile Include="HSSE\SitePerson\WorkPostStatistic.aspx.cs">
      <DependentUpon>WorkPostStatistic.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonUnitList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonUnitList.aspx.cs
@ -60,7 +60,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
        /// </summary>
        private void BindGrid()
        {
-            var getData = SitePerson_PersonService.getInPsersonListData(this.ProjectId, this.drpUnit.SelectedValue, this.txtPersonName.Text.Trim(), this.txtIdentityCard.Text.Trim(), Grid1);
+            var getData = SitePerson_PersonService.getInPersonListData(this.ProjectId, this.drpUnit.SelectedValue, this.txtPersonName.Text.Trim(), this.txtIdentityCard.Text.Trim(), Grid1);
            Grid1.RecordCount = SitePerson_PersonService.inCount;
            Grid1.DataSource = getData;
            Grid1.DataBind();
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx
@ -0,0 +1,90 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SitePersonNowStatistic.aspx.cs" Inherits="FineUIPro.Web.HSSE.SitePerson.SitePersonNowStatistic" %>
+
+<!DOCTYPE html>
+<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="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" ShowBorder="true" ShowHeader="false" Title="当前人员统计" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="PersonId" DataIDField="PersonId" AllowSorting="true" ForceFit="true"
+                    SortField="ChangeTime" SortDirection="DESC" EnableColumnLines="true" EnableTextSelection="True"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList runat="server" ID="drpUnit" Label="单位"
+                                    Width="300px" LabelAlign="Right" LabelWidth="50px">
+                                </f:DropDownList>
+                                <f:DropDownList runat="server" ID="drpWorkPost" Label="岗位"
+                                    Width="200px" LabelAlign="Right" LabelWidth="50px">
+                                </f:DropDownList>
+                                <f:TextBox runat="server" ID="txtPersonName" EmptyText="按姓名查询" Width="160px" LabelAlign="Right" ></f:TextBox>
+                                <f:TextBox runat="server" ID="txtIdcard" EmptyText="按身份证号码查询" Width="180px" LabelAlign="Right" ></f:TextBox>
+                                <f:DatePicker ID="txtStartDate" runat="server" Label="日期" LabelWidth="50px" Width="200px" EnableEdit="false" Readonly="true">
+                                </f:DatePicker>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="查询" OnClick="btnSearch_Click">
+                                </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="100px" ColumnID="personName" DataField="personName"
+                            FieldType="String" HeaderText="姓名" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="180px" ColumnID="identityCard" DataField="identityCard"
+                            FieldType="String" HeaderText="身份证号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="CardNo" DataField="CardNo"
+                            FieldType="String" HeaderText="卡号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName"
+                            FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="WorkPostName" DataField="WorkPostName"
+                            FieldType="String" HeaderText="岗位名称" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="TeamGroupName" DataField="TeamGroupName"
+                            FieldType="String" HeaderText="班组" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="ChangeTime" DataField="ChangeTime" SortField="ChangeTime"
+                            FieldType="String" HeaderText="进场时间" HeaderTextAlign="Center" TextAlign="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:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+</body>
+</html>
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.cs
@ -0,0 +1,116 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+
+namespace FineUIPro.Web.HSSE.SitePerson
+{
+    public partial class SitePersonNowStatistic : PageBase
+    {
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+                this.drpUnit.SelectedValue = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_SEDIN : this.CurrUser.UnitId;
+                if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                {
+                    this.drpUnit.Enabled = false;
+                }
+                WorkPostService.InitWorkPostDropDownList(this.drpWorkPost, true);
+                this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                // 绑定表格
+                this.BindGrid();
+            }
+        }
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            var getData = SitePerson_PersonService.getNowPersonListData(this.ProjectId, this.drpUnit.SelectedValue, this.drpWorkPost.SelectedValue
+                , this.txtPersonName.Text.Trim(),this.txtIdcard.Text.Trim(),Funs.GetNewDateTimeOrNow(this.txtStartDate.Text), Grid1);
+            Grid1.RecordCount = SitePerson_PersonService.nowCount;
+            Grid1.DataSource = getData;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            // 绑定表格
+            this.BindGrid();
+        }
+
+        #region 分页选择下拉改变事件
+        /// <summary>
+        /// 分页选择下拉改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+
+        #region 页索引改变事件
+        /// <summary>
+        /// 页索引改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+        #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("现场岗位人工时统计" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = this.Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+        #endregion
+
+
+    }
+}
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.designer.cs
@ -0,0 +1,161 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.SitePerson
+{
+
+
+    public partial class SitePersonNowStatistic
+    {
+
+        /// <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>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnit;
+
+        /// <summary>
+        /// drpWorkPost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpWorkPost;
+
+        /// <summary>
+        /// txtPersonName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPersonName;
+
+        /// <summary>
+        /// txtIdcard 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtIdcard;
+
+        /// <summary>
+        /// txtStartDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartDate;
+
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <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;
+    }
+}
--- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml
@ -3,7 +3,7 @@
  <TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl="">
    <TreeNode id="0E9C6A47-E410-43C4-95D1-1EC1C01E9967" Text="WBS数据仓库" NavigateUrl="DigData/WBSDW.aspx">
    </TreeNode>
-<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
+<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据仓库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
 <TreeNode id="04B182E4-D31E-449F-9803-322F3F380D89" Text="HSE日常检查问题分析" NavigateUrl="DigData/DailyProblemAnalysis.aspx"></TreeNode>
 <TreeNode id="24939ABD-E174-4C3D-8B04-494917B7BE40" Text="HSE隐患整改问题分析" NavigateUrl="DigData/RectifyProblemAnalysis.aspx"></TreeNode>
 <TreeNode id="4B2E7EE5-AC7C-4143-B5BC-60080C763A24" Text="HSE教育培训统计" NavigateUrl="DigData/TrainRecordAnalysis.aspx"></TreeNode>
@ -12,7 +12,7 @@
 </TreeNode>
 <TreeNode id="E7F7BC38-7357-49C0-9242-68289031F618" Text="进度数据库" NavigateUrl=""><TreeNode id="44D51E89-267D-4D72-AB6D-1F4CA4E7D19D" Text="进度数据库" NavigateUrl="DigData/JDGLDataDW.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="381A4608-2CDE-42AF-BC4D-FF554785B9F8" Text="合同数据库" NavigateUrl=""><TreeNode id="ABC4323E-2F6F-4147-AA7A-8726131D7044" Text="合同数据库" NavigateUrl="DigData/JDGLDataDW.aspx"></TreeNode>
+<TreeNode id="381A4608-2CDE-42AF-BC4D-FF554785B9F8" Text="合同数据库" NavigateUrl=""><TreeNode id="ABC4323E-2F6F-4147-AA7A-8726131D7044" Text="合同数据库" NavigateUrl="DigData/HTGLDataDW.aspx"></TreeNode>
 <TreeNode id="A20E2443-A118-4C67-9084-FFEB685CA539" Text="清单子目使用率及价格走势图" NavigateUrl=""></TreeNode>
 <TreeNode id="6D1F3A3F-EFD1-420A-87E7-8CFAEF971165" Text="日工效统计" NavigateUrl=""></TreeNode>
 </TreeNode>
--- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
@ -31,6 +31,7 @@
 <TreeNode id="7ACB0CB1-15D8-4E8E-A54D-0CDC5F69B39A" Text="发卡管理" NavigateUrl="HSSE/SitePerson/SendCard.aspx"></TreeNode>
 <TreeNode id="12F7123B-C2ED-4011-9859-83260AC91F09" Text="现场人员考勤管理" NavigateUrl="HSSE/SitePerson/PersonInfo.aspx"></TreeNode>
 <TreeNode id="7D36E853-CC79-48B9-9E7F-E34797B4E87E" Text="现场人员考勤统计" NavigateUrl="HSSE/SitePerson/PersonStatistic.aspx"></TreeNode>
+<TreeNode id="70282169-C09D-4D46-BAA3-9457535EAEA2" Text="当前现场人员统计" NavigateUrl="HSSE/SitePerson/SitePersonNowStatistic.aspx"></TreeNode>
 <TreeNode id="F291CAE4-2E53-48FC-BF44-382D42EA4DEC" Text="现场岗位人工时统计" NavigateUrl="HSSE/SitePerson/WorkPostStatistic.aspx"></TreeNode>
 <TreeNode id="EBEA762D-1F46-47C5-9EAD-759E13D9B41C" Text="特种作业人员资质" NavigateUrl="HSSE/QualityAudit/PersonQuality.aspx"></TreeNode>
 <TreeNode id="96FB96FF-20D8-4CE9-AF57-C19717BB5D3E" Text="特种设备作业人员资质" NavigateUrl="HSSE/QualityAudit/EquipmentPersonQuality.aspx"></TreeNode>
--- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划设置" NavigateUrl="JDGL/Check/PlanSet.aspx">
+  <TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划编制" NavigateUrl="JDGL/Check/PlanSet.aspx">
  </TreeNode>
 <TreeNode id="B479EC55-E12A-4F91-AF3F-864DAAA136FB" Text="进度完成情况录入" NavigateUrl="JDGL/Check/CompleteInput.aspx"></TreeNode>
 <TreeNode id="F0E296C3-6499-43E5-88CD-E00C5180D3BC" Text="赢得值曲线" NavigateUrl="JDGL/Check/EarnedValueCurve.aspx"></TreeNode>
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="D78C6E54-4240-4E82-B9B5-8ED76CF62981" Text="劳务实名制对接" NavigateUrl="">
-    <TreeNode id="1E451E0C-A125-4117-B8AC-14E74011B52B" Text="同步设置" NavigateUrl="ZHGL/RealName/SynchroSet.aspx">
+  <TreeNode id="831FA803-E2E9-4674-9B56-44E5A5DDCB1A" Text="自动上报集团对接" NavigateUrl="">
+    <TreeNode id="FFD221D7-AE05-447F-8727-80058A04F401" Text="接口设置" NavigateUrl="TaskScheduling/InterFace/InterFaceSet.aspx">
    </TreeNode>
+<TreeNode id="FFD221D7-AE05-447F-8727-80058A04F402" Text="任务清单" NavigateUrl="TaskScheduling/InterFace/InterFaceTask.aspx"></TreeNode>
+<TreeNode id="FFD221D7-AE05-447F-8727-80058A04F404" Text="数据调用日志" NavigateUrl="TaskScheduling/InterFace/IFLogList.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="D78C6E54-4240-4E82-B9B5-8ED76CF62981" Text="劳务实名制对接" NavigateUrl=""><TreeNode id="1E451E0C-A125-4117-B8AC-14E74011B52B" Text="同步设置" NavigateUrl="ZHGL/RealName/SynchroSet.aspx"></TreeNode>
 <TreeNode id="C0B52610-ED93-4881-AC61-1764C243F84A" Text="基础数据" NavigateUrl="ZHGL/RealName/BasicData.aspx"></TreeNode>
 <TreeNode id="F36E6C54-E39F-4032-874D-548EE090A35B" Text="同步记录" NavigateUrl="ZHGL/RealName/SynchroRecord.aspx"></TreeNode>
 </TreeNode>
@ -15,11 +19,19 @@
 <TreeNode id="C619988F-307B-4A39-B518-7F45CA7326F5" Text="检查记录" NavigateUrl=""></TreeNode>
 <TreeNode id="DEE90726-E00D-462B-A4BF-7E36180DD5B8" Text="项目绩效评价" NavigateUrl="OfficeCheck/ProjectEvaluation/ProjectEvaluation.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="ERDXV53M-09B1-6UIO-3EFM-5DVZDF329001" Text="安全信息上报" NavigateUrl=""><TreeNode id="3156A9F0-276D-4AD4-BF84-45CF6DFC215C" Text="百万工时安全统计月报" NavigateUrl="ZHGL/Information/MillionsMonthlyReport.aspx"></TreeNode>
+<TreeNode id="ERDXV53M-09B1-6UIO-3EFM-5DVZDF329001" Text="安全信息上报" NavigateUrl=""><TreeNode id="3156A9F0-276D-4AD4-BF84-45CF6DFC215C" Text="企业安全数据统计月报" NavigateUrl="ZHGL/Information/MillionsMonthlyReport.aspx"></TreeNode>
 <TreeNode id="4BC71D2E-7D94-48C1-A61A-139637825AA5" Text="职工伤亡事故原因分析报" NavigateUrl="ZHGL/Information/AccidentCauseReport.aspx"></TreeNode>
-<TreeNode id="A3894BAD-3F4A-4BB4-98CF-A76C588AE53F" Text="安全生产数据季报" NavigateUrl="ZHGL/Information/SafetyQuarterlyReport.aspx"></TreeNode>
 <TreeNode id="7985C759-8EB9-4B7D-AC65-00541280B46C" Text="应急演练开展情况季报" NavigateUrl="ZHGL/Information/DrillConductedQuarterlyReport.aspx"></TreeNode>
 <TreeNode id="70DEB27A-D6FF-4D57-879B-0270F2967FA0" Text="应急演练工作计划半年报" NavigateUrl="ZHGL/Information/DrillPlanHalfYearReport.aspx"></TreeNode>
+<TreeNode id="AAC7C263-6E25-49DC-985B-DC3FA7AAF3A1" Text="实业安全简报" NavigateUrl="ZHGL/Information/SafetyBriefing.aspx"></TreeNode>
+<TreeNode id="07FEEC9D-09C1-4C19-9269-62F69532086C" Text="安全管理工作总结报告" NavigateUrl="ZHGL/Information/WorkSummaryReport.aspx"></TreeNode>
+<TreeNode id="CF9C1F00-34B8-42E5-B2D1-704094169CA3" Text="季度工程项目质量信息表" NavigateUrl="ZHGL/Information/QuarterlyProjectQuality.aspx"></TreeNode>
+<TreeNode id="12941594-2171-411A-8CC8-32E3BD9FCDDF" Text="质量管理工作总结报告" NavigateUrl="ZHGL/Information/QualityWorkSummaryReport.aspx"></TreeNode>
+<TreeNode id="5B344750-79DD-40AA-8AA7-34B04E41FA72" Text="生态环保工作总结报告" NavigateUrl="ZHGL/Information/EPSummaryReport.aspx"></TreeNode>
+<TreeNode id="7C47F078-D4C9-40D9-BEEF-E657EAFEC650" Text="建筑行业能源节约与生态环境保护汇总表" NavigateUrl="ZHGL/Environmental/ArchitectureReport.aspx"></TreeNode>
+<TreeNode id="ECDD89AC-1E16-4D82-B3BE-5D62F31B7A14" Text="化工行业能源节约与生态环境保护汇总表" NavigateUrl="ZHGL/Environmental/ChemicalReport.aspx"></TreeNode>
+<TreeNode id="7652D239-1897-4886-8DF2-B71E3B060D21" Text="中央企业节能环保产业企业基本情况和经营情况报表" NavigateUrl="ZHGL/Environmental/OperationReport.aspx"></TreeNode>
+<TreeNode id="30579BFE-AB4B-49A7-A73D-B7CE902A8B69" Text="中央企业节能环保产业企业生产和服务业务情况报表" NavigateUrl="ZHGL/Environmental/EnergyReport.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="76E236DA-DDFC-4CE8-8CB8-02F8A27A8535" Text="专业技术方案评审" NavigateUrl=""><TreeNode id="B6A2B6EB-6B90-4953-B544-83FFF4F0EC19" Text="安全实施计划" NavigateUrl="ZHGL/Plan/ActionPlanList.aspx"></TreeNode>
 <TreeNode id="B9ADD006-BA46-4191-BCD1-CCB56767C82B" Text="总包施工质量计划" NavigateUrl="ZHGL/Plan/MainPlan.aspx"></TreeNode>
@ -78,4 +90,9 @@
 </TreeNode>
 <TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
 <TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
+<TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
+<TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>
+<TreeNode id="S89E5EC2-F725-4656-9110-5AF83C18FB6C" Text="实业数据" NavigateUrl="ZHGL/DataSync/SYHSEData_Data.aspx"></TreeNode>
+</TreeNode>
 </Tree>