From d7504526a4aa3b2456b0007a8d0ae786d67b0f5e Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Mon, 17 Feb 2025 12:15:10 +0800
Subject: [PATCH] =?UTF-8?q?1=E7=A7=BB=E4=BA=A4=E5=AD=90=E8=A1=A8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj           |  2 +-
 .../Transfer/CivilStructureDataIn.aspx.cs         |  8 ++++----
 .../Transfer/CivilStructureEdit.aspx.cs           | 10 +++++-----
 .../Transfer/ElectricalDataIn.aspx.cs             |  8 ++++----
 .../FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs |  8 ++++----
 .../Transfer/InstrumentationDataIn.aspx.cs        | 15 ++++++++-------
 .../Transfer/InstrumentationEdit.aspx.cs          |  8 ++++----
 SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs  |  8 ++++----
 SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs    |  8 ++++----
 .../Transfer/RotatingEquipmentDataIn.aspx.cs      |  8 ++++----
 .../Transfer/RotatingEquipmentEdit.aspx.cs        |  8 ++++----
 .../Transfer/StaticEquipmentDataIn.aspx.cs        |  8 ++++----
 .../Transfer/StaticEquipmentEdit.aspx.cs          |  8 ++++----
 SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs |  8 ++++----
 SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs   |  8 ++++----
 SGGL/FineUIPro.Web/Web.config                     |  4 ++--
 16 files changed, 64 insertions(+), 63 deletions(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index b937cbb9..d84e1613 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19357,7 +19357,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
index a861d1e4..a23dc766 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
@@ -363,16 +363,16 @@ namespace FineUIPro.Web.Transfer
                         continue;
                     }
 
-                    //如果全是NA或Not Start 就是 Not Start
-                    if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 2)
+                    //如果全是NA或Not Start、空 就是 Not Start
+                    if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 2)
                     {
                         model.FINAL_Status = "Not Start";
                         list.Add(model);
                         continue;
                     }
 
-                    //如果其中有一项是In progress 或Not Start 是 In progress
-                    if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+                    //如果其中有一项是In progress 或Not Start、空 是 In progress
+                    if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
                     {
                         model.FINAL_Status = "In progress";
                         list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
index 5567e948..cd60eaf1 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
@@ -118,15 +118,15 @@ namespace FineUIPro.Web.Transfer
             if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 2)
             {
                 model.FINAL_Status = "Completed";
-            } 
-            //如果全是NA或Not Start 就是 Not Start
-            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 2)
+            }
+            //如果全是NA或Not Start、空 就是 Not Start
+            else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 2)
             {
                 model.FINAL_Status = "Not Start";
             }
 
-            //如果其中有一项是In progress 或Not Start 是 In progress
-            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            //如果其中有一项是In progress 或Not Start、空 是 In progress
+            else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
             {
                 model.FINAL_Status = "In progress";
             }
diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
index cf3d0f67..0e6cddf0 100644
--- a/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
@@ -359,16 +359,16 @@ namespace FineUIPro.Web.Transfer
                         continue;
                     }
 
-                    //如果全是NA或Not Start 就是 Not Start
-                    if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4)
+                    //如果全是NA或Not Start、空 就是 Not Start
+                    if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 4)
                     {
                         model.FINAL_Status = "Not Start";
                         list.Add(model);
                         continue;
                     }
 
-                    //如果其中有一项是In progress 或Not Start 是 In progress
-                    if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+                    //如果其中有一项是In progress 或Not Start、空 是 In progress
+                    if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
                     {
                         model.FINAL_Status = "In progress";
                         list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs
index c0d55cb5..57e20d1d 100644
--- a/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs
@@ -105,14 +105,14 @@ namespace FineUIPro.Web.Transfer
             {
                 model.FINAL_Status = "Completed";
             }
-            //如果全是NA或Not Start 就是 Not Start
-            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4)
+            //如果全是NA或Not Start、空 就是 Not Start
+            else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 4)
             {
                 model.FINAL_Status = "Not Start";
             }
 
-            //如果其中有一项是In progress 或Not Start 是 In progress
-            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            //如果其中有一项是In progress 或Not Start、空 是 In progress
+            else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
             {
                 model.FINAL_Status = "In progress";
             }
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
index 6c49a26f..dcae326e 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
@@ -316,7 +316,8 @@ namespace FineUIPro.Web.Transfer
                 {
                     Sn = 1000;
                 }
-                else {
+                else
+                {
                     Sn = snModel.SN;
                 }
                 for (int i = 1; i < ir; i++)
@@ -329,7 +330,7 @@ namespace FineUIPro.Web.Transfer
                         //if (modelOnly == null)
                         //{
                         Model.Transfer_Instrumentation model = new Model.Transfer_Instrumentation();
-                        model.Descriptions= pds.Rows[i][1].ToString().Trim();
+                        model.Descriptions = pds.Rows[i][1].ToString().Trim();
                         model.Id = Guid.NewGuid().ToString();
                         model.ProjectId = CurrUser.LoginProjectId;
 
@@ -337,7 +338,7 @@ namespace FineUIPro.Web.Transfer
                         model.SN = Sn;
 
                         model.INSTRUMENTATION = pds.Rows[i][0].ToString().Trim();
-                        model.SystemName = pds.Rows[i][1+1].ToString().Trim();
+                        model.SystemName = pds.Rows[i][1 + 1].ToString().Trim();
                         model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
                         model.Test_Package = pds.Rows[i][3 + 1].ToString().Trim();
 
@@ -370,16 +371,16 @@ namespace FineUIPro.Web.Transfer
                             continue;
                         }
 
-                        //如果全是NA或Not Start 就是 Not Start
-                        if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
+                        //如果全是NA或Not Start、空 就是 Not Start
+                        if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 3)
                         {
                             model.FINAL_Status = "Not Start";
                             list.Add(model);
                             continue;
                         }
 
-                        //如果其中有一项是In progress 或Not Start 是 In progress
-                        if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+                        //如果其中有一项是In progress 或Not Start、空 是 In progress
+                        if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
                         {
                             model.FINAL_Status = "In progress";
                             list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
index 0c2908a8..ae95b202 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
@@ -111,14 +111,14 @@ namespace FineUIPro.Web.Transfer
             {
                 model.FINAL_Status = "Completed";
             }
-            //如果全是NA或Not Start 就是 Not Start
-            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
+            //如果全是NA或Not Start、空 就是 Not Start
+            else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 3)
             {
                 model.FINAL_Status = "Not Start";
             }
 
-            //如果其中有一项是In progress 或Not Start 是 In progress
-            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            //如果其中有一项是In progress 或Not Start、空 是 In progress
+            else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
             {
                 model.FINAL_Status = "In progress";
             }
diff --git a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
index feb1e395..9ae6fd66 100644
--- a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
@@ -414,16 +414,16 @@ namespace FineUIPro.Web.Transfer
                         continue;
                     }
 
-                    //如果全是NA或Not Start 就是 Not Start
-                    if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
+                    //如果全是NA或Not Start、空 就是 Not Start
+                    if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 3)
                     {
                         model.FINALStatus = "Not Start";
                         list.Add(model);
                         continue;
                     }
 
-                    //如果其中有一项是In progress 或Not Start 是 In progress
-                    if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+                    //如果其中有一项是In progress 或Not Start、空 是 In progress
+                    if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
                     {
                         model.FINALStatus = "In progress";
                         list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
index 6bc7cad4..10073287 100644
--- a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
@@ -147,14 +147,14 @@ namespace FineUIPro.Web.Transfer
                 model.FINALStatus = "Completed";
 
             }
-            //如果全是NA或Not Start 就是 Not Start
-            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
+            //如果全是NA或Not Start、空 就是 Not Start
+            else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 3)
             {
                 model.FINALStatus = "Not Start";
 
             }
-            //如果其中有一项是In progress 或Not Start 是 In progress
-            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            //如果其中有一项是In progress 或Not Start、空 是 In progress
+            else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
             {
                 model.FINALStatus = "In progress";
             }
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
index 092a4066..8336a438 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
@@ -355,16 +355,16 @@ namespace FineUIPro.Web.Transfer
                         continue;
                     }
 
-                    //如果全是NA或Not Start 就是 Not Start
-                    if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4)
+                    //如果全是NA或Not Start、空 就是 Not Start
+                    if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 4)
                     {
                         model.MechanicalFINALStatus = "Not Start";
                         list.Add(model);
                         continue;
                     }
 
-                    //如果其中有一项是In progress 或Not Start 是 In progress
-                    if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+                    //如果其中有一项是In progress 或Not Start、空 是 In progress
+                    if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
                     {
                         model.MechanicalFINALStatus = "In progress";
                         list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs
index d14aff58..50194a95 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs
@@ -103,14 +103,14 @@ namespace FineUIPro.Web.Transfer
             {
                 model.MechanicalFINALStatus = "Completed";
             }
-            //如果全是NA或Not Start 就是 Not Start
-            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4)
+            //如果全是NA或Not Start、空 就是 Not Start
+            else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 4)
             {
                 model.MechanicalFINALStatus = "Not Start";
             }
 
-            //如果其中有一项是In progress 或Not Start 是 In progress
-            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            //如果其中有一项是In progress 或Not Start、空 是 In progress
+            else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
             {
                 model.MechanicalFINALStatus = "In progress";
             }
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
index 73662662..550c500a 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
@@ -353,16 +353,16 @@ namespace FineUIPro.Web.Transfer
                         continue;
                     }
 
-                    //如果全是NA或Not Start 就是 Not Start
-                    if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
+                    //如果全是NA或Not Start、空 就是 Not Start
+                    if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 3)
                     {
                         model.MechanicalFINALStatus = "Not Start";
                         list.Add(model);
                         continue;
                     }
 
-                    //如果其中有一项是In progress 或Not Start 是 In progress
-                    if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+                    //如果其中有一项是In progress 或Not Start、空 是 In progress
+                    if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
                     {
                         model.MechanicalFINALStatus = "In progress";
                         list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs
index 3bf9c95a..a88d0e96 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs
@@ -101,14 +101,14 @@ namespace FineUIPro.Web.Transfer
             {
                 model.MechanicalFINALStatus = "Completed";
             }
-            //如果全是NA或Not Start 就是 Not Start
-            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
+            //如果全是NA或Not Start、空 就是 Not Start
+            else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 3)
             {
                 model.MechanicalFINALStatus = "Not Start";
             }
 
-            //如果其中有一项是In progress 或Not Start 是 In progress
-            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            //如果其中有一项是In progress 或Not Start、空 是 In progress
+            else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
             {
                 model.MechanicalFINALStatus = "In progress";
             }
diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
index e2c770aa..a8da5128 100644
--- a/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
@@ -359,16 +359,16 @@ namespace FineUIPro.Web.Transfer
                             continue;
                         }
 
-                        //如果全是NA或Not Start 就是 Not Start
-                        if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4)
+                        //如果全是NA或Not Start、空 就是 Not Start
+                        if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 4)
                         {
                             model.FINAL_Status = "Not Start";
                             list.Add(model);
                             continue;
                         }
 
-                        //如果其中有一项是In progress 或Not Start 是 In progress
-                        if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+                        //如果其中有一项是In progress、空 或Not Start 是 In progress
+                        if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
                         {
                             model.FINAL_Status = "In progress";
                             list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs
index b211854b..dbb1f0af 100644
--- a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs
@@ -103,13 +103,13 @@ namespace FineUIPro.Web.Transfer
             {
                 model.FINAL_Status = "Completed";
             }
-            //如果全是NA或Not Start 就是 Not Start
-            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4)
+            //如果全是NA或Not Start、空 就是 Not Start
+            else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 4)
             {
                 model.FINAL_Status = "Not Start";
             }
-            //如果其中有一项是In progress 或Not Start 是 In progress
-            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            //如果其中有一项是In progress 或Not Start、空 是 In progress
+            else if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
             {
                 model.FINAL_Status = "In progress";
             }
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 3821db51..51fdae87 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="true" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>