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

0614-进度增加计划和实际开始/完成时间

Browse Source
This commit is contained in:
gaofei
2022-06-14 18:21:58 +08:00
parent 4b19955e26
commit 0d681e07ac
9 changed files with 289 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/JDGL/WBS/WorkloadStatisticsService.cs
+23 -3
View File
@@ -2588,6 +2588,10 @@ namespace BLL
table.Columns.Add(new DataColumn("TotalNum", typeof(String)));
table.Columns.Add(new DataColumn("RealPrice", typeof(String)));
table.Columns.Add(new DataColumn("PlanPrice", typeof(String)));
table.Columns.Add(new DataColumn("PlanStartDate", typeof(DateTime)));
table.Columns.Add(new DataColumn("PlanEndDate", typeof(DateTime)));
table.Columns.Add(new DataColumn("RealStartDate", typeof(DateTime)));
table.Columns.Add(new DataColumn("RealEndDate", typeof(DateTime)));
for (int i = 0; i < months.Count; i++)
{
table.Columns.Add(new DataColumn("PlanNum" + (i + 1).ToString(), typeof(String)));
@@ -2644,6 +2648,22 @@ namespace BLL
{
row[7] = decimal.Round(Convert.ToDecimal(costControl.PlanPrice), 2);//控制预算单价
}
if (costControl.PlanStartDate != null)
{
row[8] = costControl.PlanStartDate;//计划开始时间
}
if (costControl.PlanEndDate != null)
{
row[9] = costControl.PlanEndDate;//计划完成时间
}
if (costControl.RealStartDate != null)
{
row[10] = costControl.RealStartDate;//实际开始时间
}
if (costControl.RealEndDate != null)
{
row[11] = costControl.RealEndDate;//实际完成时间
}
for (int i = 0; i < months.Count; i++)
{
Model.View_WBS_CostControlDetail detail = details.FirstOrDefault(x => x.CostControlId == item.Id && x.Months == months[i]);
@@ -2651,15 +2671,15 @@ namespace BLL
{
if (detail.PlanNum != 0)
{
row[8 + i * 2] = decimal.Round(Convert.ToDecimal(detail.PlanNum), 2);
row[12 + i * 2] = decimal.Round(Convert.ToDecimal(detail.PlanNum), 2);
}
if (detail.ThisNum != 0)
{
row[9 + i * 2] = decimal.Round(Convert.ToDecimal(detail.ThisNum), 2);
row[13 + i * 2] = decimal.Round(Convert.ToDecimal(detail.ThisNum), 2);
}
}
}
row[10 + (months.Count-1) * 2] = item.Id;
row[14 + (months.Count-1) * 2] = item.Id;
//row[10] = decimal.Round(Convert.ToDecimal(detail.ThisRealCost), 2);//本月实际成本
//row[11] = decimal.Round(Convert.ToDecimal(detail.ThisPlanValue), 2);//本月计划完成预算
//row[12] = decimal.Round(Convert.ToDecimal(detail.ThisPlanCost), 2);//本月完成预算