lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/lpf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
夏菊 2025-04-01 18:01:19 +08:00
parent b3fba6dc01 1d8c520e3c
commit 8d98e92167
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SGGL/FineUIPro.Web/DataShow/JD.aspx
View File

@ -94,6 +94,9 @@
<f:DropDownList ID="drpProject2" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right" <f:DropDownList ID="drpProject2" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
EnableEdit="true" OnSelectedIndexChanged="TextBox2_TextChanged" AutoPostBack="true"> EnableEdit="true" OnSelectedIndexChanged="TextBox2_TextChanged" AutoPostBack="true">
</f:DropDownList> </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:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="Button1" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();"> <f:Button ID="Button1" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button> </f:Button>
@ -165,6 +168,9 @@
<f:DropDownList ID="drpProject3" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right" <f:DropDownList ID="drpProject3" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
EnableEdit="true" OnSelectedIndexChanged="TextBox3_TextChanged" AutoPostBack="true"> EnableEdit="true" OnSelectedIndexChanged="TextBox3_TextChanged" AutoPostBack="true">
</f:DropDownList> </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:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="Button2" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();"> <f:Button ID="Button2" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button> </f:Button>

22
SGGL/FineUIPro.Web/DataShow/JD.aspx.cs
View File

@ -21,7 +21,9 @@ namespace FineUIPro.Web.DataShow
ddlPageSize3.SelectedValue = Grid3.PageSize.ToString(); ddlPageSize3.SelectedValue = Grid3.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitProjectDropDownList(this.drpProject2, true); BLL.ProjectService.InitProjectDropDownList(this.drpProject2, true);
BLL.UserService.InitSGBUser(this.drpDutyPerson2, true);
BLL.ProjectService.InitProjectDropDownList(this.drpProject3, true); BLL.ProjectService.InitProjectDropDownList(this.drpProject3, true);
BLL.UserService.InitSGBUser(this.drpDutyPerson3, true);
BindGrid1(); BindGrid1();
} }
} }
@ -106,9 +108,19 @@ left join (
{ {
double planNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId).Count(); double planNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId).Count();
double completedNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId && x.RealDate != null).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 rate = planNum > 0 ? Math.Round((completedNum / planNum) * 100, 2) : 0;
double totalPlanNum = allPlans.Where(x => x.ProjectId == item.ProjectId).Count(); double totalPlanNum = allPlans.Where(x => x.ProjectId == item.ProjectId).Count();
double totalCompletedNum = allPlans.Where(x => x.ProjectId == item.ProjectId && x.RealDate != null).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; double totalRate = totalPlanNum > 0 ? Math.Round((totalCompletedNum / totalPlanNum) * 100, 2) : 0;
DataRow row; DataRow row;
row = tb.NewRow(); row = tb.NewRow();
@ -168,10 +180,20 @@ left join (
{ {
planNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.WeekNo == lastWeek.WeekNo).Count(); 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(); 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; rate = planNum > 0 ? Math.Round((completedNum / planNum) * 100, 2) : 0;
} }
double totalPlanNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId).Count(); double totalPlanNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId).Count();
double totalCompletedNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.IsOK == true).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; double totalRate = totalPlanNum > 0 ? Math.Round((totalCompletedNum / totalPlanNum) * 100, 2) : 0;
DataRow row; DataRow row;
row = tb.NewRow(); row = tb.NewRow();

18
SGGL/FineUIPro.Web/DataShow/JD.aspx.designer.cs generated
View File

@ -165,6 +165,15 @@ namespace FineUIPro.Web.DataShow {
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpProject2; protected global::FineUIPro.DropDownList drpProject2;
/// <summary>
/// drpDutyPerson2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDutyPerson2;
/// <summary> /// <summary>
/// Button1 控件。 /// Button1 控件。
/// </summary> /// </summary>
@ -246,6 +255,15 @@ namespace FineUIPro.Web.DataShow {
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpProject3; protected global::FineUIPro.DropDownList drpProject3;
/// <summary>
/// drpDutyPerson3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDutyPerson3;
/// <summary> /// <summary>
/// Button2 控件。 /// Button2 控件。
/// </summary> /// </summary>