fix:升级

2025-06-19 19:23:01 +08:00
parent 0cb37e2c02
commit 7aa8baadbb
111 changed files with 14465 additions and 1480 deletions
@@ -10,7 +10,6 @@ namespace BLL

    public class MainSevice
    {
-
        /// <summary>
        /// 在建项目集合
        /// </summary>
@@ -41,13 +40,13 @@ namespace BLL
            {
                _beUnderConstructionList = new List<string>() { "0" };
            }
-        }

+        }
        public MainSevice(string userid, string projectId)
        {
            var userModel = UserService.GetUserByUserId(userid);
            int unitType = 3;
-            _unitId = userModel.UnitId;
+            _unitId = userModel.UnitId?? "";
            _unitType = unitType;
            _beUnderConstructionList = new List<string>() { projectId };
        }
@@ -60,8 +59,6 @@ namespace BLL
        {
            try
            {
-
-
                // 并行执行异步方法
                var totalEnergyConsumptionTask = ChemicalReportItemService.GetLatstTimeTotalEnergyConsumption();
                var incomeComprehensiveEnergyConsumptionTask = ChemicalReportItemService.GetLatstTimeIncomeComprehensiveEnergyConsumption();
@@ -84,6 +81,7 @@ namespace BLL
                var safeTrainTask = HSSEData_HSSEService.GetSafeTrainAsync();
                var specialTrainTask = HSSEData_HSSEService.GetSpecialTrainAsync();
                var specialOperationTrainTask = HSSEData_HSSEService.GetSpecialOperationTrainAsync();
+                var hseTechnicalTask = HSSEData_HSSEService.GetHseTechnicalAsync();
                var headOfficeInspectorGeneralTask = HSSEData_HSSEService.GetHeadOfficeInspectorGeneralAsync();
                var headOfficeFullTimeTask = HSSEData_HSSEService.GetHeadOfficeFullTimeAsync();
                var branchInspectorGeneralTask = HSSEData_HSSEService.GetBranchInspectorGeneralAsync();
@@ -141,7 +139,7 @@ namespace BLL
                    safeWorkingHourTask,
                    safeTrainTask,
                    specialTrainTask,
-                    specialOperationTrainTask,
+                    specialOperationTrainTask, hseTechnicalTask,
                    headOfficeInspectorGeneralTask,
                    headOfficeFullTimeTask,
                    branchInspectorGeneralTask,
@@ -202,6 +200,7 @@ namespace BLL
                var safeTrainList = await safeTrainTask;
                var specialTrainList = await specialTrainTask;
                var specialOperationTrainList = await specialOperationTrainTask;
+                var hseTechnicalList = await hseTechnicalTask;
                var headOfficeInspectorGeneralList = await headOfficeInspectorGeneralTask;
                var headOfficeFullTimeList = await headOfficeFullTimeTask;
                var branchInspectorGeneralList = await branchInspectorGeneralTask;
@@ -243,76 +242,79 @@ namespace BLL
                var majorHiddenRectificationOutputsList = await majorHiddenRectificationOutputsTask;

                // 构造结果对象
-                var table = new HSSEData_HSSE
-                {
-                    JoinConstructionPersonNum = joinConstructionPersonList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    MajorProjectsUnderConstructionNum = majorProjectsUnderConstructionList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    TotalWorkingHour = totalWorkingHour,
-                    LostWorkingHour = lostWorkingHour,
-                    SafeWorkingHour = safeWorkingHour,
-                    SafeTrainNum = safeTrainList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum),
-                    SpecialTrainNum = specialTrainList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum),
-                    SpecialOperationTrainNum = specialOperationTrainList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum),
-                    EnvironmentalTrainNum = 0,
-                    TotalEnergyConsumption = totalEnergyConsumption,
-                    IncomeComprehensiveEnergyConsumption = incomeComprehensiveEnergyConsumption,
-                    NewWaterConsumption = newWaterConsumption,
-                    HeadOfficeInspectorGeneralNum = headOfficeInspectorGeneralList.Count(),
-                    HeadOfficeFullTimeNum = headOfficeFullTimeList.Count,
-                    BranchInspectorGeneralNum = branchInspectorGeneralList.Count,
-                    BranchFullTimeNum = branchFullTimeList.Count,
-                    ProjectInspectorGeneralNum = projectInspectorGeneralList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    ProjectFullTimeNum = projectFullTimeList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    ProjectSafetyMonitorNum = projectSafetyMonitorList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    ProjectSafetyLeadingGroupMeetingNum = projectSafetyLeadingGroupMeetingList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    ProjectSafetyMeetingNum = projectSafetyMeetingList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    CompanyLeadShiftCheckNum = companyLeadShiftCheckList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    CompanyComprehensiveCheckNum = companyComprehensiveCheckList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    CompanySpecialCheckNum = companySpecialCheckList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    ProjectLeadShiftCheckNum = projectLeadShiftCheckList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    ProjectSpecialCheckNum = projectSpecialCheckList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    ProjectMajorCheckNum = projectMajorCheckList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    NearMissNum = nearMissList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    RecordableEventNum = recordableEventList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    GeneralAccidentNum = generalAccidentList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    MajorAccidentNum = majorAccidentList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    SeriousAccidentNum = seriousAccidentList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    SpecialSeriousAccidentNum = specialSeriousAccidentList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    CompanyComprehensivePlanNum = companyComprehensivePlanList.Count(x => x.UnitId == _unitId),
-                    CompanySpecialPlanNum = companySpecialPlanList.Count(x => x.UnitId == _unitId),
-                    CompanyOnSiteDisposalPlan = companyOnSiteDisposalPlanList.Count(x => x.UnitId == _unitId),
-                    ProjectComprehensivePlanNum = projectComprehensivePlanList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    ProjectSpecialPlanNum = projectSpecialPlanList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    ProjectOnSiteDisposalPlan = projectOnSiteDisposalPlanList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    ProjectDrillNum = projectDrillList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    CostExtract = Convert.ToInt32(costExtractList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.SUMCost)),
-                    CostUse = Convert.ToInt32(costUseList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.SUMCost)),
-                    UseEquipmentNum = useEquipmentList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    SpecialEquipmentNum = specialEquipmentList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    LicensesNum = licensesList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    LicensesCloseNum = licensesCloseList.Count(x => _beUnderConstructionList.Contains(x.ProjectId)),
-                    GeneralClosedNum = generalHiddenRectificationOutputsList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.RecNum),
-                    GeneralNotClosedNum = generalHiddenRectificationOutputsList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.NoRecNum),
-                    MajorClosedNum = majorHiddenRectificationOutputsList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.RecNum),
-                    MajorNotClosedNum = majorHiddenRectificationOutputsList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.NoRecNum),
-                    LowRiskNum = securityRiskOutputListTask.Result.Sum(x => x.LowRiskNum),
-                    GeneralRiskNum = securityRiskOutputListTask.Result.Sum(x => x.GeneralRiskNum),
-                    MediumRiskNum = securityRiskOutputListTask.Result.Sum(x => x.MediumRiskNum),
-                    HighRiskNum = securityRiskOutputListTask.Result.Sum(x => x.HighRiskNum),
-                    CompletedNum = largeEngineeringOutputsTask.Result.Sum(x => x.CompletedNum),
-                    TrainPersonNum = largeEngineeringOutputsTask.Result.Sum(x => x.TrainPersonNum),
-                    ConstructionNum = largeEngineeringOutputsTask.Result.Sum(x => x.ConstructionNum),
-                    FinishedNum = largeEngineeringOutputsTask.Result.Sum(x => x.FinishedNum),
-                    SuperCompletedNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperCompletedNum),
-                    SuperTrainPersonNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperTrainPersonNum),
-                    SuperConstructionNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperConstructionNum)
-                };
+                var table = new HSSEData_HSSE();
+                table.JoinConstructionPersonNum = joinConstructionPersonList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.MajorProjectsUnderConstructionNum = majorProjectsUnderConstructionList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.TotalWorkingHour = totalWorkingHour;
+                table.LostWorkingHour = lostWorkingHour;
+                table.SafeWorkingHour = safeWorkingHour;
+                table.SafeTrainNum = safeTrainList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum);
+                table.SpecialTrainNum = specialTrainList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum);
+                table.SpecialOperationTrainNum = specialOperationTrainList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum);
+                table.HseTechnicalNum = hseTechnicalList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.EnvironmentalTrainNum = 0;
+                table.TotalEnergyConsumption = totalEnergyConsumption;
+                table.IncomeComprehensiveEnergyConsumption = incomeComprehensiveEnergyConsumption;
+                table.NewWaterConsumption = newWaterConsumption;
+                table.HeadOfficeInspectorGeneralNum = headOfficeInspectorGeneralList.Count();
+                table.HeadOfficeFullTimeNum = headOfficeFullTimeList.Count;
+                table.BranchInspectorGeneralNum = branchInspectorGeneralList.Count;
+                table.BranchFullTimeNum = branchFullTimeList.Count;
+                table.ProjectInspectorGeneralNum = projectInspectorGeneralList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.ProjectFullTimeNum = projectFullTimeList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.ProjectSafetyMonitorNum = projectSafetyMonitorList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.ProjectSafetyLeadingGroupMeetingNum = projectSafetyLeadingGroupMeetingList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.ProjectSafetyMeetingNum = projectSafetyMeetingList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.CompanyLeadShiftCheckNum = companyLeadShiftCheckList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.CompanyComprehensiveCheckNum = companyComprehensiveCheckList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.CompanySpecialCheckNum = companySpecialCheckList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.ProjectLeadShiftCheckNum = projectLeadShiftCheckList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.ProjectSpecialCheckNum = projectSpecialCheckList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.ProjectMajorCheckNum = projectMajorCheckList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.NearMissNum = nearMissList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.RecordableEventNum = recordableEventList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.GeneralAccidentNum = generalAccidentList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.MajorAccidentNum = majorAccidentList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.SeriousAccidentNum = seriousAccidentList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.SpecialSeriousAccidentNum = specialSeriousAccidentList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.CompanyComprehensivePlanNum = companyComprehensivePlanList.Count(x => x.UnitId == _unitId);
+                table.CompanySpecialPlanNum = companySpecialPlanList.Count(x => x.UnitId == _unitId);
+                table.CompanyOnSiteDisposalPlan = companyOnSiteDisposalPlanList.Count(x => x.UnitId == _unitId);
+                table.CompanyDrillNum = companyDrillList.Count(x => x.UnitId.Contains(_unitId));
+                table.CompanyDrillPersonNum = companyDrillList.Where(x => x.UnitId.Contains(_unitId)).Sum(x => x.JointPersonNum);
+                table.ProjectComprehensivePlanNum = projectComprehensivePlanList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.ProjectSpecialPlanNum = projectSpecialPlanList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.ProjectOnSiteDisposalPlan = projectOnSiteDisposalPlanList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.ProjectDrillNum = projectDrillList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.ProjectDrillPersonNum = projectDrillList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.JointPersonNum);
+                table.CostExtract = Convert.ToInt32(costExtractList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.SUMCost));
+                table.CostUse = Convert.ToInt32(costUseList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.SUMCost));
+                table.UseEquipmentNum = useEquipmentList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.SpecialEquipmentNum = specialEquipmentList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.LicensesNum = licensesList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.LicensesCloseNum = licensesCloseList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
+                table.GeneralClosedNum = generalHiddenRectificationOutputsList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.RecNum);
+                table.GeneralNotClosedNum = generalHiddenRectificationOutputsList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.NoRecNum);
+                table.MajorClosedNum = majorHiddenRectificationOutputsList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.RecNum);
+                table.MajorNotClosedNum = majorHiddenRectificationOutputsList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.NoRecNum);
+                table.LowRiskNum = securityRiskOutputListTask.Result.Sum(x => x.LowRiskNum);
+                table.GeneralRiskNum = securityRiskOutputListTask.Result.Sum(x => x.GeneralRiskNum);
+                table.MediumRiskNum = securityRiskOutputListTask.Result.Sum(x => x.MediumRiskNum);
+                table.HighRiskNum = securityRiskOutputListTask.Result.Sum(x => x.HighRiskNum);
+                table.CompletedNum = largeEngineeringOutputsTask.Result.Sum(x => x.CompletedNum);
+                table.TrainPersonNum = largeEngineeringOutputsTask.Result.Sum(x => x.TrainPersonNum);
+                table.OperativesNum = largeEngineeringOutputsTask.Result.Sum(x => x.OperativesNum);
+                table.ConstructionNum = largeEngineeringOutputsTask.Result.Sum(x => x.ConstructionNum);
+                table.FinishedNum = largeEngineeringOutputsTask.Result.Sum(x => x.FinishedNum);
+                table.ArgumentNum = largeEngineeringOutputsTask.Result.Sum(x => x.ArgumentNum);
+                table.SuperCompletedNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperCompletedNum);
+                table.SuperTrainPersonNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperTrainPersonNum);
+                table.SuperOperativesNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperOperativesNum);
+                table.SuperConstructionNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperConstructionNum);
+                table.SuperFinishedNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperFinishedNum);
+                table.SuperArgumentNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperArgumentNum);
+

-                if (!string.IsNullOrEmpty(_unitId))
-                {
-                    table.CompanyDrillNum = companyDrillList.Count(x => x.UnitId.Contains(_unitId));
-                }
-                
                if (_unitType == 0)
                {
                    table.BeUnderConstructionNum = beUnderConstructionList.Count();
@@ -323,7 +325,6 @@ namespace BLL
                    table.CertificateBNum = certificateBList.Count();
                    table.CertificateCNum = certificateCList.Count();
                    table.SafetyCommitteeMeetingNum = safetyCommitteeMeetingList.Count();
-
                }
                else if (_unitType == 1)
                {
@@ -336,16 +337,16 @@ namespace BLL
                    table.CertificateBNum = certificateBList.Count(x => _beUnderConstructionList.Contains(x.ProjectId) || x.UnitId == _unitId);
                    table.CertificateCNum = certificateCList.Count(x => _beUnderConstructionList.Contains(x.ProjectId) || x.UnitId == _unitId);
                }
-                else if (_unitType ==3)
+                else if (_unitType == 3)
                {
                    table.BeUnderConstructionNum = beUnderConstructionList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
                    table.ShutdownNum = shutdownList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
                    table.SafetyCommitteeMeetingNum = safetyCommitteeMeetingList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
-                    table.SafetyInjectionEngineer = safetyInjectionEngineerList.Count(x => _beUnderConstructionList.Contains(x.ProjectId) );
+                    table.SafetyInjectionEngineer = safetyInjectionEngineerList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
                    table.EnterpriseTopicsMeetingNum = safetyInjectionEngineerList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
                    table.CertificateANum = certificateAList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
                    table.CertificateBNum = certificateBList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
-                    table.CertificateCNum = certificateCList.Count(x => _beUnderConstructionList.Contains(x.ProjectId) );
+                    table.CertificateCNum = certificateCList.Count(x => _beUnderConstructionList.Contains(x.ProjectId));
                }

                _hsseData = table;
@@ -390,7 +391,6 @@ namespace BLL
            return result;
        }

-
        /// <summary>
        /// 质量数据
        /// </summary>
@@ -405,6 +405,9 @@ namespace BLL
                var projectPersonNumTask = CQMSDataService.GetProjectPersonNumAsync(); //获取项目专职人数
                var trainPersonNumTask = CQMSDataService.GetTrainPersonNumAsync(); //获取质量培训人次数
                var technicalDisclosePersonTask = CQMSDataService.GetTechnicalDisclosePersonNumAsync(); //获取技术交底人次数
+                var qualityAssuranceNumTask = CQMSDataService.GetQualityAssuranceNumAsync(); //获取特设质保体系数量
+                var comprehensiveConTechnologyDisclosureTask = CQMSDataService.GetComprehensiveConTechnologyDisclosureAsync(); //获取施工技术交底
+                var comprehensiveReviewDrawingsTask = CQMSDataService.GetComprehensiveReviewDrawingsAsync(); //获取图纸会审

                var inspectionEquipmentTask = CQMSDataService.GetComprehensive_InspectionEquipmentAsync(); //获取设备报验
                var inspectionPersonTask = CQMSDataService.GetComprehensive_InspectionPersonAsync(); //获取人员报验
@@ -438,7 +441,8 @@ namespace BLL
                // 等待所有异步方法执行完成
                await Task.WhenAll(
                    companyPersonNumTask, branchPersonNumTask, projectPersonNumTask,
-                    trainPersonNumTask, technicalDisclosePersonTask,
+                    trainPersonNumTask, technicalDisclosePersonTask, qualityAssuranceNumTask,
+                    comprehensiveConTechnologyDisclosureTask, comprehensiveReviewDrawingsTask,
                    inspectionEquipmentTask, inspectionPersonTask, inspectionMachineTask,
                    useNumTask, okNumTask,
                    singleProjectNumTask, unitProjectNumTask, subProjectNuTask, subdivisionalWorksNuTask, inspectionLotNumTask,
@@ -454,6 +458,9 @@ namespace BLL
                var projectPersonNumList = await projectPersonNumTask;
                var trainPersonNumList = await trainPersonNumTask;
                var technicalDisclosePersonList = await technicalDisclosePersonTask;
+                var qualityAssuranceNum = await qualityAssuranceNumTask;
+                var comprehensiveConTechnologyDisclosureList = await comprehensiveConTechnologyDisclosureTask;
+                var comprehensiveReviewDrawingsList = await comprehensiveReviewDrawingsTask;

                var inspectionEquipmentList = await inspectionEquipmentTask;
                var inspectionPersonList = await inspectionPersonTask;
@@ -488,6 +495,9 @@ namespace BLL
                    projectPersonNumList = projectPersonNumList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList();
                    trainPersonNumList = trainPersonNumList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList();
                    technicalDisclosePersonList = technicalDisclosePersonList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList();
+                    comprehensiveConTechnologyDisclosureList = comprehensiveConTechnologyDisclosureList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList();
+                    comprehensiveReviewDrawingsList = comprehensiveReviewDrawingsList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList();
+                    qualityAssuranceNum = qualityAssuranceNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList();
                    inspectionEquipmentList = inspectionEquipmentList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList();
                    inspectionPersonList = inspectionPersonList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList();
                    inspectionMachineList = inspectionMachineList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList();
@@ -521,6 +531,9 @@ namespace BLL
                    ProjectPersonNum = projectPersonNumList.Count(),
                    TrainPersonNum = trainPersonNumList.Count(),
                    TechnicalDisclosePersonNum = technicalDisclosePersonList.Sum(x => x.TrainPersonNum),
+                    ComprehensiveConTechnologyDisclosureNum = comprehensiveConTechnologyDisclosureList.Count(),
+                    ComprehensiveConTechnologyDisclosurePersonNum = comprehensiveConTechnologyDisclosureList.Sum(x => x.TrainPersonNum),
+                    ComprehensiveReviewDrawingsNum = comprehensiveReviewDrawingsList.Count(),
                    EquipmentInspectionNum = inspectionEquipmentList.Count(),
                    EquipmentInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1").Count(),
                    PersonInspectionNum = inspectionPersonList.Count(),
@@ -535,12 +548,12 @@ namespace BLL
                    UnitProjectNum = unitProjectNum.Count(),
                    SubProjectNum = subProjectNum.Count(),
                    SubdivisionalWorksNum = subdivisionalWorksNum.Count(),
-                    InspectionLotNum = inspectionLotNum.Count(),
+                    InspectionLotNum = inspectionLotNum.Sum(x=>x.Sum),

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

                    ProblemNum = cqmsProblemList.Count(),