1

2025-08-01 09:56:48 +08:00
parent 404ab72e55
commit d634dbd732
7 changed files with 194 additions and 131 deletions
@@ -592,6 +592,7 @@ namespace BLL
            var subdivisionalWorksNuTask = CQMSDataService.GetSubdivisionalWorksNumAsync(); //获取分项工程个数
            var inspectionLotNumTask = CQMSDataService.GetInspectionLotNumAsync(); //获取检验批个数
            var constructSolutionTask = CQMSDataService.GetConstructSolutionAsync(); //施工方案数量
+            var comprehensiveMajorPlanTask = CQMSDataService.GetComprehensive_MajorPlanApprovalAsync(); //危大工程、超危大工程施工方案数量
            var cqmsProblemTask = CQMSDataService.GetCQMSProblemAsync(); //获取企业级、项目级质量问题
            var cqmsBranchMajorCheckTask = CQMSDataService.GetBranchMajorCheckAsync(); //获取分支机构质量大检查次数
            var cqmsCompanyMajorCheckTask = CQMSDataService.GetCompanyMajorCheckAsync(); //获取企业质量大检查次数
@@ -621,7 +622,7 @@ namespace BLL
                inspectionEquipmentTask, inspectionPersonTask, inspectionMachineTask,
                useNumTask, okNumTask,
                singleProjectNumTask, unitProjectNumTask, subProjectNuTask, subdivisionalWorksNuTask, inspectionLotNumTask,
-                constructSolutionTask,
+                constructSolutionTask, comprehensiveMajorPlanTask,
                cqmsProblemTask, cqmsBranchMajorCheckTask, cqmsCompanyMajorCheckTask,
                keyProcessNumTask, keyProcessOKNumTask, specialProcessNumTask, specialProcessOKNumTask, concealedWorksNumTask, concealedWorksOKNumTask,
                unitProjectAcceptNumTask, unitProjectAcceptOKNumTask, subProjectAcceptNumTask, subProjectAcceptOKNumTask, subdivisionalWorksAcceptNumTask, subdivisionalWorksAcceptOKNumTask,
@@ -651,6 +652,7 @@ namespace BLL
            var inspectionLotNum = await inspectionLotNumTask;

            var constructSolutionList = await constructSolutionTask;
+            var comprehensiveMajorPlanList = await comprehensiveMajorPlanTask;
            var cqmsProblemList = await cqmsProblemTask;
            var cqmsBranchMajorCheckList = await cqmsBranchMajorCheckTask;
            var cqmsCompanyMajorCheckList = await cqmsCompanyMajorCheckTask;
@@ -692,7 +694,7 @@ namespace BLL
                EquipmentInspectionNum = inspectionEquipmentList.Count(),
                EquipmentInspectionQualifiedNum = inspectionEquipmentList.Count(),
                PersonInspectionNum = inspectionPersonList.Count(),
-                PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.ValidityDate == null || (x.ValidityDate.HasValue && x.ValidityDate >= DateTime.Now)).Count(),
+                PersonInspectionQualifiedNum = inspectionPersonList.Count(),
                MachineInspectionNum = inspectionMachineList.Count(),
                MachineInspectionQualifiedNum = inspectionMachineList.Where(x => x.IsCheckCertificate == true).Count(),

@@ -708,7 +710,7 @@ namespace BLL

                ConstructSolutionNum = constructSolutionList.Count(),
                ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.State == "1").Count(),
-                ConstructSolutionUnitApproveNum = 0,//
+                ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(),
                SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(),
                DesignDetailsNum = technicalDisclosePersonList.Sum(x => x.TrainPersonNum),

@@ -765,7 +767,7 @@ namespace BLL
                    EquipmentInspectionNum = inspectionEquipmentList.Count(x => x.ProjectId == projectid),
                    EquipmentInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.ProjectId == projectid).Count(),
                    PersonInspectionNum = inspectionPersonList.Count(x => x.ProjectId == projectid),
-                    PersonInspectionQualifiedNum = inspectionPersonList.Where(x => (x.ValidityDate == null || (x.ValidityDate.HasValue && x.ValidityDate >= DateTime.Now)) && x.ProjectId == projectid).Count(),
+                    PersonInspectionQualifiedNum = inspectionPersonList.Count(x => x.ProjectId == projectid),
                    MachineInspectionNum = inspectionMachineList.Count(x => x.ProjectId == projectid),
                    MachineInspectionQualifiedNum = inspectionMachineList.Where(x => x.IsCheckCertificate == true && x.ProjectId == projectid).Count(),
                    MaterialInspectionNum = 0,
@@ -780,7 +782,7 @@ namespace BLL

                    ConstructSolutionNum = constructSolutionList.Count(x => x.ProjectId == projectid),
                    ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.State == "1" && x.ProjectId == projectid).Count(),
-                    ConstructSolutionUnitApproveNum = 0,//
+                    ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(x => x.ProjectId == projectid),
                    SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(x => x.ProjectId == projectid),
                    DesignDetailsNum = technicalDisclosePersonList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),

@@ -1210,10 +1212,10 @@ namespace BLL
        /// 获取人员报验
        /// </summary>
        /// <returns></returns>
-        public static List<Model.Comprehensive_InspectionPerson> GetComprehensive_InspectionPerson()
+        public static List<Model.SitePerson_Person> GetComprehensive_InspectionPerson()
        {
-            var result = (from x in Funs.DB.Comprehensive_InspectionPerson
-                          where BeUnderConstructionList.Contains(x.ProjectId) && x.IsOnSite.HasValue && x.IsOnSite == true && x.CompileDate > Const.DtmarkTime
+            var result = (from x in Funs.DB.SitePerson_Person
+                          where BeUnderConstructionList.Contains(x.ProjectId) && x.IsCQMSCheck.HasValue && x.IsCQMSCheck == true
                          select x).ToList();
            return result;
        }
@@ -1222,7 +1224,7 @@ namespace BLL
        /// 获取人员报验(异步)
        /// </summary>
        /// <returns></returns>
-        public static async Task<List<Comprehensive_InspectionPerson>> GetComprehensive_InspectionPersonAsync()
+        public static async Task<List<SitePerson_Person>> GetComprehensive_InspectionPersonAsync()
        {
            return await Task.Run(GetComprehensive_InspectionPerson);
        }
@@ -1423,6 +1425,26 @@ namespace BLL
            return await Task.Run(GetConstructSolution);
        }

+        /// <summary>
+        /// 危大（超危大）工程施工方案数量
+        /// </summary>
+        /// <returns></returns>
+        public static List<Solution_LargerHazard> GetComprehensive_MajorPlanApproval()
+        {
+            var result = (from x in Funs.DB.Solution_LargerHazard
+                          where BeUnderConstructionList.Contains(x.ProjectId)
+                          select x).ToList();
+            return result;
+        }
+        /// <summary>
+        /// 危大（超危大）工程施工方案数量(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<Solution_LargerHazard>> GetComprehensive_MajorPlanApprovalAsync()
+        {
+            return await Task.Run(GetComprehensive_MajorPlanApproval);
+        }
+
        /// <summary>
        /// 获取施工技术交底
        /// </summary>