From 579525b16881756eaf7084601936c54344fbafee Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 7 Mar 2025 09:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj    |  2 +-
 SGGL/FineUIPro.Web/common/main_new.aspx.cs | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 5d9a4f90..d6cd8ab9 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19567,7 +19567,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.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/common/main_new.aspx.cs b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
index a6c9662f..2d1557e8 100644
--- a/SGGL/FineUIPro.Web/common/main_new.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
@@ -1004,17 +1004,19 @@ namespace FineUIPro.Web.common
             var list = new List<Model.Base_Project>();
             if (pids == null)
             {
-                list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null).ToList();
+                list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList();
             }
             else
             {
-                list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId) && x.Progress != null).ToList();
+                list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId)).ToList();
             }
             if (list.Count > 0)
             {
+                var progressCompletions = from x in Funs.DB.JDGL_ProgressCompletion select x;
                 foreach (var item in list)
                 {
-                    ProjectJd += "'" + item.Progress.Value.ToString("0.##") + "',";
+                    var pCs = progressCompletions.Where(x => x.ProjectId == item.ProjectId).ToList();
+                    ProjectJd += "'" + pCs.Sum(x => x.RealNum ?? 0).ToString("0.##") + "',";
                     ProjectMc += "'" + item.ShortName + "',";
                 }
                 ProjectJd = ProjectJd.TrimEnd(',');
@@ -1096,7 +1098,7 @@ namespace FineUIPro.Web.common
             }
             else
             {
-                list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId) && x.Progress != null).ToList();
+                list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId)).ToList();
             }
             var PipelinList = Funs.DB.CLGL_PipelineMaterialSumList.Where(x => x.Type == "M");
             var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "设备");