From 9587bd3183b08a4eed7c153928c2bcf281bf86f0 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 29 May 2025 16:51:23 +0800
Subject: [PATCH] =?UTF-8?q?1=E8=B4=A3=E4=BB=BB=E4=BA=BA=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/DataShow/JD.aspx           |  49 +++++-
 SGGL/FineUIPro.Web/DataShow/JD.aspx.cs        | 141 +++++++++++++++++-
 .../DataShow/JD.aspx.designer.cs              |  76 +++++++++-
 .../DataShow/JDDutyPersonDetail.aspx          | 106 +++++++++++++
 .../DataShow/JDDutyPersonDetail.aspx.cs       | 139 +++++++++++++++++
 .../JDDutyPersonDetail.aspx.designer.cs       |  80 ++++++++++
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |   8 +
 7 files changed, 593 insertions(+), 6 deletions(-)
 create mode 100644 SGGL/FineUIPro.Web/DataShow/JDDutyPersonDetail.aspx
 create mode 100644 SGGL/FineUIPro.Web/DataShow/JDDutyPersonDetail.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/DataShow/JDDutyPersonDetail.aspx.designer.cs

diff --git a/SGGL/FineUIPro.Web/DataShow/JD.aspx b/SGGL/FineUIPro.Web/DataShow/JD.aspx
index 243e007a..13c1c4a4 100644
--- a/SGGL/FineUIPro.Web/DataShow/JD.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/JD.aspx
@@ -319,8 +319,55 @@
                                 </f:Grid>
                             </Items>
                         </f:Tab>
-                        <f:Tab ID="TabOnlineMenuSet" Title="个人完成情况统计" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server" Hidden="True">
+                        <f:Tab ID="Tab5" Title="各责任人基本情况" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
                             <Items>
+                                <f:Grid ID="Grid5" ShowBorder="true" ShowHeader="false" Title="各责任人基本情况" EnableCollapse="true"
+                                    runat="server" BoxFlex="1" DataKeyNames="UserId" DataIDField="UserId" AllowSorting="true" MarginRight="15px"
+                                    SortField="UserCode,UserName" SortDirection="ASC" OnSort="Grid5_Sort" EnableColumnLines="true" AllowPaging="true"
+                                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid5_PageIndexChange" ForceFit="true" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid5_RowDoubleClick"
+                                    EnableTextSelection="True">
+                                    <Toolbars>
+                                        <f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
+                                            <Items>
+                                                <f:DropDownList ID="drpDutyPerson5" runat="server" Label="责任人" Width="250px" LabelWidth="80px" LabelAlign="Right"
+                                                    EnableEdit="true" OnSelectedIndexChanged="TextBox5_TextChanged" AutoPostBack="true">
+                                                </f:DropDownList>
+                                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                                <f:Button ID="Button4" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                                </f:Button>
+                                            </Items>
+                                        </f:Toolbar>
+                                    </Toolbars>
+                                    <Columns>
+                                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                            TextAlign="Center">
+                                            <ItemTemplate>
+                                                <asp:Label ID="Label4" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:RenderField Width="100px" ColumnID="UserCode" DataField="UserCode" FieldType="String" HeaderText="人员编号" TextAlign="Left"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="200px" ColumnID="UserName" ExpandUnusedSpace="true" DataField="UserName" FieldType="String" HeaderText="人员名称" TextAlign="Left"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="MonthPlanRate" DataField="MonthPlanRate" FieldType="Float" HeaderText="月度计划准点率(%)" TextAlign="Right"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="WeekPlanRate" DataField="WeekPlanRate" FieldType="Float" HeaderText="周计划准点率(%)" TextAlign="Right"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                    </Columns>
+                                    <PageItems>
+                                        <f:ToolbarSeparator ID="ToolbarSeparator5" runat="server">
+                                        </f:ToolbarSeparator>
+                                        <f:ToolbarText ID="ToolbarText5" runat="server" Text="每页记录数：">
+                                        </f:ToolbarText>
+                                        <f:DropDownList runat="server" ID="ddlPageSize5" Width="80px" AutoPostBack="true"
+                                            OnSelectedIndexChanged="ddlPageSize5_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                    </PageItems>
+                                </f:Grid>
                             </Items>
                         </f:Tab>
                     </Tabs>
diff --git a/SGGL/FineUIPro.Web/DataShow/JD.aspx.cs b/SGGL/FineUIPro.Web/DataShow/JD.aspx.cs
index dd91b501..a6263111 100644
--- a/SGGL/FineUIPro.Web/DataShow/JD.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/JD.aspx.cs
@@ -18,15 +18,18 @@ namespace FineUIPro.Web.DataShow
                 Funs.DropDownPageSize(this.ddlPageSize2);
                 Funs.DropDownPageSize(this.ddlPageSize3);
                 Funs.DropDownPageSize(this.ddlPageSize4);
+                Funs.DropDownPageSize(this.ddlPageSize5);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 ddlPageSize2.SelectedValue = Grid2.PageSize.ToString();
                 ddlPageSize3.SelectedValue = Grid3.PageSize.ToString();
                 ddlPageSize4.SelectedValue = Grid4.PageSize.ToString();
+                ddlPageSize5.SelectedValue = Grid5.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject2, true);
                 BLL.UserService.InitSGBUser(this.drpDutyPerson2, true);
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject3, true);
                 BLL.UserService.InitSGBUser(this.drpDutyPerson3, true);
+                BLL.UserService.InitSGBUser(this.drpDutyPerson5, true);
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject4, true);
                 BindGrid1();
 
@@ -40,6 +43,9 @@ namespace FineUIPro.Web.DataShow
             }
         }
 
+        /// <summary>
+        /// 项目基本情况
+        /// </summary>
         private void BindGrid1()
         {
             string strSql = @"select p.ProjectId,ProjectCode, ProjectName,(select sum(isnull(RealNum,0)) from JDGL_ProgressCompletion a where a.ProjectId=p.ProjectId) as RealNum,
@@ -91,8 +97,9 @@ left join (
             BindGrid2();
         }
         #endregion
+
         /// <summary>
-        /// 绑定数据
+        /// 月计划
         /// </summary>
         private void BindGrid2()
         {
@@ -173,7 +180,7 @@ left join (
         }
 
         /// <summary>
-        /// 绑定数据
+        /// 周计划
         /// </summary>
         private void BindGrid3()
         {
@@ -253,7 +260,7 @@ left join (
         }
 
         /// <summary>
-        /// 绑定数据
+        /// 实物工程量
         /// </summary>
         private void BindGrid4()
         {
@@ -297,6 +304,53 @@ left join (select PlanNum,RealNum,NextNum,QuantityListId from JDGL_QuantityCompl
             Grid4.DataBind();
         }
 
+        /// <summary>
+        /// 五环责任人完成情况
+        /// </summary>
+        private void BindGrid5()
+        {
+            string strSql = $@"SELECT p.UserId,p.UserCode,p.UserName, cast((case when isnull(MonthPlan.MonthPlanNum,0)=0 then 0 else isnull(MonthPlanOK.MonthPlanOKNum,0)/(1.0 *isnull(MonthPlan.MonthPlanNum,0))*100 end) as DECIMAL(19,2)) as MonthPlanRate,
+ cast((case when isnull(WeekPlan.WeekPlanNum,0)=0 then 0 else isnull(WeekPlanOK.WeekPlanOKNum,0)/(1.0 *isnull(WeekPlan.WeekPlanNum,0))*100 end) as DECIMAL(19,2)) as WeekPlanRate
+FROM Sys_User p 
+LEFT JOIN (
+	 SELECT COUNT(w.WeekPlanId) AS WeekPlanNum,w.pDutyPerson 
+	 FROM (SELECT Item.value('.', 'NVARCHAR(MAX)') AS pDutyPerson,jplan.* FROM JDGL_WeekPlan as jplan CROSS APPLY (SELECT CAST('<M>' + REPLACE(DutyPerson, ',', '</M><M>') + '</M>' AS XML)) AS A(x) CROSS APPLY x.nodes('/M') AS B(Item)) w 
+	 GROUP BY w.pDutyPerson
+	) AS WeekPlan ON WeekPlan.pDutyPerson =p.UserId 
+LEFT JOIN (
+	 SELECT COUNT(w.WeekPlanId) AS WeekPlanOKNum,w.pDutyPerson 
+	 FROM (SELECT Item.value('.', 'NVARCHAR(MAX)') AS pDutyPerson,jplan.* FROM JDGL_WeekPlan as jplan CROSS APPLY (SELECT CAST('<M>' + REPLACE(DutyPerson, ',', '</M><M>') + '</M>' AS XML)) AS A(x) CROSS APPLY x.nodes('/M') AS B(Item)) w 
+	 WHERE w.IsOK=1
+	 GROUP BY w.pDutyPerson
+	) AS WeekPlanOK ON WeekPlanOK.pDutyPerson=p.UserId 
+LEFT JOIN (
+	 SELECT COUNT(w.MonthPlanId) AS MonthPlanNum,w.pDutyPerson 
+	 FROM (SELECT Item.value('.', 'NVARCHAR(MAX)') AS pDutyPerson,jplan.* FROM JDGL_MonthPlan as jplan CROSS APPLY (SELECT CAST('<M>' + REPLACE(DutyPerson, ',', '</M><M>') + '</M>' AS XML)) AS A(x) CROSS APPLY x.nodes('/M') AS B(Item)) w 
+	 GROUP BY w.pDutyPerson
+	) AS MonthPlan ON MonthPlan.pDutyPerson=p.UserId 
+LEFT JOIN (
+	 SELECT COUNT(w.MonthPlanId) AS MonthPlanOKNum,w.pDutyPerson 
+	 FROM (SELECT Item.value('.', 'NVARCHAR(MAX)') AS pDutyPerson,jplan.* FROM JDGL_MonthPlan as jplan CROSS APPLY (SELECT CAST('<M>' + REPLACE(DutyPerson, ',', '</M><M>') + '</M>' AS XML)) AS A(x) CROSS APPLY x.nodes('/M') AS B(Item)) w 
+	 WHERE w.RealDate is not null and w.RealDate<=w.PlanDate
+	 GROUP BY w.pDutyPerson
+	) AS MonthPlanOK ON MonthPlanOK.pDutyPerson=p.UserId 
+WHERE p.IsPost=1 and p.UnitId='{Const.UnitId_CWCEC}' and p.DepartId='{Const.Depart_constructionId}' ";// ORDER BY p.UserCode,p.UserName
+
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (this.drpDutyPerson5.SelectedValue != Const._Null)
+            {
+                strSql += " AND p.UserId = @UserId";
+                listStr.Add(new SqlParameter("@UserId", this.drpDutyPerson5.SelectedValue));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid5.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid5, tb);
+            Grid5.DataSource = table;
+            Grid5.DataBind();
+        }
+
         #region 查询
         /// <summary>
         /// 查询
@@ -472,6 +526,51 @@ left join (select PlanNum,RealNum,NextNum,QuantityListId from JDGL_QuantityCompl
 
         #endregion
 
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox5_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid5();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid5_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid5();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid5_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid5();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize5_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid5.PageSize = Convert.ToInt32(ddlPageSize5.SelectedValue);
+            BindGrid5();
+        }
+        #endregion
+
 
         protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
         {
@@ -496,6 +595,13 @@ left join (select PlanNum,RealNum,NextNum,QuantityListId from JDGL_QuantityCompl
                     BindGrid4();
                 }
             }
+            else if (TabStrip1.ActiveTabIndex == 4)
+            {
+                if (this.Grid5.Rows.Count == 0)
+                {
+                    BindGrid5();
+                }
+            }
         }
 
         /// <summary>
@@ -564,6 +670,35 @@ left join (select PlanNum,RealNum,NextNum,QuantityListId from JDGL_QuantityCompl
             PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JDMonthDetail.aspx?projectId={0}&month={1}", projectId, month, "查看明细 - ")));
         }
 
+        /// <summary>
+        /// Grid双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid5_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.ViewDutyPersonDetail();
+        }
+        /// <summary>
+        /// 查看
+        /// </summary>
+        private void ViewDutyPersonDetail()
+        {
+            if (Grid5.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            else if (Grid5.SelectedRowIndexArray.Length > 1)
+            {
+                Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            string userId = Grid5.SelectedRowID;
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JDDutyPersonDetail.aspx?UserId={0}", userId, "查看明细 - ")));
+        }
+
 
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/JD.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/JD.aspx.designer.cs
index b7cc1847..5b4e2377 100644
--- a/SGGL/FineUIPro.Web/DataShow/JD.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/DataShow/JD.aspx.designer.cs
@@ -411,13 +411,85 @@ namespace FineUIPro.Web.DataShow
         protected global::FineUIPro.DropDownList ddlPageSize4;
 
         /// <summary>
-        /// TabOnlineMenuSet 控件。
+        /// Tab5 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Tab TabOnlineMenuSet;
+        protected global::FineUIPro.Tab Tab5;
+
+        /// <summary>
+        /// Grid5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid5;
+
+        /// <summary>
+        /// Toolbar5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar5;
+
+        /// <summary>
+        /// drpDutyPerson5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpDutyPerson5;
+
+        /// <summary>
+        /// Button4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button4;
+
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label4;
+
+        /// <summary>
+        /// ToolbarSeparator5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator5;
+
+        /// <summary>
+        /// ToolbarText5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText5;
+
+        /// <summary>
+        /// ddlPageSize5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize5;
 
         /// <summary>
         /// Window1 控件。
diff --git a/SGGL/FineUIPro.Web/DataShow/JDDutyPersonDetail.aspx b/SGGL/FineUIPro.Web/DataShow/JDDutyPersonDetail.aspx
new file mode 100644
index 00000000..4c77dd56
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/JDDutyPersonDetail.aspx
@@ -0,0 +1,106 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="JDDutyPersonDetail.aspx.cs" Inherits="FineUIPro.Web.DataShow.JDDutyPersonDetail" %>
+
+<!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" />
+    <style type="text/css">
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+
+        .LabelColor {
+            color: Red;
+            font-size: small;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel2" />
+        <f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" Margin="5px" BodyPadding="5px">
+            <Items>
+                <f:Grid ID="Grid1" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false" PageSize="100000"
+                    DataKeyNames="PlanId" DataIDField="PlanId" EnableColumnLines="true" ForceFit="true" AllowCellEditing="true" ClicksToEdit="1" Height="560px">
+                    <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:DropDownList ID="ddlPlanType" runat="server" Label="类型" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPlanType_SelectedIndexChanged">
+                                    <f:ListItem Value="" Text="-请选择-" Selected="true"></f:ListItem>
+                                    <f:ListItem Value="周计划" Text="周计划" Selected="true"></f:ListItem>
+                                    <f:ListItem Value="月计划" Text="月计划"></f:ListItem>
+                                </f:DropDownList>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <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="220px" ColumnID="ProjectName" DataField="ProjectName"
+                            SortField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="center"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="180px" ColumnID="UnitName" DataField="UnitName"
+                            SortField="UnitName" FieldType="String" HeaderText="责任单位" TextAlign="center"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="PlanType" DataField="PlanType"
+                            SortField="PlanType" FieldType="String" HeaderText="计划类型" TextAlign="center"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="280px" ColumnID="Content" DataField="Content"
+                            SortField="Content" FieldType="String" HeaderText="计划工作内容" TextAlign="Center"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" 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="120px" ColumnID="DutyPersonName" DataField="DutyPersonName"
+                            SortField="DutyPersonName" FieldType="String" HeaderText="五环责任人" TextAlign="Center"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="Remark" DataField="Remark"
+                            SortField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                    </Columns>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+    <script type="text/javascript">
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/JDDutyPersonDetail.aspx.cs b/SGGL/FineUIPro.Web/DataShow/JDDutyPersonDetail.aspx.cs
new file mode 100644
index 00000000..9e6a0cd5
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/JDDutyPersonDetail.aspx.cs
@@ -0,0 +1,139 @@
+using BLL;
+using NPOI.SS.Formula.Functions;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class JDDutyPersonDetail : PageBase
+    {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string UserId
+        {
+            get
+            {
+                return (string)ViewState["UserId"];
+            }
+            set
+            {
+                ViewState["UserId"] = value;
+            }
+        }
+        #endregion
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.UserId = Request.Params["UserId"];
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 加载Grid
+        /// </summary>
+        private void BindGrid()
+        {
+            if (!string.IsNullOrWhiteSpace(this.UserId))
+            {
+                DataTable tb = BindData();
+                Grid1.RecordCount = tb.Rows.Count;
+                //tb = GetFilteredTable(Grid1.FilteredData, tb);
+                var table = this.GetPagedDataTable(Grid1, tb);
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+            }
+        }
+
+        /// <summary>
+        /// 加载数据
+        /// </summary>
+        /// <returns></returns>
+        private DataTable BindData()
+        {
+            string strSql = $@"with tba as(
+select '周计划' as PlanType,WeekPlanId as PlanId,pro.ProjectName,u.UnitName,case mp.IsOK when 1 then '已完成' when 0 then '未完成' else '' end as IsOKStr,PlanDate,uw.UnitWorkName +'|'+cn.ProfessionalName+'|'+WorkContent as Content,DutyPerson
+--,convert(varchar(100),mp.StartDate,23) +'至'+convert(varchar(100),mp.EndDate,23) as zhouqi
+,DutyPersonName = STUFF((SELECT ',' + p.UserName FROM dbo.Sys_User as p where PATINDEX('%,' + RTRIM(p.UserId) + ',%', ',' + mp.DutyPerson + ',') > 0 FOR XML PATH('')), 1, 1,'') 
+from JDGL_WeekPlan as mp
+left join Base_Project as pro on pro.ProjectId=mp.ProjectId
+left join Base_Unit as u on u.UnitId=mp.UnitId
+left join WBS_UnitWork uw on uw.UnitWorkId=mp.UnitWork
+left join Base_CNProfessional cn on cn.CNProfessionalId=mp.Major
+union all
+select '月计划',MonthPlanId,pro.ProjectName,u.UnitName,case mp.IsOK when 1 then '已完成' when 0 then '未完成' else '' end as IsOKStr,PlanDate,NodeContent,DutyPerson
+--,convert(varchar(100),Months,23)+'至'+convert(varchar(100),EOMONTH(Months) ,23)
+,DutyPersonName = STUFF((SELECT ',' + p.UserName FROM dbo.Sys_User as p where PATINDEX('%,' + RTRIM(p.UserId) + ',%', ',' + mp.DutyPerson + ',') > 0 FOR XML PATH('')), 1, 1,'') 
+from JDGL_MonthPlan mp
+left join Base_Project as pro on pro.ProjectId=mp.ProjectId
+left join Base_Unit as u on u.UnitId=mp.UnitId
+)
+select * 
+from tba 
+where DutyPerson like '%{this.UserId}%' ";//order by PlanDate desc
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            //listStr.Add(new SqlParameter("@UserId", this.UserId));
+            if (!string.IsNullOrWhiteSpace(this.ddlPlanType.SelectedValue))
+            {
+                strSql += " and PlanType = @PlanType";
+                listStr.Add(new SqlParameter("@PlanType", this.ddlPlanType.SelectedValue));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            return tb;
+        }
+
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox2_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+
+        /// <summary>
+        /// 类型选择触发事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPlanType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        #endregion
+
+
+
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/JDDutyPersonDetail.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/JDDutyPersonDetail.aspx.designer.cs
new file mode 100644
index 00000000..f814df92
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/JDDutyPersonDetail.aspx.designer.cs
@@ -0,0 +1,80 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class JDDutyPersonDetail
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel2;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// ddlPlanType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPlanType;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 90175c65..4af78c2e 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -707,6 +707,7 @@
     <Content Include="DataShow\InspectionManagement.aspx" />
     <Content Include="DataShow\InspectionManagementItem.aspx" />
     <Content Include="DataShow\JDStatistics.aspx" />
+    <Content Include="DataShow\JDDutyPersonDetail.aspx" />
     <Content Include="DataShow\JDWeekDetail.aspx" />
     <Content Include="DataShow\JDMonthDetail.aspx" />
     <Content Include="DataShow\JD.aspx" />
@@ -9363,6 +9364,13 @@
     <Compile Include="DataShow\JDStatistics.aspx.designer.cs">
       <DependentUpon>JDStatistics.aspx</DependentUpon>
     </Compile>
+    <Compile Include="DataShow\JDDutyPersonDetail.aspx.cs">
+      <DependentUpon>JDDutyPersonDetail.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\JDDutyPersonDetail.aspx.designer.cs">
+      <DependentUpon>JDDutyPersonDetail.aspx</DependentUpon>
+    </Compile>
     <Compile Include="DataShow\JDWeekDetail.aspx.cs">
       <DependentUpon>JDWeekDetail.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>