From 36513a17e180363fef4a081146df48d2b830cf82 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 1 Apr 2025 11:14:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E7=BB=9F=E8=AE=A1=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=B4=A3=E4=BB=BB=E4=BA=BA=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/DataShow/JD.aspx           |  6 +++++
 SGGL/FineUIPro.Web/DataShow/JD.aspx.cs        | 22 +++++++++++++++++++
 .../DataShow/JD.aspx.designer.cs              | 18 +++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/SGGL/FineUIPro.Web/DataShow/JD.aspx b/SGGL/FineUIPro.Web/DataShow/JD.aspx
index 5c6718d2..0d89ccf9 100644
--- a/SGGL/FineUIPro.Web/DataShow/JD.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/JD.aspx
@@ -94,6 +94,9 @@
                                                 <f:DropDownList ID="drpProject2" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
                                                     EnableEdit="true" OnSelectedIndexChanged="TextBox2_TextChanged" AutoPostBack="true">
                                                 </f:DropDownList>
+                                                <f:DropDownList ID="drpDutyPerson2" runat="server" Label="责任人" Width="250px" LabelWidth="80px" LabelAlign="Right"
+                                                    EnableEdit="true" OnSelectedIndexChanged="TextBox2_TextChanged" AutoPostBack="true">
+                                                </f:DropDownList>
                                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                                 <f:Button ID="Button1" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                                 </f:Button>
@@ -165,6 +168,9 @@
                                                 <f:DropDownList ID="drpProject3" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
                                                     EnableEdit="true" OnSelectedIndexChanged="TextBox3_TextChanged" AutoPostBack="true">
                                                 </f:DropDownList>
+                                                <f:DropDownList ID="drpDutyPerson3" runat="server" Label="责任人" Width="250px" LabelWidth="80px" LabelAlign="Right"
+                                                    EnableEdit="true" OnSelectedIndexChanged="TextBox3_TextChanged" AutoPostBack="true">
+                                                </f:DropDownList>
                                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                                 <f:Button ID="Button2" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
                                                 </f:Button>
diff --git a/SGGL/FineUIPro.Web/DataShow/JD.aspx.cs b/SGGL/FineUIPro.Web/DataShow/JD.aspx.cs
index 7af14e89..3d9c3d05 100644
--- a/SGGL/FineUIPro.Web/DataShow/JD.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/JD.aspx.cs
@@ -21,7 +21,9 @@ namespace FineUIPro.Web.DataShow
                 ddlPageSize3.SelectedValue = Grid3.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);
                 BindGrid1();
             }
         }
@@ -106,9 +108,19 @@ left join (
             {
                 double planNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId).Count();
                 double completedNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId && x.RealDate != null).Count();
+                if (this.drpDutyPerson2.SelectedValue != BLL.Const._Null)
+                {
+                    planNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson2.SelectedValue)).Count();
+                    completedNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson2.SelectedValue) && x.RealDate != null).Count();
+                }
                 double rate = planNum > 0 ? Math.Round((completedNum / planNum) * 100, 2) : 0;
                 double totalPlanNum = allPlans.Where(x => x.ProjectId == item.ProjectId).Count();
                 double totalCompletedNum = allPlans.Where(x => x.ProjectId == item.ProjectId && x.RealDate != null).Count();
+                if (this.drpDutyPerson2.SelectedValue != BLL.Const._Null)
+                {
+                    totalPlanNum = allPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson2.SelectedValue)).Count();
+                    totalCompletedNum = allPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson2.SelectedValue) && x.RealDate != null).Count();
+                }
                 double totalRate = totalPlanNum > 0 ? Math.Round((totalCompletedNum / totalPlanNum) * 100, 2) : 0;
                 DataRow row;
                 row = tb.NewRow();
@@ -168,10 +180,20 @@ left join (
                 {
                     planNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.WeekNo == lastWeek.WeekNo).Count();
                     completedNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.WeekNo == lastWeek.WeekNo && x.IsOK == true).Count();
+                    if (this.drpDutyPerson3.SelectedValue != BLL.Const._Null)
+                    {
+                        planNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson3.SelectedValue) && x.WeekNo == lastWeek.WeekNo).Count();
+                        completedNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson3.SelectedValue) && x.WeekNo == lastWeek.WeekNo && x.IsOK == true).Count();
+                    }
                     rate = planNum > 0 ? Math.Round((completedNum / planNum) * 100, 2) : 0;
                 }
                 double totalPlanNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId).Count();
                 double totalCompletedNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.IsOK == true).Count();
+                if (this.drpDutyPerson3.SelectedValue != BLL.Const._Null)
+                {
+                    totalPlanNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson3.SelectedValue)).Count();
+                    totalCompletedNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson3.SelectedValue) && x.IsOK == true).Count();
+                }
                 double totalRate = totalPlanNum > 0 ? Math.Round((totalCompletedNum / totalPlanNum) * 100, 2) : 0;
                 DataRow row;
                 row = tb.NewRow();
diff --git a/SGGL/FineUIPro.Web/DataShow/JD.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/JD.aspx.designer.cs
index a9b134ba..ea82c346 100644
--- a/SGGL/FineUIPro.Web/DataShow/JD.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/DataShow/JD.aspx.designer.cs
@@ -165,6 +165,15 @@ namespace FineUIPro.Web.DataShow {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProject2;
         
+        /// <summary>
+        /// drpDutyPerson2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpDutyPerson2;
+        
         /// <summary>
         /// Button1 控件。
         /// </summary>
@@ -246,6 +255,15 @@ namespace FineUIPro.Web.DataShow {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProject3;
         
+        /// <summary>
+        /// drpDutyPerson3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpDutyPerson3;
+        
         /// <summary>
         /// Button2 控件。
         /// </summary>