From ccd173e118030dace4ef303874a02ea517b420c0 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 29 Oct 2025 17:04:18 +0800
Subject: [PATCH 1/2] 1

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index aa834918..d49f8b94 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -16839,7 +16839,7 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

From b120986fdc65c7d18fa01ea79d31699ee6b00240 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 31 Oct 2025 19:59:41 +0800
Subject: [PATCH 2/2] 1

---
 SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs | 16 ++++++++--------
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs b/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
index edef4a12..164c348c 100644
--- a/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
@@ -1335,10 +1335,10 @@ namespace BLL
         /// 获取分部工程个数
         /// </summary>
         /// <returns></returns>
-        public static List<WBS_DivisionProject> GetSubProjectNum()
+        public static List<WBS_WorkPackage> GetSubProjectNum()
         {
-            var result = (from x in Funs.DB.WBS_DivisionProject
-                          where BeUnderConstructionList.Contains(x.ProjectId) && x.SubItemType == "1" && x.IsSelected == true
+            var result = (from x in Funs.DB.WBS_WorkPackage
+                          where BeUnderConstructionList.Contains(x.ProjectId) && x.SubItemType == "1" && x.IsApprove == true
                           select x).ToList();
             return result;
         }
@@ -1347,7 +1347,7 @@ namespace BLL
         /// 获取分部工程个数(异步)
         /// </summary>
         /// <returns></returns>
-        public static async Task<List<WBS_DivisionProject>> GetSubProjectNumAsync()
+        public static async Task<List<WBS_WorkPackage>> GetSubProjectNumAsync()
         {
             return await Task.Run(GetSubProjectNum);
         }
@@ -1356,10 +1356,10 @@ namespace BLL
         /// 获取分项工程个数
         /// </summary>
         /// <returns></returns>
-        public static List<WBS_DivisionProject> GetSubdivisionalWorksNum()
+        public static List<WBS_WorkPackage> GetSubdivisionalWorksNum()
         {
-            var result = (from x in Funs.DB.WBS_DivisionProject
-                          where BeUnderConstructionList.Contains(x.ProjectId) && x.SubItemType == "3" && x.IsSelected == true
+            var result = (from x in Funs.DB.WBS_WorkPackage
+                          where BeUnderConstructionList.Contains(x.ProjectId) && x.SubItemType == "3" && x.IsApprove == true
                           select x).ToList();
             return result;
         }
@@ -1368,7 +1368,7 @@ namespace BLL
         /// 获取分项工程个数(异步)
         /// </summary>
         /// <returns></returns>
-        public static async Task<List<WBS_DivisionProject>> GetSubdivisionalWorksNumAsync()
+        public static async Task<List<WBS_WorkPackage>> GetSubdivisionalWorksNumAsync()
         {
             return await Task.Run(GetSubdivisionalWorksNum);
         }
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 2fd4737d..d49f8b94 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -16839,7 +16839,7 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">