From 61a2d7c518d5d0ee344a45fd5a4f861c14ebb8fb Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 13 Dec 2023 16:47:03 +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 --- SGGL/BLL/CQMS/WBS/WorkPackageService.cs | 89 ++++++++++++++----- .../JDGL/Check/CompleteInput.aspx | 2 + .../JDGL/Check/CompleteInput.aspx.cs | 9 +- .../JDGL/Check/CompleteInput.aspx.designer.cs | 9 ++ SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx | 2 + SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs | 7 +- .../JDGL/Check/PlanSet.aspx.designer.cs | 9 ++ 7 files changed, 100 insertions(+), 27 deletions(-) diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs index 2c6e85c7..f4e2529d 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs @@ -438,7 +438,7 @@ namespace BLL } } - public static List GetAllTreeDataTable2(string projectId, string IsOut, string startTime, string endTime, string isOK) + public static List GetAllTreeDataTable2(string projectId, string IsOut, string startTime, string endTime, string isOK, string unitWorkId) { using (var db = new Model.SGGLDB(Funs.ConnString)) { @@ -446,22 +446,43 @@ namespace BLL List newList = new List(); if (getWBSs.Count() > 0) { - - var projectTypes = getWBSs.Where(x => x.WBSType == "ProjectType" && x.SupId == "0"); - int a = 1; - foreach (var item in projectTypes) + if (unitWorkId == BLL.Const._Null) { - item.Code = a.ToString(); - newList.Add(item); - if (string.IsNullOrEmpty(IsOut)) + var projectTypes = getWBSs.Where(x => x.WBSType == "ProjectType" && x.SupId == "0"); + int a = 1; + foreach (var item in projectTypes) { - AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime, isOK); + item.Code = a.ToString(); + newList.Add(item); + if (string.IsNullOrEmpty(IsOut)) + { + AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime, isOK); + } + else + { + AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime, isOK); + } + a++; } - else + } + else + { + var unitWork = getWBSs.Where(x => x.Id == unitWorkId); + int a = 1; + foreach (var item in unitWork) { - AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime, isOK); + item.Code = a.ToString(); + newList.Add(item); + if (string.IsNullOrEmpty(IsOut)) + { + AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime, isOK); + } + else + { + AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime, isOK); + } + a++; } - a++; } } return newList; @@ -472,7 +493,7 @@ namespace BLL /// 获取模拟树表格 /// /// - public static DataTable GetAllTreeDataTable(string projectId, string IsOut, string startTime, string endTime, string isOK) + public static DataTable GetAllTreeDataTable(string projectId, string IsOut, string startTime, string endTime, string isOK, string unitWorkId) { using (var db = new Model.SGGLDB(Funs.ConnString)) { @@ -525,21 +546,43 @@ namespace BLL if (getWBSs.Count() > 0) { List newList = new List(); - var projectTypes = getWBSs.Where(x => x.WBSType == "ProjectType" && x.SupId == "0"); - int a = 1; - foreach (var item in projectTypes) + if (unitWorkId == BLL.Const._Null) { - item.Code = a.ToString(); - newList.Add(item); - if (string.IsNullOrEmpty(IsOut)) + var projectTypes = getWBSs.Where(x => x.WBSType == "ProjectType" && x.SupId == "0"); + int a = 1; + foreach (var item in projectTypes) { - AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime, isOK); + item.Code = a.ToString(); + newList.Add(item); + if (string.IsNullOrEmpty(IsOut)) + { + AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime, isOK); + } + else + { + AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime, isOK); + } + a++; } - else + } + else + { + var unitWork = getWBSs.Where(x => x.Id == unitWorkId); + int a = 1; + foreach (var item in unitWork) { - AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime, isOK); + item.Code = a.ToString(); + newList.Add(item); + if (string.IsNullOrEmpty(IsOut)) + { + AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime, isOK); + } + else + { + AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime, isOK); + } + a++; } - a++; } DataRow row; foreach (Model.View_WBS item in newList) diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx index 184daffa..97093cc6 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx @@ -30,6 +30,8 @@ + + <%-- diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs index fdc7db29..8f8769f5 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs @@ -132,6 +132,7 @@ namespace FineUIPro.Web.JDGL.Check { errorInfos = string.Empty; string Id = Request.Params["Id"]; + UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true); BindGrid(); } } @@ -143,7 +144,7 @@ namespace FineUIPro.Web.JDGL.Check private void BindGrid() { - DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, null, null, "0"); + DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, null, null, "0", this.drpUnitWork.SelectedValue); Grid1.RecordCount = table.Rows.Count; var table2 = this.GetPagedDataTable(Grid1, table); Grid1.DataSource = table2; @@ -368,6 +369,12 @@ namespace FineUIPro.Web.JDGL.Check } } #endregion + #endregion + + protected void drpUnitWork_SelectedIndexChanged(object sender, EventArgs e) + { + BindGrid(); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs index c6abcb68..b339451b 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs @@ -66,6 +66,15 @@ namespace FineUIPro.Web.JDGL.Check { /// protected global::FineUIPro.TextBox hdId; + /// + /// drpUnitWork 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitWork; + /// /// btnSave 控件。 /// diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx index 64f0c12f..50c4f16b 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx @@ -45,6 +45,8 @@ + + diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs index f7dfca45..9fb0e14a 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs @@ -21,6 +21,7 @@ namespace FineUIPro.Web.JDGL.Check { if (!IsPostBack) { + UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true); BindGrid(); } } @@ -28,7 +29,7 @@ namespace FineUIPro.Web.JDGL.Check private void BindGrid() { - var table = BLL.WorkPackageService.GetAllTreeDataTable2(this.CurrUser.LoginProjectId, string.Empty,this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim(),this.rblIsOK.SelectedValue); + var table = BLL.WorkPackageService.GetAllTreeDataTable2(this.CurrUser.LoginProjectId, string.Empty, this.txtStartTime.Text.Trim(), this.txtEndTime.Text.Trim(), this.rblIsOK.SelectedValue, this.drpUnitWork.SelectedValue); Grid1.RecordCount = table.Count; var table2 = this.GetPagedDataTable(Grid1, table); Grid1.DataSource = table2; @@ -132,7 +133,7 @@ namespace FineUIPro.Web.JDGL.Check workPackage.JDWeights = Funs.GetNewDecimal(weights); workPackage.Unit = unit; workPackage.PlanProjectQuantity = Funs.GetNewDecimal(planProjectQuantity); - workPackage.DrawProjectQuantity= Funs.GetNewDecimal(drawProjectQuantity); + workPackage.DrawProjectQuantity = Funs.GetNewDecimal(drawProjectQuantity); workPackage.RealProjectQuantity = Funs.GetNewDecimal(realProjectQuantity); workPackage.PlanStartDate = Funs.GetNewDateTime(planStartDate); workPackage.PlanEndDate = Funs.GetNewDateTime(planEndDate); @@ -202,7 +203,7 @@ namespace FineUIPro.Web.JDGL.Check { try { - DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, "Out",this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim(), this.rblIsOK.SelectedValue); + DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, "Out", this.txtStartTime.Text.Trim(), this.txtEndTime.Text.Trim(), this.rblIsOK.SelectedValue, BLL.Const._Null); string projectNmae = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); if (!string.IsNullOrEmpty(projectNmae)) { diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs index 2321028b..d69eda18 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs @@ -93,6 +93,15 @@ namespace FineUIPro.Web.JDGL.Check { /// protected global::FineUIPro.RadioButtonList rblIsOK; + /// + /// drpUnitWork 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitWork; + /// /// btnQuery 控件。 ///