fix:升级

2025-06-19 19:23:01 +08:00
parent 0cb37e2c02
commit 7aa8baadbb
111 changed files with 14465 additions and 1480 deletions
@@ -15,8 +15,7 @@ namespace BLL
 {
    public static class CQMSDataService
    {
-        public static SUBQHSEDB db = Funs.DB;
-        public static List<string> BeUnderConstructionList = ProjectService.GetProjectWorkList().Where(x => (x.ProjectAttribute == "GONGCHENG" || x.ProjectAttribute == null)).Select(x => x.ProjectId).ToList();
+        public static List<string> BeUnderConstructionList = BaseDataService.BeUnderConstructionList;

        #region 获取列表

@@ -63,6 +62,9 @@ namespace BLL
                       x.ReportDate,
                       x.TrainPersonNum,
                       x.TechnicalDisclosePersonNum,
+                       x.ComprehensiveConTechnologyDisclosureNum,
+                       x.ComprehensiveConTechnologyDisclosurePersonNum,
+                       x.ComprehensiveReviewDrawingsNum,
                       x.UseNum,
                       x.OKNum,
                       x.CompanyPersonNum,
@@ -90,6 +92,8 @@ namespace BLL
                       x.SubProjectNum,
                       x.SubdivisionalWorksNum,
                       x.InspectionLotNum,
+                       x.InspectionMachineNum,
+                       x.InspectionMachineQualifiedNum,
                       x.State,
                       x.CreateDate,
                       x.CreateMan
@@ -113,11 +117,15 @@ namespace BLL
                    ReportDate = newtable.ReportDate,
                    TrainPersonNum = newtable.TrainPersonNum,
                    TechnicalDisclosePersonNum = newtable.TechnicalDisclosePersonNum,
+                    ComprehensiveConTechnologyDisclosureNum = newtable.ComprehensiveConTechnologyDisclosureNum,
+                    ComprehensiveConTechnologyDisclosurePersonNum = newtable.ComprehensiveConTechnologyDisclosurePersonNum,
+                    ComprehensiveReviewDrawingsNum = newtable.ComprehensiveReviewDrawingsNum,
                    UseNum = newtable.UseNum,
                    OKNum = newtable.OKNum,
                    CompanyPersonNum = newtable.CompanyPersonNum,
                    BranchPersonNum = newtable.BranchPersonNum,
                    ProjectPersonNum = newtable.ProjectPersonNum,
+                    ProjectSubPersonNum = newtable.ProjectSubPersonNum,
                    ProblemNum = newtable.ProblemNum,
                    ProblemCompletedNum = newtable.ProblemCompletedNum,
                    ProblemNotCompletedNum = newtable.ProblemNotCompletedNum,
@@ -159,6 +167,8 @@ namespace BLL
                    SubProjectAcceptOKNum = newtable.SubProjectAcceptOKNum,
                    SubdivisionalWorksAcceptNum = newtable.SubdivisionalWorksAcceptNum,
                    SubdivisionalWorksAcceptOKNum = newtable.SubdivisionalWorksAcceptOKNum,
+                    InspectionMachineNum = newtable.InspectionMachineNum,
+                    InspectionMachineQualifiedNum = newtable.InspectionMachineQualifiedNum,
                    State = newtable.State,
                    CreateDate = newtable.CreateDate,
                    CreateMan = newtable.CreateMan
@@ -182,14 +192,24 @@ namespace BLL
                    table.ReportDate = newtable.ReportDate;
                    table.TrainPersonNum = newtable.TrainPersonNum;
                    table.TechnicalDisclosePersonNum = newtable.TechnicalDisclosePersonNum;
+                    table.ComprehensiveConTechnologyDisclosureNum = newtable.ComprehensiveConTechnologyDisclosureNum;
+                    table.ComprehensiveConTechnologyDisclosurePersonNum = newtable.ComprehensiveConTechnologyDisclosurePersonNum;
+                    table.ComprehensiveReviewDrawingsNum = newtable.ComprehensiveReviewDrawingsNum;
                    table.UseNum = newtable.UseNum;
                    table.OKNum = newtable.OKNum;
                    table.CompanyPersonNum = newtable.CompanyPersonNum;
                    table.BranchPersonNum = newtable.BranchPersonNum;
                    table.ProjectPersonNum = newtable.ProjectPersonNum;
+                    table.ProjectSubPersonNum = newtable.ProjectSubPersonNum;
                    table.ProblemNum = newtable.ProblemNum;
                    table.ProblemCompletedNum = newtable.ProblemCompletedNum;
                    table.ProblemNotCompletedNum = newtable.ProblemNotCompletedNum;
+                    table.UnitCheckNum = newtable.UnitCheckNum;
+                    table.UnitCheckClosedNum = newtable.UnitCheckClosedNum;
+                    table.UnitCheckNotClosedNum = newtable.UnitCheckNotClosedNum;
+                    table.BranchCheckNum = newtable.BranchCheckNum;
+                    table.BranchCheckClosedNum = newtable.BranchCheckClosedNum;
+                    table.BranchCheckNotClosedNum = newtable.BranchCheckNotClosedNum;
                    table.SNum = newtable.SNum;
                    table.ANum = newtable.ANum;
                    table.BNum = newtable.BNum;
@@ -228,6 +248,8 @@ namespace BLL
                    table.SubProjectAcceptOKNum = newtable.SubProjectAcceptOKNum;
                    table.SubdivisionalWorksAcceptNum = newtable.SubdivisionalWorksAcceptNum;
                    table.SubdivisionalWorksAcceptOKNum = newtable.SubdivisionalWorksAcceptOKNum;
+                    table.InspectionMachineNum = newtable.InspectionMachineNum;
+                    table.InspectionMachineQualifiedNum = newtable.InspectionMachineQualifiedNum;
                    table.State = newtable.State;
                    table.CreateMan = newtable.CreateMan;
                    table.CreateDate = newtable.CreateDate;
@@ -270,6 +292,9 @@ namespace BLL
                item.CollCropCode = model.CollCropCode;
                item.TrainPersonNum = model.TrainPersonNum;
                item.TechnicalDisclosePersonNum = model.TechnicalDisclosePersonNum;
+                item.ComprehensiveConTechnologyDisclosureNum = model.ComprehensiveConTechnologyDisclosureNum;
+                item.ComprehensiveConTechnologyDisclosurePersonNum = model.ComprehensiveConTechnologyDisclosurePersonNum;
+                item.ComprehensiveReviewDrawingsNum = model.ComprehensiveReviewDrawingsNum;
                item.UseNum = model.UseNum;
                item.OKNum = model.OKNum;
                item.CompanyPersonNum = model.CompanyPersonNum;
@@ -279,6 +304,12 @@ namespace BLL
                item.ProblemCompletedNum = model.ProblemCompletedNum;
                item.ProblemNotCompletedNum = model.ProblemNotCompletedNum;
                item.ProblemRate = "";
+                item.UnitCheckNum = model.UnitCheckNum;
+                item.UnitCheckClosedNum = model.UnitCheckClosedNum;
+                item.UnitCheckNotClosedNum = model.UnitCheckNotClosedNum;
+                item.BranchCheckNum = model.BranchCheckNum;
+                item.BranchCheckClosedNum = model.BranchCheckClosedNum;
+                item.BranchCheckNotClosedNum = model.BranchCheckNotClosedNum;
                item.SNum = model.SNum;
                item.ANum = model.ANum;
                item.BNum = model.BNum;
@@ -322,6 +353,11 @@ namespace BLL
                item.SubProjectAcceptOKNum = model.SubProjectAcceptOKNum;
                item.SubdivisionalWorksAcceptNum = model.SubdivisionalWorksAcceptNum;
                item.SubdivisionalWorksAcceptOKNum = model.SubdivisionalWorksAcceptOKNum;
+                item.MachineInspectionNum = model.MachineInspectionQualifiedNum;
+                item.MachineInspectionQualifiedNum = model.MachineInspectionQualifiedNum;
+                item.InspectionLotNum = model.InspectionLotNum;
+                item.InspectionMachineNum = model.InspectionMachineNum;
+                item.InspectionMachineQualifiedNum = model.InspectionMachineQualifiedNum;
            }

            var cqmsDataItems = new List<CqmsDataItem>();
@@ -371,6 +407,9 @@ namespace BLL
                ReportDate = DateTime.Now.Date,
                TrainPersonNum = ProjectData.Sum(x => x.TrainPersonNum),
                TechnicalDisclosePersonNum = ProjectData.Sum(x => x.TechnicalDisclosePersonNum),
+                ComprehensiveConTechnologyDisclosureNum = ProjectData.Sum(x => x.ComprehensiveConTechnologyDisclosureNum),
+                ComprehensiveConTechnologyDisclosurePersonNum = ProjectData.Sum(x => x.ComprehensiveConTechnologyDisclosurePersonNum),
+                ComprehensiveReviewDrawingsNum = ProjectData.Sum(x => x.ComprehensiveReviewDrawingsNum),
                UseNum = ProjectData.Sum(x => x.UseNum),
                OKNum = ProjectData.Sum(x => x.OKNum),
                CompanyPersonNum = GetCompanyPersonNum(),
@@ -398,6 +437,9 @@ namespace BLL
                SubProjectNum = ProjectData.Sum(x => x.SubProjectNum),
                SubdivisionalWorksNum = ProjectData.Sum(x => x.SubdivisionalWorksNum),
                InspectionLotNum = ProjectData.Sum(x => x.InspectionLotNum),
+                InspectionMachineNum = ProjectData.Sum(x=>x.InspectionMachineNum),
+                InspectionMachineQualifiedNum = ProjectData.Sum(x => x.InspectionMachineQualifiedNum),
+                SpecialEquipmentQualityAssuranceSystemNum = ProjectData.Sum(x => x.SpecialEquipmentQualityAssuranceSystemNum),
                CreateMan = Const.sysglyId,
                CreateDate = DateTime.Now
            };
@@ -446,92 +488,6 @@ namespace BLL
            return responeData;
        }

-        public static CQMSData StatisticalData()
-        {
-            var thisUnitId = string.Empty;
-            var thisUnit = CommonService.GetIsThisUnit();
-            if (thisUnit != null) thisUnitId = thisUnit.UnitId;
-            var base_Unit = UnitService.GetUnitByUnitId(thisUnitId);
-            Project_CQMSDataService.StatisticalAllProjectData();
-
-            var ProjectData = (from x in Funs.DB.Project_CQMSData_CQMS
-                               where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
-                               select x).ToList();
-            var table = new CQMSData_CQMS
-            {
-                UnitId = thisUnitId,
-                CollCropCode = base_Unit.CollCropCode,
-                UnitName = base_Unit.UnitName,
-                ReportDate = DateTime.Now.Date,
-                TrainPersonNum = ProjectData.Sum(x => x.TrainPersonNum),
-                TechnicalDisclosePersonNum = ProjectData.Sum(x => x.TechnicalDisclosePersonNum),
-                UseNum = ProjectData.Sum(x => x.UseNum),
-                OKNum = ProjectData.Sum(x => x.OKNum),
-                CompanyPersonNum = GetCompanyPersonNum(),
-                BranchPersonNum = GetBranchPersonNum(),
-                ProjectPersonNum = ProjectData.Sum(x => x.ProjectPersonNum),
-                ProblemNum = ProjectData.Sum(x => x.ProblemNum),
-                ProblemCompletedNum = ProjectData.Sum(x => x.ProblemCompletedNum),
-                ProblemNotCompletedNum = ProjectData.Sum(x => x.ProblemNotCompletedNum),
-                SNum = ProjectData.Sum(x => x.SNum),
-                ANum = ProjectData.Sum(x => x.ANum),
-                BNum = ProjectData.Sum(x => x.BNum),
-                CNum = ProjectData.Sum(x => x.CNum),
-                KeyProcessNum = ProjectData.Sum(x => x.KeyProcessNum),
-                KeyProcessOKNum = ProjectData.Sum(x => x.KeyProcessOKNum),
-                SpecialProcessNum = ProjectData.Sum(x => x.SpecialProcessNum),
-                SpecialProcessOKNum = ProjectData.Sum(x => x.SpecialProcessOKNum),
-                ConcealedWorksNum = ProjectData.Sum(x => x.ConcealedWorksNum),
-                ConcealedWorksOKNum = ProjectData.Sum(x => x.ConcealedWorksOKNum),
-                UnitProjectOnesNum = ProjectData.Sum(x => x.UnitProjectOnesNum),
-                UnitProjectOnesOKNum = ProjectData.Sum(x => x.UnitProjectOnesOKNum),
-                MaterialInRecheckNum = ProjectData.Sum(x => x.MaterialInRecheckNum),
-                MaterialInRecheckOKNum = ProjectData.Sum(x => x.MaterialInRecheckOKNum),
-                SingleProjectNum = ProjectData.Sum(x => x.SingleProjectNum),
-                UnitProjectNum = ProjectData.Sum(x => x.UnitProjectNum),
-                SubProjectNum = ProjectData.Sum(x => x.SubProjectNum),
-                SubdivisionalWorksNum = ProjectData.Sum(x => x.SubdivisionalWorksNum),
-                InspectionLotNum = ProjectData.Sum(x => x.InspectionLotNum),
-                EquipmentInspectionNum = ProjectData.Sum(x => x.EquipmentInspectionNum),
-                EquipmentInspectionQualifiedNum = ProjectData.Sum(x => x.EquipmentInspectionQualifiedNum),
-                MachineInspectionNum = ProjectData.Sum(x => x.MachineInspectionNum),
-                MachineInspectionQualifiedNum = ProjectData.Sum(x => x.MachineInspectionQualifiedNum),
-                PersonInspectionNum = ProjectData.Sum(x => x.PersonInspectionNum),
-                PersonInspectionQualifiedNum = ProjectData.Sum(x => x.PersonInspectionQualifiedNum),
-                MaterialInspectionNum = ProjectData.Sum(x => x.MaterialInspectionNum),
-                MaterialInspectionQualifiedNum = ProjectData.Sum(x => x.MaterialInspectionQualifiedNum),
-                ConstructSolutionNum = ProjectData.Sum(x => x.ConstructSolutionNum),
-                ConstructSolutionProjectApproveNum = ProjectData.Sum(x => x.ConstructSolutionProjectApproveNum),
-                ConstructSolutionUnitApproveNum = ProjectData.Sum(x => x.ConstructSolutionUnitApproveNum),
-                SpecialEquipmentQualityAssuranceSystemNum = ProjectData.Sum(x => x.SpecialEquipmentQualityAssuranceSystemNum),
-                DesignDetailsNum = ProjectData.Sum(x => x.DesignDetailsNum),
-                UnitProjectAcceptNum = ProjectData.Sum(x => x.UnitProjectAcceptNum),
-                UnitProjectAcceptOKNum = ProjectData.Sum(x => x.UnitProjectAcceptOKNum),
-                SubProjectAcceptNum = ProjectData.Sum(x => x.SubProjectAcceptNum),
-                SubProjectAcceptOKNum = ProjectData.Sum(x => x.SubProjectAcceptOKNum),
-                SubdivisionalWorksAcceptNum = ProjectData.Sum(x => x.SubdivisionalWorksAcceptNum),
-                SubdivisionalWorksAcceptOKNum = ProjectData.Sum(x => x.SubdivisionalWorksAcceptOKNum),
-                CreateMan = Const.sysglyId,
-                CreateDate = DateTime.Now
-            };
-            if (IsReportByToday())
-            {
-                table.Id = GetTodayData().Id;
-                table.State = Const.CNCEC_State_1;
-                UpdateCQMSData_CQMS(table);
-            }
-            else
-            {
-                table.Id = SQLHelper.GetNewID();
-                table.State = Const.CNCEC_State_0;
-                AddCQMSData_CQMS(table);
-            }
-
-            var data = new CQMSData();
-            data = GetDataByCQMSData_CQMS(table);
-            return data;
-        }
-
        /// <summary>
        /// 获取质量统计数据
        /// </summary> 
@@ -547,11 +503,15 @@ namespace BLL
            var branchPersonNumTask = CQMSDataService.GetBranchPersonNumAsync(); //获取分支机构人数
            var projectPersonNumTask = CQMSDataService.GetProjectPersonNumAsync(); //获取项目专职人数
            var trainPersonNumTask = CQMSDataService.GetTrainPersonNumAsync(); //获取质量培训人次数
-            var technicalDisclosePersonTask = CQMSDataService.GetTechnicalDisclosePersonNumAsync(); //获取技术交底人次数
+            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(); //获取人员报验
            var inspectionMachineTask = CQMSDataService.GetComprehensive_InspectionMachineAsync(); //获取机具报验
+            var inspectionMachineEquipmentTask = CQMSDataService.GetComprehensive_InspectionMachineEquipmentAsync(); //获取设备报验报检
            var useNumTask = CQMSDataService.GetUseNumAsync(); //获取在用计量器具数
            var okNumTask = CQMSDataService.GetOkNumAsync(); //获取校准合格数

@@ -562,6 +522,8 @@ namespace BLL
            var inspectionLotNumTask = CQMSDataService.GetInspectionLotNumAsync(); //获取检验批个数
            var constructSolutionTask = CQMSDataService.GetConstructSolutionAsync(); //施工方案数量
            var cqmsProblemTask = CQMSDataService.GetCQMSProblemAsync(); //获取企业级、项目级质量问题
+            var cqmsBranchMajorCheckTask = CQMSDataService.GetBranchMajorCheckAsync(); //获取分支机构质量大检查次数
+            var cqmsCompanyMajorCheckTask = CQMSDataService.GetCompanyMajorCheckAsync(); //获取企业质量大检查次数

            //质量验收数据
            var keyProcessNumTask = CQMSDataService.GetKeyProcessNumAsync(); //获取关键工序验收数
@@ -584,14 +546,16 @@ namespace BLL
            await Task.WhenAll(
                companyPersonNumTask, branchPersonNumTask, projectPersonNumTask,
                trainPersonNumTask, technicalDisclosePersonTask,
+                comprehensiveConTechnologyDisclosureTask, comprehensiveReviewDrawingsTask,
                inspectionEquipmentTask, inspectionPersonTask, inspectionMachineTask,
                useNumTask, okNumTask,
                singleProjectNumTask, unitProjectNumTask, subProjectNuTask, subdivisionalWorksNuTask, inspectionLotNumTask,
                constructSolutionTask,
-                cqmsProblemTask,
+                cqmsProblemTask, cqmsBranchMajorCheckTask, cqmsCompanyMajorCheckTask,
                keyProcessNumTask, keyProcessOKNumTask, specialProcessNumTask, specialProcessOKNumTask, concealedWorksNumTask, concealedWorksOKNumTask,
                unitProjectAcceptNumTask, unitProjectAcceptOKNumTask, subProjectAcceptNumTask, subProjectAcceptOKNumTask, subdivisionalWorksAcceptNumTask, subdivisionalWorksAcceptOKNumTask,
-                materialInRecheckNumTask, materialInRecheckOKNumTask
+                materialInRecheckNumTask, materialInRecheckOKNumTask, inspectionMachineEquipmentTask,
+                qualityAssuranceNumTask
            );

            // 统一获取异步方法的返回值
@@ -600,10 +564,13 @@ namespace BLL
            var projectPersonNumList = await projectPersonNumTask;
            var trainPersonNumList = await trainPersonNumTask;
            var technicalDisclosePersonList = await technicalDisclosePersonTask;
+            var comprehensiveConTechnologyDisclosureList = await comprehensiveConTechnologyDisclosureTask;
+            var comprehensiveReviewDrawingsList = await comprehensiveReviewDrawingsTask;

            var inspectionEquipmentList = await inspectionEquipmentTask;
            var inspectionPersonList = await inspectionPersonTask;
            var inspectionMachineList = await inspectionMachineTask;
+            var inspectionMachineEquipmentList =await inspectionMachineEquipmentTask;
            var useNum = await useNumTask;
            var okNum = await okNumTask;
            var singleProjectNum = await singleProjectNumTask;
@@ -614,6 +581,8 @@ namespace BLL

            var constructSolutionList = await constructSolutionTask;
            var cqmsProblemList = await cqmsProblemTask;
+            var cqmsBranchMajorCheckList = await cqmsBranchMajorCheckTask;
+            var cqmsCompanyMajorCheckList = await cqmsCompanyMajorCheckTask;

            var keyProcessNum = await keyProcessNumTask;
            var keyProcessOKNum = await keyProcessOKNumTask;
@@ -630,7 +599,8 @@ namespace BLL
            var subdivisionalWorksAcceptOKNum = await subdivisionalWorksAcceptOKNumTask;
            var materialInRecheckNum = await materialInRecheckNumTask;
            var materialInRecheckOKNum = await materialInRecheckOKNumTask;
-
+            var qualityAssuranceNum = await qualityAssuranceNumTask;
+            
            // 构造结果对象
            var table = new CQMSData_CQMS
            {
@@ -640,17 +610,23 @@ namespace BLL
                ReportDate = DateTime.Now.Date,
                CompanyPersonNum = companyPersonNum,//
                BranchPersonNum = branchPersonNum,//
-                ProjectPersonNum = projectPersonNumList.Count(),
+                ProjectPersonNum = projectPersonNumList.Count(x => x.IsOffice == true),
+                ProjectSubPersonNum = projectPersonNumList.Count(x => x.IsOffice == false),
                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(),
                PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.IsOnSite.HasValue && x.IsOnSite == true).Count(),
                MachineInspectionNum = inspectionMachineList.Count(),
                MachineInspectionQualifiedNum = inspectionMachineList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true).Count(),
-                MaterialInspectionNum = 0,
-                MaterialInspectionQualifiedNum = 0,
+
+                MaterialInspectionNum = inspectionEquipmentList.Count(),
+                MaterialInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1").Count(),
                UseNum = useNum.Count(),
                OKNum = okNum.Count(),
                SingleProjectNum = singleProjectNum.Count(),
@@ -662,12 +638,18 @@ namespace BLL
                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(),
                ProblemCompletedNum = cqmsProblemList.Where(x => x.State == "7").Count(),
                ProblemNotCompletedNum = cqmsProblemList.Where(x => x.State != "7").Count(),
+                BranchCheckNum = cqmsBranchMajorCheckList.Count(),
+                BranchCheckClosedNum = cqmsBranchMajorCheckList.Count(),
+                BranchCheckNotClosedNum = 0,
+                UnitCheckNum = cqmsCompanyMajorCheckList.Count(),
+                UnitCheckClosedNum = cqmsCompanyMajorCheckList.Count(),
+                UnitCheckNotClosedNum = 0,

                KeyProcessNum = keyProcessNum.Count(),
                KeyProcessOKNum = keyProcessOKNum.Count(),
@@ -682,7 +664,10 @@ namespace BLL
                SubdivisionalWorksAcceptNum = subdivisionalWorksAcceptNum.Count(),
                SubdivisionalWorksAcceptOKNum = subdivisionalWorksAcceptOKNum.Count(),
                MaterialInRecheckNum = materialInRecheckNum.Count(),
-                MaterialInRecheckOKNum = materialInRecheckOKNum.Count()
+                MaterialInRecheckOKNum = materialInRecheckOKNum.Count(),
+                InspectionMachineNum = inspectionMachineEquipmentList.Count(),
+                InspectionMachineQualifiedNum = inspectionMachineEquipmentList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true).Count(),
+                                
            };
            #region 添加项目统计数据

@@ -699,9 +684,13 @@ namespace BLL
                    ReportDate = DateTime.Now.Date,
                    CompanyPersonNum = companyPersonNum,//
                    BranchPersonNum = branchPersonNum,//
-                    ProjectPersonNum = projectPersonNumList.Count(x => x.ProjectId == projectid),
+                    ProjectPersonNum = projectPersonNumList.Count(x => x.ProjectId == projectid && x.IsOffice == true),
+                    ProjectSubPersonNum = projectPersonNumList.Count(x => x.ProjectId == projectid && x.IsOffice == false),
                    TrainPersonNum = trainPersonNumList.Count(x => x.ProjectId == projectid),
                    TechnicalDisclosePersonNum = technicalDisclosePersonList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
+                    ComprehensiveConTechnologyDisclosureNum = comprehensiveConTechnologyDisclosureList.Count(x => x.ProjectId == projectid),
+                    ComprehensiveConTechnologyDisclosurePersonNum = comprehensiveConTechnologyDisclosureList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
+                    ComprehensiveReviewDrawingsNum = comprehensiveReviewDrawingsList.Count(x => x.ProjectId == projectid),
                    EquipmentInspectionNum = inspectionEquipmentList.Count(x => x.ProjectId == projectid),
                    EquipmentInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1" && x.ProjectId == projectid).Count(),
                    PersonInspectionNum = inspectionPersonList.Count(x => x.ProjectId == projectid),
@@ -721,7 +710,7 @@ namespace BLL
                    ConstructSolutionNum = constructSolutionList.Count(x => x.ProjectId == projectid),
                    ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.State == "1" && x.ProjectId == projectid).Count(),
                    ConstructSolutionUnitApproveNum = 0,//
-                    SpecialEquipmentQualityAssuranceSystemNum = 0,//
+                    SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(x => x.ProjectId == projectid),
                    DesignDetailsNum = technicalDisclosePersonList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),

                    ProblemNum = cqmsProblemList.Count(x => x.ProjectId == projectid),
@@ -741,7 +730,10 @@ namespace BLL
                    SubdivisionalWorksAcceptNum = subdivisionalWorksAcceptNum.Count(x => x.ProjectId == projectid),
                    SubdivisionalWorksAcceptOKNum = subdivisionalWorksAcceptOKNum.Count(x => x.ProjectId == projectid),
                    MaterialInRecheckNum = materialInRecheckNum.Count(x => x.ProjectId == projectid),
-                    MaterialInRecheckOKNum = materialInRecheckOKNum.Count(x => x.ProjectId == projectid)
+                    MaterialInRecheckOKNum = materialInRecheckOKNum.Count(x => x.ProjectId == projectid),
+                    InspectionMachineNum = inspectionMachineEquipmentList.Count(x => x.ProjectId == projectid),
+                    InspectionMachineQualifiedNum = inspectionMachineEquipmentList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true && x.ProjectId == projectid).Count(),
+                   
                };
                Project_CQMSDataService.AddProject_CQMSData_CQMS(projectCqmsData);
            }
@@ -766,7 +758,6 @@ namespace BLL
            return data;

        }
-
        public static CQMSData GetDataByCQMSData_CQMS(CQMSData_CQMS table)
        {
            var data = new CQMSData();
@@ -777,15 +768,25 @@ namespace BLL
            item.CollCropCode = table.CollCropCode;
            item.TrainPersonNum = table.TrainPersonNum;
            item.TechnicalDisclosePersonNum = table.TechnicalDisclosePersonNum;
+            item.ComprehensiveConTechnologyDisclosureNum = table.ComprehensiveConTechnologyDisclosureNum;
+            item.ComprehensiveConTechnologyDisclosurePersonNum = table.ComprehensiveConTechnologyDisclosurePersonNum;
+            item.ComprehensiveReviewDrawingsNum = table.ComprehensiveReviewDrawingsNum;
            item.UseNum = table.UseNum;
            item.OKNum = table.OKNum;
            item.CompanyPersonNum = table.CompanyPersonNum;
            item.BranchPersonNum = table.BranchPersonNum;
            item.ProjectPersonNum = table.ProjectPersonNum;
+            item.ProjectSubPersonNum = table.ProjectSubPersonNum;
            item.ProblemNum = table.ProblemNum;
            item.ProblemCompletedNum = table.ProblemCompletedNum;
            item.ProblemNotCompletedNum = table.ProblemNotCompletedNum;
            item.ProblemRate = "";
+            item.UnitCheckNum = table.UnitCheckNum;
+            item.UnitCheckClosedNum = table.UnitCheckClosedNum;
+            item.UnitCheckNotClosedNum = table.UnitCheckNotClosedNum;
+            item.BranchCheckNum = table.BranchCheckNum;
+            item.BranchCheckClosedNum = table.BranchCheckClosedNum;
+            item.BranchCheckNotClosedNum = table.BranchCheckNotClosedNum;
            item.SNum = table.SNum;
            item.ANum = table.ANum;
            item.BNum = table.BNum;
@@ -829,6 +830,8 @@ namespace BLL
            item.SubProjectAcceptOKNum = table.SubProjectAcceptOKNum;
            item.SubdivisionalWorksAcceptNum = table.SubdivisionalWorksAcceptNum;
            item.SubdivisionalWorksAcceptOKNum = table.SubdivisionalWorksAcceptOKNum;
+            item.InspectionMachineNum = table.InspectionMachineNum;
+            item.InspectionMachineQualifiedNum = table.InspectionMachineQualifiedNum;
            var cqmsDataItems = new List<CqmsDataItem>();
            cqmsDataItems.Add(item);
            data.CQMSDataItems = cqmsDataItems;
@@ -891,6 +894,7 @@ namespace BLL
        /// <returns></returns>
        public static IEnumerable<Model.OfSafetySupervisorsOutput> GetProjectPersonNum()
        {
+            var mianAndSubUnitList = (from x in Funs.DB.Base_Unit where x.IsThisUnit == true || x.IsBranch == true select x.UnitId).ToList();
            var result = (from x in Funs.DB.SitePerson_Person
                          join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId 
                          join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
@@ -902,13 +906,15 @@ namespace BLL
                          {
                              ProjectId = x.ProjectId,
                              ProjectName = p.ProjectName,
+                              ProjectFromUnitId=p.UnitId,
                              UnitId = u.UnitId,
                              UnitName = u.UnitName,
                              Name = x.PersonName,
                              Sex = x.Sex == null ? "" : (x.Sex == "1" ? "男" : "女"),
                              IdentityCard = x.IdentityCard,
                              WorkPostName = y.WorkPostName == null ? "" : y.WorkPostName,
-                              Phone = x.Telephone
+                              Phone = x.Telephone,
+                              IsOffice = x.UnitId == null ? false : mianAndSubUnitList.Contains(x.UnitId)
                          }).ToList();
            result = result
                .GroupBy(x => x.IdentityCard)
@@ -965,7 +971,7 @@ namespace BLL
        }

        /// <summary>
-        /// 获取技术交底人次数
+        /// 获取设计交底人次数
        /// </summary>
        /// <returns></returns>
        public static int GetTechnicalDisclosePersonNum()
@@ -977,7 +983,7 @@ namespace BLL
        }

        /// <summary>
-        /// 获取技术交底人次数
+        /// 获取设计交底人次数
        /// </summary>
        /// <returns></returns>
        public static List<Model.EduTrainOutput> GetTechnicalDisclosePerson()
@@ -1001,7 +1007,7 @@ namespace BLL
        }

        /// <summary>
-        /// 获取技术交底人次数(异步)
+        /// 获取设计交底人次数(异步)
        /// </summary>
        /// <returns></returns>
        public static async Task<List<EduTrainOutput>> GetTechnicalDisclosePersonNumAsync()
@@ -1009,6 +1015,69 @@ namespace BLL
            return await Task.Run(GetTechnicalDisclosePerson);
        }

+
+        /// <summary>
+        /// 获取施工技术交底
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.EduTrainOutput> GetComprehensiveConTechnologyDisclosure()
+        {
+            var result = (from x in Funs.DB.Comprehensive_ConTechnologyDisclosure
+                          join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
+                          from p in pGroup.DefaultIfEmpty()
+                          where BeUnderConstructionList.Contains(p.ProjectId) && x.CompileDate > Const.DtmarkTime
+                          select new Model.EduTrainOutput()
+                          {
+                              ProjectId = x.ProjectId,
+                              ProjectName = p.ProjectName,
+                              UnitName = "",
+                              Id = x.ConTechnologyDisclosureId,
+                              TrainTitle = "",
+                              TrainStartDate = null,
+                              TrainEndDate = null,
+                              TrainPersonNum = x.DisclosurePersonNum ?? 0,
+                          }).ToList();
+            return result;
+        }
+
+        /// <summary>
+        /// 获取施工技术交底(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<EduTrainOutput>> GetComprehensiveConTechnologyDisclosureAsync()
+        {
+            return await Task.Run(GetComprehensiveConTechnologyDisclosure);
+        }
+
+        /// <summary>
+        /// 获取图纸会审
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.EduTrainOutput> GetComprehensiveReviewDrawings()
+        {
+            var result = (from x in Funs.DB.Comprehensive_ReviewDrawings
+                          join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
+                          from p in pGroup.DefaultIfEmpty()
+                          where BeUnderConstructionList.Contains(p.ProjectId) && x.CreateDate > Const.DtmarkTime
+                          select new Model.EduTrainOutput()
+                          {
+                              ProjectId = x.ProjectId,
+                              ProjectName = p.ProjectName,
+                              UnitName = "",
+                              Id = x.Id
+                          }).ToList();
+            return result;
+        }
+
+        /// <summary>
+        /// 获取图纸会审(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<EduTrainOutput>> GetComprehensiveReviewDrawingsAsync()
+        {
+            return await Task.Run(GetComprehensiveReviewDrawings);
+        }
+
        /// <summary>
        /// 获取设备报验
        /// </summary>
@@ -1058,7 +1127,19 @@ namespace BLL
        public static List<Model.Comprehensive_InspectionMachine> GetComprehensive_InspectionMachine()
        {
            var result = (from x in Funs.DB.Comprehensive_InspectionMachine
-                          where BeUnderConstructionList.Contains(x.ProjectId) && x.CompileDate > Const.DtmarkTime
+                          where BeUnderConstructionList.Contains(x.ProjectId) && x.SType == "机具" && x.CompileDate > Const.DtmarkTime
+                          select x).ToList();
+            return result;
+        }
+
+        /// <summary>
+        /// 获取设备报验
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_InspectionMachine> GetComprehensive_InspectionMachineEquipment()
+        {
+            var result = (from x in Funs.DB.Comprehensive_InspectionMachine
+                          where BeUnderConstructionList.Contains(x.ProjectId) && x.SType == "设备" && x.CompileDate > Const.DtmarkTime
                          select x).ToList();
            return result;
        }
@@ -1072,6 +1153,15 @@ namespace BLL
            return await Task.Run(GetComprehensive_InspectionMachine);
        }

+        /// <summary>
+        /// 获取设备报验(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<Comprehensive_InspectionMachine>> GetComprehensive_InspectionMachineEquipmentAsync()
+        {
+            return await Task.Run(GetComprehensive_InspectionMachineEquipment);
+        }
+
        /// <summary>
        /// 获取在用计量器具数
        /// </summary>
@@ -1730,5 +1820,110 @@ namespace BLL
        }
        #endregion

+
+
+        /// <summary>
+        /// 特设质保体系数量
+        /// </summary>
+        /// <returns></returns>
+        public static List<Comprehensive_QualityAssurance> GetQualityAssuranceNum()
+        {
+            var result = (from x in Funs.DB.Comprehensive_QualityAssurance
+                          where BeUnderConstructionList.Contains(x.ProjectId)
+                          select x).ToList();
+            return result;
+        }
+        /// <summary>
+        /// 特设质保体系数量(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<Comprehensive_QualityAssurance>> GetQualityAssuranceNumAsync()
+        {
+            return await Task.Run(GetQualityAssuranceNum);
+        }
+
+        #region 质量监督大检查数据
+
+        #region 企业级-本单位
+
+        /// <summary>
+        ///     获取企业质量大检查次数
+        /// </summary>
+        /// <returns></returns>
+        public static List<CheckOutput> GetCompanyMajorCheck()
+        {
+            var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                          join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
+                          from p in pGroup.DefaultIfEmpty()
+                          join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId into uGroup
+                          from u in uGroup.DefaultIfEmpty()
+                          join cu in Funs.DB.Base_Unit on x.CheckUnitId equals cu.UnitId into cuGroup
+                          from cu in cuGroup.DefaultIfEmpty()
+                          where cu.IsThisUnit == true && x.CheckMainType == "1"  && x.CheckDate > Const.DtmarkTime //&& x.CheckType == "1"
+                          select new Model.CheckOutput()
+                          {
+                              ProjectId = x.ProjectId,
+                              ProjectName = p.ProjectName,
+                              UnitId = x.UnitId,
+                              UnitName = u.UnitName,
+                              Id = x.SuperviseCheckReportId,
+                              CheckTeam = x.CheckTeam,
+                              CheckDate = x.CheckDate,
+                          });
+            return result.ToList();
+        }
+        /// <summary>
+        ///     获取企业质量大检查次数（异步）
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<CheckOutput>> GetCompanyMajorCheckAsync()
+        {
+            return await Task.Run(GetCompanyMajorCheck);
+        }
+
+        #endregion
+
+        #region 分支机构
+
+        /// <summary>
+        ///     获取分支机构质量大检查次数
+        /// </summary>
+        /// <returns></returns>
+        public static List<CheckOutput> GetBranchMajorCheck()
+        {
+            var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                          join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
+                          from p in pGroup.DefaultIfEmpty()
+                          join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId into uGroup
+                          from u in uGroup.DefaultIfEmpty()
+                          join cu in Funs.DB.Base_Unit on x.CheckUnitId equals cu.UnitId into cuGroup
+                          from cu in cuGroup.DefaultIfEmpty()
+                          where cu.IsBranch == true && x.CheckMainType == "1"  && x.CheckDate > Const.DtmarkTime//&& x.CheckType == "1"
+                          select new Model.CheckOutput()
+                          {
+                              ProjectId = x.ProjectId,
+                              ProjectName = p.ProjectName,
+                              UnitId = x.UnitId,
+                              UnitName = u.UnitName,
+                              Id = x.SuperviseCheckReportId,
+                              CheckTeam = x.CheckTeam,
+                              CheckDate = x.CheckDate,
+                          });
+            return result.ToList();
+        }
+        /// <summary>
+        ///     获取分支机构质量大检查次数（异步）
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<CheckOutput>> GetBranchMajorCheckAsync()
+        {
+            return await Task.Run(GetBranchMajorCheck);
+        }
+
+
+        #endregion
+
+        #endregion
+
    }
 }