From 1d6e310edfe8361fdac6555d302c7f1abae6e20b Mon Sep 17 00:00:00 2001
From: gaofei <231232131@163.com>
Date: Mon, 27 Jun 2022 15:36:01 +0800
Subject: [PATCH] =?UTF-8?q?0627-=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E8=B5=A2=E5=BE=97=E5=80=BC=E6=9B=B2=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CostAnalysis/EarnedValueCurve.aspx.cs     | 54 ++++++++++++++++---
 1 file changed, 48 insertions(+), 6 deletions(-)

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
                     {