diff --git a/SGGL/FineUIPro.Web/JDGL/CostAnalysis/EarnedValueCurve.aspx.cs b/SGGL/FineUIPro.Web/JDGL/CostAnalysis/EarnedValueCurve.aspx.cs index d9f844c0..b2855fcc 100644 --- a/SGGL/FineUIPro.Web/JDGL/CostAnalysis/EarnedValueCurve.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/CostAnalysis/EarnedValueCurve.aspx.cs @@ -344,7 +344,14 @@ namespace FineUIPro.Web.JDGL.CostAnalysis bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计已完工作预算费用-BCWP"].ToString()); if (bcws == lastbcws) { - dt.Rows[i]["累计计划工作预算费用-BCWS"] = DBNull.Value; + if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString())>DateTime.Now) + { + dt.Rows[i]["累计计划工作预算费用-BCWS"] = DBNull.Value; + } + else + { + dt.Rows[i]["累计计划工作预算费用-BCWS"] = bcws / 10000; + } } else { @@ -352,7 +359,14 @@ namespace FineUIPro.Web.JDGL.CostAnalysis } if (acwp == lastacwp) { - dt.Rows[i]["累计已完工作实际费用-ACWP"] = DBNull.Value; + if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now) + { + dt.Rows[i]["累计已完工作实际费用-ACWP"] = DBNull.Value; + } + else + { + dt.Rows[i]["累计已完工作实际费用-ACWP"] = acwp / 10000; + } } else { @@ -360,7 +374,14 @@ namespace FineUIPro.Web.JDGL.CostAnalysis } if (bcwp == lastbcwp) { - dt.Rows[i]["累计已完工作预算费用-BCWP"] = DBNull.Value; + if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now) + { + dt.Rows[i]["累计已完工作预算费用-BCWP"] = DBNull.Value; + } + else + { + dt.Rows[i]["累计已完工作预算费用-BCWP"] = bcwp / 10000; + } } else { @@ -397,7 +418,14 @@ namespace FineUIPro.Web.JDGL.CostAnalysis bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计已完工作预算费用-BCWP"].ToString()); if (bcws == lastbcws) { - dt.Rows[i]["累计计划工作预算费用-BCWS"] = DBNull.Value; + if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now) + { + dt.Rows[i]["累计计划工作预算费用-BCWS"] = DBNull.Value; + } + else + { + dt.Rows[i]["累计计划工作预算费用-BCWS"] = bcws / 10000; + } } else { @@ -405,7 +433,14 @@ namespace FineUIPro.Web.JDGL.CostAnalysis } if (acwp == lastacwp) { - dt.Rows[i]["累计已完工作实际费用-ACWP"] = DBNull.Value; + if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now) + { + dt.Rows[i]["累计已完工作实际费用-ACWP"] = DBNull.Value; + } + else + { + dt.Rows[i]["累计已完工作实际费用-ACWP"] = acwp / 10000; + } } else { @@ -413,7 +448,14 @@ namespace FineUIPro.Web.JDGL.CostAnalysis } if (bcwp == lastbcwp) { - dt.Rows[i]["累计已完工作预算费用-BCWP"] = DBNull.Value; + if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now) + { + dt.Rows[i]["累计已完工作预算费用-BCWP"] = DBNull.Value; + } + else + { + dt.Rows[i]["累计已完工作预算费用-BCWP"] = bcwp / 10000; + } } else {