diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2022-06-14-001.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-06-14-001.sql new file mode 100644 index 00000000..436b268d --- /dev/null +++ b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-06-14-001.sql @@ -0,0 +1,5 @@ +alter table [dbo].[WBS_CostControl] add PlanStartDate datetime null +alter table [dbo].[WBS_CostControl] add PlanEndDate datetime null +alter table [dbo].[WBS_CostControl] add RealStartDate datetime null +alter table [dbo].[WBS_CostControl] add RealEndDate datetime null +GO \ No newline at end of file diff --git a/SGGL/BLL/JDGL/WBS/CostControlService.cs b/SGGL/BLL/JDGL/WBS/CostControlService.cs index 630a7239..e0d1b599 100644 --- a/SGGL/BLL/JDGL/WBS/CostControlService.cs +++ b/SGGL/BLL/JDGL/WBS/CostControlService.cs @@ -86,6 +86,10 @@ namespace BLL newUP.IsSelected = costControl.IsSelected; newUP.RealPrice = costControl.RealPrice; newUP.PlanPrice = costControl.PlanPrice; + newUP.PlanStartDate = costControl.PlanStartDate; + newUP.PlanEndDate = costControl.PlanEndDate; + newUP.RealStartDate = costControl.RealStartDate; + newUP.RealEndDate = costControl.RealEndDate; db.SubmitChanges(); } diff --git a/SGGL/BLL/JDGL/WBS/WorkloadStatisticsService.cs b/SGGL/BLL/JDGL/WBS/WorkloadStatisticsService.cs index d5d6e533..3f7f6c3e 100644 --- a/SGGL/BLL/JDGL/WBS/WorkloadStatisticsService.cs +++ b/SGGL/BLL/JDGL/WBS/WorkloadStatisticsService.cs @@ -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);//本月完成预算 diff --git a/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx b/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx index bc4379c8..e42531bd 100644 --- a/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx +++ b/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx @@ -5,12 +5,12 @@