From 9fe0dcc0fa59ccac2a97970f08876e1440e36746 Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Thu, 19 Jun 2025 21:09:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=96=BD=E5=B7=A5=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Project_CQMSDataService.cs                | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/SUBQHSE/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs b/SUBQHSE/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
index 4be31fc..5446044 100644
--- a/SUBQHSE/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
+++ b/SUBQHSE/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
@@ -507,9 +507,9 @@ namespace BLL
             }
             if (cQMSDateType == CQMSDateType.ConstructSolution || cQMSDateType == CQMSDateType.All)
             {
-                table.ConstructSolutionNum = GetConstructSolutionNum(projectid);
-                table.ConstructSolutionProjectApproveNum = GetConstructSolutionProjectApproveNum(projectid);
-                table.ConstructSolutionUnitApproveNum = GetConstructSolutionUnitApproveNum(projectid);
+                table.ConstructSolutionNum = GetConstructSolutionNum(projectid) + GetConstructSolutionFinalNum(projectid) + GetComprehensive_MajorPlanApprovalNum(projectid);
+                table.ConstructSolutionProjectApproveNum = GetConstructSolutionProjectApproveNum(projectid) + GetConstructSolutionFinalNum(projectid);
+                table.ConstructSolutionUnitApproveNum = GetComprehensive_MajorPlanApprovalNum(projectid);
             }
             if (cQMSDateType == CQMSDateType.SpecialEquipmentAndDesignDetails || cQMSDateType == CQMSDateType.All)
             {
@@ -535,6 +535,35 @@ namespace BLL
             }
             CQMSDataService.UpdateTodyData_State();
         }
+
+
+
+
+        /// <summary>
+        /// 施工方案数量——定稿方案
+        /// </summary>
+        /// <returns></returns>
+        public static int GetConstructSolutionFinalNum(string projectid)
+        {
+            var result = (from x in Funs.DB.Solution_CQMSConstructSolution_Final
+                          where x.ProjectId == projectid
+                          select x).Count();
+            return result;
+        }
+
+
+        /// <summary>
+        /// 危大（超危大）工程施工方案数量
+        /// </summary>
+        /// <returns></returns>
+        public static int GetComprehensive_MajorPlanApprovalNum(string projectid)
+        {
+            var result = (from x in Funs.DB.Comprehensive_MajorPlanApproval
+                          where x.ProjectId == projectid 
+                          select x).Count();
+            return result;
+        }
+
         /// <summary>
         /// 获取质量培训人次数
         /// </summary>