From db4323726c21e55d7e41a7312495795f96f97e9c Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 19 Jun 2025 21:09:22 +0800
Subject: [PATCH] 1

---
 SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs     |  6 +--
 .../Project_CQMSDataService.cs                | 52 ++++++++++++++++---
 2 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs b/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
index 5f29aad7..468bbb3b 100644
--- a/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
@@ -646,7 +646,7 @@ namespace BLL
             var inspectionLotNum = await inspectionLotNumTask;
 
             var constructSolutionList = await constructSolutionTask;
-            var comprehensiveMajorPlanList = await comprehensiveMajorPlanTask;            
+            var comprehensiveMajorPlanList = await comprehensiveMajorPlanTask;
             var cqmsProblemList = await cqmsProblemTask;
             var cqmsBranchMajorCheckList = await cqmsBranchMajorCheckTask;
             var cqmsCompanyMajorCheckList = await cqmsCompanyMajorCheckTask;
@@ -704,7 +704,7 @@ namespace BLL
                 SubdivisionalWorksNum = subdivisionalWorksNum.Count(),
                 InspectionLotNum = inspectionLotNum.Sum(x => x.Sum),
 
-                ConstructSolutionNum = constructSolutionList.Count(),
+                ConstructSolutionNum = constructSolutionList.Count() + comprehensiveMajorPlanList.Count(),
                 ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.ApprovalDate.HasValue).Count(),
                 ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(),//
                 SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(),
@@ -774,7 +774,7 @@ namespace BLL
                     SubdivisionalWorksNum = subdivisionalWorksNum.Count(x => x.ProjectId == projectid),
                     InspectionLotNum = inspectionLotNum.Where(x => x.ProjectId == projectid).Sum(x => x.Sum),
 
-                    ConstructSolutionNum = constructSolutionList.Count(x => x.ProjectId == projectid),
+                    ConstructSolutionNum = constructSolutionList.Count(x => x.ProjectId == projectid) + comprehensiveMajorPlanList.Count(x => x.ProjectId == projectid),
                     ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.ApprovalDate.HasValue && x.ProjectId == projectid).Count(),
                     ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(x => x.ProjectId == projectid),
                     SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(x => x.ProjectId == projectid),
diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
index 07365c68..0ddf07b4 100644
--- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
@@ -503,9 +503,9 @@ namespace BLL
             }
             if (cQMSDateType == CQMSDateType.ConstructSolution || cQMSDateType == CQMSDateType.All)
             {
-                table.ConstructSolutionNum = GetConstructSolutionNum(projectid);
+                table.ConstructSolutionNum = GetConstructSolutionNum(projectid) + GetComprehensive_MajorPlanApprovalNum(projectid);
                 table.ConstructSolutionProjectApproveNum = GetConstructSolutionProjectApproveNum(projectid);
-                table.ConstructSolutionUnitApproveNum = GetConstructSolutionUnitApproveNum(projectid);
+                table.ConstructSolutionUnitApproveNum = GetComprehensive_MajorPlanApprovalNum(projectid);
             }
             if (cQMSDateType == CQMSDateType.SpecialEquipmentAndDesignDetails || cQMSDateType == CQMSDateType.All)
             {
@@ -1035,7 +1035,7 @@ namespace BLL
         /// <returns></returns>
         public static int GetConstructSolutionNum(string projectid)
         {
-            var result = (from x in Funs.DB.Solution_CQMSConstructSolution
+            var result = (from x in Funs.DB.Comprehensive_GeneralPlanApproval
                           where x.ProjectId == projectid
                           select x).Count();
             return result;
@@ -1047,11 +1047,49 @@ namespace BLL
         /// <returns></returns>
         public static int GetConstructSolutionProjectApproveNum(string projectid)
         {
-            var result = (from x in Funs.DB.Solution_CQMSConstructSolution
-                          where x.ProjectId == projectid && x.State == "1"
+            var result = (from x in Funs.DB.Comprehensive_GeneralPlanApproval
+                          where x.ProjectId == projectid && x.ApprovalDate.HasValue
                           select x).Count();
             return result;
         }
+        ///// <summary>
+        ///// 施工方案数量
+        ///// </summary>
+        ///// <param name="projectid"></param>
+        ///// <returns></returns>
+        //public static int GetConstructSolutionNum(string projectid)
+        //{
+        //    var result = (from x in Funs.DB.Solution_CQMSConstructSolution
+        //                  where x.ProjectId == projectid
+        //                  select x).Count();
+        //    return result;
+        //}
+        ///// <summary>
+        ///// 施工方案数量——项目审批数量
+        ///// </summary>
+        ///// <param name="projectid"></param>
+        ///// <returns></returns>
+        //public static int GetConstructSolutionProjectApproveNum(string projectid)
+        //{
+        //    var result = (from x in Funs.DB.Solution_CQMSConstructSolution
+        //                  where x.ProjectId == projectid && x.State == "1"
+        //                  select x).Count();
+        //    return result;
+        //}
+
+        /// <summary>
+        /// 危大（超危大）工程施工方案数量
+        /// </summary>
+        /// <param name="projectid"></param>
+        /// <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>
@@ -1070,7 +1108,9 @@ namespace BLL
         /// <returns></returns>
         public static int GetSpecialEquipmentQualityAssuranceSystemNum(string projectid)
         {
-            var result = 0;
+            var result = (from x in Funs.DB.Comprehensive_QualityAssurance
+                          where x.ProjectId == projectid
+                          select x).Count();
             return result;
         }