diff --git a/DataBase/版本日志/SGGLDB_2025-05-06-xiaj.sql b/DataBase/版本日志/SGGLDB_2025-05-06-xiaj.sql new file mode 100644 index 0000000..5c27623 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_2025-05-06-xiaj.sql @@ -0,0 +1,64 @@ + +--1ȱݷ(ȱ 1 Բȱ 2 δں 3 װ 4 5 6 ) +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'CH_CheckItem' AND COLUMN_NAME = 'DefectType') +BEGIN + ALTER TABLE CH_CheckItem ADD DefectType int not null default 6; +END +GO + +exec sp_addextendedproperty 'MS_Description', N'ȱݷ(ȱ 1 Բȱ 2 δں 3 װ 4 5 6 )', 'SCHEMA', 'dbo', 'TABLE', 'CH_CheckItem', 'COLUMN', 'DefectType' +GO + +ALTER VIEW [dbo].[View_DCGL_CheckRectifyListFromSUB] +AS +/*ӹ˾ĵͼ*/ +SELECT CheckRectifyItem.CheckRectifyItemId + ,CheckRectifyItem.CheckRectifyId + ,CheckRectifyItem.NoticeItemId + ,CheckRectifyItem.ConfirmMan + ,CheckRectifyItem.ConfirmManName + ,CheckRectifyItem.ConfirmDate + ,CheckRectifyItem.OrderEndDate + ,CheckRectifyItem.OrderEndPerson + ,CheckRectifyItem.RealEndDate + ,CheckRectifyItem.Verification + ,CheckRectify.CheckRectifyCode + ,CheckRectify.ProjectId + ,CheckRectify.UnitId + ,CheckRectify.CheckDate + ,CheckRectify.IssueMan + ,CheckRectify.IssueDate + ,CheckRectify.HandleState + ,NoticeItem.ProblemTypes AS ProblemTypes + ,NoticeItem.SortIndex AS SortIndex + ,NoticeItem.Situation AS Situation + ,'' AS WorkType + ,'' AS DangerPoint + ,'⣩:'+NoticeItem.Describe+';ݱ׼:'+NoticeItem.Standards+';:'+NoticeItem.Advice AS RiskExists + ,'' AS IsProject + ,'' AS CheckMan + ,'' AS SubjectUnitMan + --,Table5Item.SortIndex + --,Table5Item.WorkType + --,Table5Item.DangerPoint + --,Table5Item.RiskExists + --,Table5Item.IsProject + --,Table5Item.CheckMan + --,Table5Item.SubjectUnitMan + ,AttachFile.AttachFileId + ,AttachFile.ToKeyId + ,AttachFile.AttachSource + ,AttachFile.AttachUrl + ,AttachFile2.AttachFileId AS AttachFileId2 + ,AttachFile2.ToKeyId AS ToKeyId2 + ,AttachFile2.AttachSource AS AttachSource2 + ,AttachFile2.AttachUrl AS AttachUrl2 +FROM dbo.DCGL_Check_CheckRectifyItem AS CheckRectifyItem +LEFT JOIN dbo.DCGL_Check_CheckRectify AS CheckRectify ON CheckRectifyItem.CheckRectifyid=CheckRectify.CheckRectifyId +--LEFT JOIN dbo.Check_CheckInfo_Table5Item as Table5Item on CheckRectifyItem.Table5ItemId=Table5Item.ID +LEFT JOIN DCGL_Check_CheckInfo_TableNoticeItem AS NoticeItem ON CheckRectifyItem.NoticeItemId=NoticeItem.ID +LEFT JOIN dbo.AttachFile AS AttachFile on AttachFile.ToKeyId =CheckRectifyItem.NoticeItemId +LEFT JOIN dbo.AttachFile AS AttachFile2 on AttachFile2.ToKeyId =CheckRectifyItem.CheckRectifyItemId +GO + + diff --git a/DataBase/版本日志/SGGLDB_2025-05-06-xiaj（CQMSData_CQMS）.sql b/DataBase/版本日志/SGGLDB_2025-05-06-xiaj（CQMSData_CQMS）.sql new file mode 100644 index 0000000..0d51c46 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_2025-05-06-xiaj（CQMSData_CQMS）.sql @@ -0,0 +1,95 @@ + + + + +alter table dbo.CQMSData_CQMS + add EquipmentInspectionNum int, + EquipmentInspectionQualifiedNum int, + MachineInspectionNum int, + MachineInspectionQualifiedNum int, + PersonInspectionNum int, + PersonInspectionQualifiedNum int, + MaterialInspectionNum int, + MaterialInspectionQualifiedNum int, + ConstructSolutionNum int, + ConstructSolutionProjectApproveNum int, + ConstructSolutionUnitApproveNum int, + SpecialEquipmentQualityAssuranceSystemNum int, + DesignDetailsNum int, + UnitProjectAcceptNum int, + UnitProjectAcceptOKNum int, + SubProjectAcceptNum int, + SubProjectAcceptOKNum int, + SubdivisionalWorksAcceptNum int, + SubdivisionalWorksAcceptOKNum int +go + + +exec sp_addextendedproperty 'MS_Description', N'豸-', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'EquipmentInspectionNum' +go + +exec sp_addextendedproperty 'MS_Description', N'豸-ϸ', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'EquipmentInspectionQualifiedNum' +go + +exec sp_addextendedproperty 'MS_Description', N'߱-', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'MachineInspectionNum' +go + +exec sp_addextendedproperty 'MS_Description', N'߱-ϸ', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'MachineInspectionQualifiedNum' +go + +exec sp_addextendedproperty 'MS_Description', N'Ա-', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'PersonInspectionNum' +go + +exec sp_addextendedproperty 'MS_Description', N'Ա-ϸ', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'PersonInspectionQualifiedNum' +go + +exec sp_addextendedproperty 'MS_Description', N'ϱ-', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'MaterialInspectionNum' +go + +exec sp_addextendedproperty 'MS_Description', N'ϱ-ϸ', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'MaterialInspectionQualifiedNum' +go +exec sp_addextendedproperty 'MS_Description', N'ʩ', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'ConstructSolutionNum' +go + +exec sp_addextendedproperty 'MS_Description', N'ʩĿ', 'SCHEMA', 'dbo', 'TABLE', + 'CQMSData_CQMS', 'COLUMN', 'ConstructSolutionProjectApproveNum' +go + +exec sp_addextendedproperty 'MS_Description', N'ʩҵ', 'SCHEMA', 'dbo', 'TABLE', + 'CQMSData_CQMS', 'COLUMN', 'ConstructSolutionUnitApproveNum' +go +exec sp_addextendedproperty 'MS_Description', N'豸ʱϵ', 'SCHEMA', 'dbo', 'TABLE', + 'CQMSData_CQMS', 'COLUMN', 'SpecialEquipmentQualityAssuranceSystemNum' +go +exec sp_addextendedproperty 'MS_Description', N'ͼֽ/ƽ', 'SCHEMA', 'dbo', 'TABLE', + 'CQMSData_CQMS', 'COLUMN', 'DesignDetailsNum' +go + +exec sp_addextendedproperty 'MS_Description', N'', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'SubdivisionalWorksAcceptNum' +go +exec sp_addextendedproperty 'MS_Description', N'ֲ̺ϸ', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'SubProjectAcceptOKNum' +go +exec sp_addextendedproperty 'MS_Description', N'ֲ', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'SubProjectAcceptNum' +go +exec sp_addextendedproperty 'MS_Description', N'λ̺ϸ', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'UnitProjectAcceptOKNum' +go +exec sp_addextendedproperty 'MS_Description', N'λ', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'UnitProjectAcceptNum' +go +exec sp_addextendedproperty 'MS_Description', N'̺ϸ', 'SCHEMA', 'dbo', 'TABLE', 'CQMSData_CQMS', + 'COLUMN', 'SubdivisionalWorksAcceptOKNum' +go + diff --git a/DataBase/版本日志/SGGLDB_2025-05-06-xiaj（Project_CQMSData_CQMS）.sql b/DataBase/版本日志/SGGLDB_2025-05-06-xiaj（Project_CQMSData_CQMS）.sql new file mode 100644 index 0000000..f0bafca --- /dev/null +++ b/DataBase/版本日志/SGGLDB_2025-05-06-xiaj（Project_CQMSData_CQMS）.sql @@ -0,0 +1,95 @@ + + + + +alter table dbo.Project_CQMSData_CQMS + add EquipmentInspectionNum int, + EquipmentInspectionQualifiedNum int, + MachineInspectionNum int, + MachineInspectionQualifiedNum int, + PersonInspectionNum int, + PersonInspectionQualifiedNum int, + MaterialInspectionNum int, + MaterialInspectionQualifiedNum int, + ConstructSolutionNum int, + ConstructSolutionProjectApproveNum int, + ConstructSolutionUnitApproveNum int, + SpecialEquipmentQualityAssuranceSystemNum int, + DesignDetailsNum int, + UnitProjectAcceptNum int, + UnitProjectAcceptOKNum int, + SubProjectAcceptNum int, + SubProjectAcceptOKNum int, + SubdivisionalWorksAcceptNum int, + SubdivisionalWorksAcceptOKNum int +go + + +exec sp_addextendedproperty 'MS_Description', N'豸-', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'EquipmentInspectionNum' +go + +exec sp_addextendedproperty 'MS_Description', N'豸-ϸ', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'EquipmentInspectionQualifiedNum' +go + +exec sp_addextendedproperty 'MS_Description', N'߱-', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'MachineInspectionNum' +go + +exec sp_addextendedproperty 'MS_Description', N'߱-ϸ', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'MachineInspectionQualifiedNum' +go + +exec sp_addextendedproperty 'MS_Description', N'Ա-', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'PersonInspectionNum' +go + +exec sp_addextendedproperty 'MS_Description', N'Ա-ϸ', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'PersonInspectionQualifiedNum' +go + +exec sp_addextendedproperty 'MS_Description', N'ϱ-', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'MaterialInspectionNum' +go + +exec sp_addextendedproperty 'MS_Description', N'ϱ-ϸ', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'MaterialInspectionQualifiedNum' +go +exec sp_addextendedproperty 'MS_Description', N'ʩ', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'ConstructSolutionNum' +go + +exec sp_addextendedproperty 'MS_Description', N'ʩĿ', 'SCHEMA', 'dbo', 'TABLE', + 'Project_CQMSData_CQMS', 'COLUMN', 'ConstructSolutionProjectApproveNum' +go + +exec sp_addextendedproperty 'MS_Description', N'ʩҵ', 'SCHEMA', 'dbo', 'TABLE', + 'Project_CQMSData_CQMS', 'COLUMN', 'ConstructSolutionUnitApproveNum' +go +exec sp_addextendedproperty 'MS_Description', N'豸ʱϵ', 'SCHEMA', 'dbo', 'TABLE', + 'Project_CQMSData_CQMS', 'COLUMN', 'SpecialEquipmentQualityAssuranceSystemNum' +go +exec sp_addextendedproperty 'MS_Description', N'ͼֽ/ƽ', 'SCHEMA', 'dbo', 'TABLE', + 'Project_CQMSData_CQMS', 'COLUMN', 'DesignDetailsNum' +go + +exec sp_addextendedproperty 'MS_Description', N'', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'SubdivisionalWorksAcceptNum' +go +exec sp_addextendedproperty 'MS_Description', N'ֲ̺ϸ', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'SubProjectAcceptOKNum' +go +exec sp_addextendedproperty 'MS_Description', N'ֲ', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'SubProjectAcceptNum' +go +exec sp_addextendedproperty 'MS_Description', N'λ̺ϸ', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'UnitProjectAcceptOKNum' +go +exec sp_addextendedproperty 'MS_Description', N'λ', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'UnitProjectAcceptNum' +go +exec sp_addextendedproperty 'MS_Description', N'̺ϸ', 'SCHEMA', 'dbo', 'TABLE', 'Project_CQMSData_CQMS', + 'COLUMN', 'SubdivisionalWorksAcceptOKNum' +go + diff --git a/SUBQHSE/BLL/ZHGL/DataSync/CQMSDataService.cs b/SUBQHSE/BLL/ZHGL/DataSync/CQMSDataService.cs index fc52458..cbf38d3 100644 --- a/SUBQHSE/BLL/ZHGL/DataSync/CQMSDataService.cs +++ b/SUBQHSE/BLL/ZHGL/DataSync/CQMSDataService.cs @@ -7,12 +7,14 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; namespace BLL { public static class CQMSDataService { public static SUBQHSEDB db = Funs.DB; + public static List BeUnderConstructionList = ProjectService.GetProjectWorkList().Where(x => (x.ProjectAttribute == "GONGCHENG" || x.ProjectAttribute == null)).Select(x => x.ProjectId).ToList(); #region 获取列表 @@ -518,6 +520,15 @@ namespace BLL return result; } + /// + /// 获取企业总部人数(异步) + /// + /// + public static async Task GetCompanyPersonNumAsync() + { + return await Task.Run(GetCompanyPersonNum); + } + /// /// 获取分支机构人数 /// @@ -533,5 +544,792 @@ namespace BLL select x).Count(); return result; } + + /// + /// 获取分支机构人数(异步) + /// + /// + public static async Task GetBranchPersonNumAsync() + { + return await Task.Run(GetBranchPersonNum); + } + + /// + /// 获取项目专职人数 + /// + /// + public static List GetProjectPersonNum() + { + var result = (from x in Funs.DB.SitePerson_Person + 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 y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId + where BeUnderConstructionList.Contains(p.ProjectId) && y.IsCQMS == true && x.IsUsed == true && x.IdentityCard != null + select new Model.OfSafetySupervisorsOutput + { + ProjectId = x.ProjectId, + ProjectName = p.ProjectName, + UnitId = u.UnitId, + UnitName = u.UnitName, + Name = x.PersonName, + Sex = x.Sex == null ? "" : (x.Sex == "1" ? "男" : "女"), + IdentityCard = x.IdentityCard, + WorkPostName = PostService.GetPostNameById(x.WorkPostId), + Phone = x.Telephone + }).ToList(); + result = result + .GroupBy(x => x.IdentityCard) + .Select(g => g.FirstOrDefault()) + .ToList(); + return result; + } + /// + /// 获取项目专职人数(异步) + /// + /// + public static async Task> GetProjectPersonNumAsync() + { + return await Task.Run(GetProjectPersonNum); + } + + /// + /// 获取质量培训人次数 + /// + /// + public static List GetTrainPersonNum() + { + var result = (from x in Funs.DB.Comprehensive_InspectionPerson + 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 y in Funs.DB.SitePerson_Person on x.InspectionPersonId equals y.PersonId + join z in Funs.DB.Base_WorkPost on y.WorkPostId equals z.WorkPostId + where BeUnderConstructionList.Contains(p.ProjectId) && x.IsTrain == true && x.CompileDate > Const.DtmarkTime + select new Model.OfSafetySupervisorsOutput + { + ProjectId = x.ProjectId, + ProjectName = p.ProjectName, + UnitId = u.UnitId, + UnitName = u.UnitName, + Name = x.PersonName, + Sex = y.Sex == null ? "" : (y.Sex == "1" ? "男" : "女"), + IdentityCard = y.IdentityCard, + WorkPostName = PostService.GetPostNameById(y.WorkPostId), + Phone = y.Telephone + }).ToList(); + return result; + } + /// + /// 获取质量培训人次数(异步) + /// + /// + public static async Task> GetTrainPersonNumAsync() + { + return await Task.Run(GetTrainPersonNum); + } + + /// + /// 获取技术交底人次数 + /// + /// + public static int GetTechnicalDisclosePersonNum() + { + var result = (from x in Funs.DB.Comprehensive_DesignDetails + where BeUnderConstructionList.Contains(x.ProjectId) && x.CompileDate > Const.DtmarkTime + select x.JoinPersonNum).ToList().Sum(x => x.Value); + return result; + } + + /// + /// 获取技术交底人次数 + /// + /// + public static List GetTechnicalDisclosePerson() + { + var result = (from x in Funs.DB.Comprehensive_DesignDetails + 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.DesignDetailsId, + TrainTitle = "", + TrainStartDate = null, + TrainEndDate = null, + TrainPersonNum = x.JoinPersonNum ?? 0, + }).ToList(); + return result; + } + + /// + /// 获取技术交底人次数(异步) + /// + /// + public static async Task> GetTechnicalDisclosePersonNumAsync() + { + return await Task.Run(GetTechnicalDisclosePerson); + } + + /// + /// 获取设备报验 + /// + /// + public static List GetComprehensive_InspectionEquipment() + { + var result = (from x in Funs.DB.Comprehensive_InspectionEquipment + where BeUnderConstructionList.Contains(x.ProjectId) && x.CompileDate > Const.DtmarkTime + select x).ToList(); + return result; + } + + /// + /// 获取设备报验(异步) + /// + /// + public static async Task> GetComprehensive_InspectionEquipmentAsync() + { + return await Task.Run(GetComprehensive_InspectionEquipment); + } + + /// + /// 获取人员报验 + /// + /// + public static List GetComprehensive_InspectionPerson() + { + var result = (from x in Funs.DB.Comprehensive_InspectionPerson + where BeUnderConstructionList.Contains(x.ProjectId) && x.CompileDate > Const.DtmarkTime + select x).ToList(); + return result; + } + + /// + /// 获取人员报验(异步) + /// + /// + public static async Task> GetComprehensive_InspectionPersonAsync() + { + return await Task.Run(GetComprehensive_InspectionPerson); + } + + /// + /// 获取机具报验 + /// + /// + public static List GetComprehensive_InspectionMachine() + { + var result = (from x in Funs.DB.Comprehensive_InspectionMachine + where BeUnderConstructionList.Contains(x.ProjectId) && x.CompileDate > Const.DtmarkTime + select x).ToList(); + return result; + } + + /// + /// 获取机具报验(异步) + /// + /// + public static async Task> GetComprehensive_InspectionMachineAsync() + { + return await Task.Run(GetComprehensive_InspectionMachine); + } + + /// + /// 获取在用计量器具数 + /// + /// + public static List GetUseNum() + { + var result = (from x in Funs.DB.Comprehensive_InspectionMachine + where BeUnderConstructionList.Contains(x.ProjectId) && x.IsOnSite == true && x.InspectionType.Contains("计量") && x.CompileDate > Const.DtmarkTime + select x).ToList(); + return result; + } + + /// + /// 获取在用计量器具数(异步) + /// + /// + public static async Task> GetUseNumAsync() + { + return await Task.Run(GetUseNum); + } + + /// + /// 获取校准合格数 + /// + /// + public static List GetOkNum() + { + var result = (from x in Funs.DB.Comprehensive_InspectionMachine + where BeUnderConstructionList.Contains(x.ProjectId) && x.IsOnSite == true && x.InspectionType.Contains("计量") && x.IsCheckOK == true + && x.CompileDate > Const.DtmarkTime + select x).ToList(); + return result; + } + + /// + /// 获取校准合格数(异步) + /// + /// + public static async Task> GetOkNumAsync() + { + return await Task.Run(GetOkNum); + } + + /// + /// 获取单项工程个数 + /// + /// + public static List GetSingleProjectNum() + { + var result = (from x in Funs.DB.Project_Installation + where BeUnderConstructionList.Contains(x.ProjectId) && x.SuperInstallationId == "0" + select x).ToList(); + return result; + } + + /// + /// 获取单项工程个数(异步) + /// + /// + public static async Task> GetSingleProjectNumAsync() + { + return await Task.Run(GetSingleProjectNum); + } + + /// + /// 获取单位工程个数 + /// + /// + public static List GetUnitProjectNum() + { + var result = (from x in Funs.DB.WBS_UnitWork + where BeUnderConstructionList.Contains(x.ProjectId) + select x).ToList(); + return result; + } + + /// + /// 获取单位工程个数(异步) + /// + /// + public static async Task> GetUnitProjectNumAsync() + { + return await Task.Run(GetUnitProjectNum); + } + + /// + /// 获取分部工程个数 + /// + /// + public static List GetSubProjectNum() + { + var result = (from x in Funs.DB.WBS_DivisionProject + where BeUnderConstructionList.Contains(x.ProjectId) && x.SubItemType == "1" && x.IsSelected == true + select x).ToList(); + return result; + } + + /// + /// 获取分部工程个数(异步) + /// + /// + public static async Task> GetSubProjectNumAsync() + { + return await Task.Run(GetSubProjectNum); + } + + /// + /// 获取分项工程个数 + /// + /// + public static List GetSubdivisionalWorksNum() + { + var result = (from x in Funs.DB.WBS_DivisionProject + where BeUnderConstructionList.Contains(x.ProjectId) && x.SubItemType == "3" && x.IsSelected == true + select x).ToList(); + return result; + } + + /// + /// 获取分项工程个数(异步) + /// + /// + public static async Task> GetSubdivisionalWorksNumAsync() + { + return await Task.Run(GetSubdivisionalWorksNum); + } + + /// + /// 获取检验批个数 + /// + /// + public static List GetInspectionLotNum() + { + var result = (from x in Funs.DB.WBS_BreakdownProject + where BeUnderConstructionList.Contains(x.ProjectId) && x.IsSelected == true + select x).ToList(); + return result; + } + + /// + /// 获取检验批个数(异步) + /// + /// + public static async Task> GetInspectionLotNumAsync() + { + return await Task.Run(GetInspectionLotNum); + } + + + /// + /// 施工方案数量 + /// + /// + public static List GetConstructSolution() + { + var result = (from x in Funs.DB.Solution_CQMSConstructSolution + where BeUnderConstructionList.Contains(x.ProjectId) + select x).ToList(); + return result; + } + + /// + /// 施工方案数量(异步) + /// + /// + public static async Task> GetConstructSolutionAsync() + { + return await Task.Run(GetConstructSolution); + } + + /// + /// 获取质量问题 + /// + /// + public static List GetCQMSProblem() + { + var result = (from x in Funs.DB.Check_CheckControl + where BeUnderConstructionList.Contains(x.ProjectId) && x.CheckDate > Const.DtmarkTime + select x).ToList(); + return result; + } + + /// + /// 获取质量问题(异步) + /// + /// + public static async Task> GetCQMSProblemAsync() + { + return await Task.Run(GetCQMSProblem); + } + + + /// + /// 获取分支机构巡检质量问题 + /// + /// + public static List GetBranchCQMSProblem() + { + var result = (from x in Funs.DB.View_DCGL_CheckRectifyListFromSUB + where BeUnderConstructionList.Contains(x.ProjectId) && x.ProblemTypes == "1" && x.CheckDate > Const.DtmarkTime + select x).ToList(); + return result; + } + + /// + /// 获取分支机构巡检质量问题(异步) + /// + /// + public static async Task> GetBranchCQMSProblemAsync() + { + return await Task.Run(GetBranchCQMSProblem); + } + + #region 质量验收数据 + + /// + /// 获取关键工序验收数 + /// + /// + public static List GetKeyProcessNum() + { + var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail + join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId + where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "1" && x.CreateDate > Const.DtmarkTime + select new Model.InspectionManagementOutput() + { + ProjectId = y.ProjectId, + //ProjectName = p.ProjectName, + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + Id = x.InspectionDetailId, + BreakdownCode = y.BreakdownCode, + BreakdownName = y.BreakdownName, + Basis = y.Basis, + CheckPoints = y.CheckPoints, + }).ToList(); + return result; + } + /// + /// 获取关键工序验收数(异步) + /// + /// + public static async Task> GetKeyProcessNumAsync() + { + return await Task.Run(GetKeyProcessNum); + } + + /// + /// 获取关键工序验收合格数 + /// + /// + public static List GetKeyProcessOkNum() + { + var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail + join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId + join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId + where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "1" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime + select new Model.InspectionManagementOutput() + { + ProjectId = y.ProjectId, + //ProjectName = p.ProjectName, + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + Id = x.InspectionDetailId, + BreakdownCode = y.BreakdownCode, + BreakdownName = y.BreakdownName, + Basis = y.Basis, + CheckPoints = y.CheckPoints, + }).ToList(); + return result; + } + /// + /// 获取关键工序验收合格数(异步) + /// + /// + public static async Task> GetKeyProcessOkNumAsync() + { + return await Task.Run(GetKeyProcessOkNum); + } + + /// + /// 获取特殊过程验收数 + /// + /// + public static List GetSpecialProcessNum() + { + var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail + join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId + where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "2" && x.CreateDate > Const.DtmarkTime + select new Model.InspectionManagementOutput() + { + ProjectId = y.ProjectId, + //ProjectName = p.ProjectName, + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + Id = x.InspectionDetailId, + BreakdownCode = y.BreakdownCode, + BreakdownName = y.BreakdownName, + Basis = y.Basis, + CheckPoints = y.CheckPoints, + }).ToList(); + return result; + } + /// + /// 获取特殊过程验收数(异步) + /// + /// + public static async Task> GetSpecialProcessNumAsync() + { + return await Task.Run(GetSpecialProcessNum); + } + /// + /// 获取特殊过程验收合格数 + /// + /// + public static List GetSpecialProcessOkNum() + { + var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail + join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId + join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId + where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "2" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime + select new Model.InspectionManagementOutput() + { + ProjectId = y.ProjectId, + //ProjectName = p.ProjectName, + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + Id = x.InspectionDetailId, + BreakdownCode = y.BreakdownCode, + BreakdownName = y.BreakdownName, + Basis = y.Basis, + CheckPoints = y.CheckPoints, + }).ToList(); + return result; + } + /// + /// 获取特殊过程验收合格数(异步) + /// + /// + public static async Task> GetSpecialProcessOkNumAsync() + { + return await Task.Run(GetSpecialProcessOkNum); + } + /// + /// 获取隐蔽工程验收数 + /// + /// + public static List GetConcealedWorksNum() + { + var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail + join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId + where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "3" && x.CreateDate > Const.DtmarkTime + select new Model.InspectionManagementOutput() + { + ProjectId = y.ProjectId, + //ProjectName = p.ProjectName, + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + Id = x.InspectionDetailId, + BreakdownCode = y.BreakdownCode, + BreakdownName = y.BreakdownName, + Basis = y.Basis, + CheckPoints = y.CheckPoints, + }).ToList(); + return result; + } + /// + /// 获取隐蔽工程验收数(异步) + /// + /// + public static async Task> GetConcealedWorksNumAsync() + { + return await Task.Run(GetConcealedWorksNum); + } + /// + /// 获取隐蔽工程验收合格数 + /// + /// + public static List GetConcealedWorksOkNum() + { + var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail + join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId + join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId + where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "3" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime + select new Model.InspectionManagementOutput() + { + ProjectId = y.ProjectId, + //ProjectName = p.ProjectName, + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + Id = x.InspectionDetailId, + BreakdownCode = y.BreakdownCode, + BreakdownName = y.BreakdownName, + Basis = y.Basis, + CheckPoints = y.CheckPoints, + }).ToList(); + return result; + } + /// + /// 获取隐蔽工程验收合格数(异步) + /// + /// + public static async Task> GetConcealedWorksOkNumAsync() + { + return await Task.Run(GetConcealedWorksOkNum); + } + + /// + /// 获取单位工程验收数 + /// + /// + public static List GetUnitProjectAcceptNum() + { + var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail + join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId + join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId + where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "4" && x.CreateDate > Const.DtmarkTime + select new Model.InspectionManagementOutput() + { + ProjectId = y.ProjectId, + //ProjectName = p.ProjectName, + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + Id = x.InspectionDetailId, + BreakdownCode = y.BreakdownCode, + BreakdownName = y.BreakdownName, + Basis = y.Basis, + CheckPoints = y.CheckPoints, + }).ToList(); + return result; + } + /// + /// 获取单位工程验收数(异步) + /// + /// + public static async Task> GetUnitProjectAcceptNumAsync() + { + return await Task.Run(GetUnitProjectAcceptNum); + } + /// + /// 获取单位工程验收合格数 + /// + /// + public static List GetUnitProjectAcceptOKNum() + { + var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail + join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId + join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId + where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "4" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime + select new Model.InspectionManagementOutput() + { + ProjectId = y.ProjectId, + //ProjectName = p.ProjectName, + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + Id = x.InspectionDetailId, + BreakdownCode = y.BreakdownCode, + BreakdownName = y.BreakdownName, + Basis = y.Basis, + CheckPoints = y.CheckPoints, + }).ToList(); + return result; + } + /// + /// 获取单位工程验收合格数(异步) + /// + /// + public static async Task> GetUnitProjectAcceptOKNumAsync() + { + return await Task.Run(GetUnitProjectAcceptOKNum); + } + + + /// + /// 获取分部工程验收数 + /// + /// + public static List GetSubProjectAcceptNum() + { + var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail + join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId + join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId + where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "5" && x.CreateDate > Const.DtmarkTime + select new Model.InspectionManagementOutput() + { + ProjectId = y.ProjectId, + //ProjectName = p.ProjectName, + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + Id = x.InspectionDetailId, + BreakdownCode = y.BreakdownCode, + BreakdownName = y.BreakdownName, + Basis = y.Basis, + CheckPoints = y.CheckPoints, + }).ToList(); + return result; + } + /// + /// 获取分部工程验收数(异步) + /// + /// + public static async Task> GetSubProjectAcceptNumAsync() + { + return await Task.Run(GetSubProjectAcceptNum); + } + /// + /// 获取分部工程验收合格数 + /// + /// + public static List GetSubProjectAcceptOKNum() + { + var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail + join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId + join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId + where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "5" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime + select new Model.InspectionManagementOutput() + { + ProjectId = y.ProjectId, + //ProjectName = p.ProjectName, + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + Id = x.InspectionDetailId, + BreakdownCode = y.BreakdownCode, + BreakdownName = y.BreakdownName, + Basis = y.Basis, + CheckPoints = y.CheckPoints, + }).ToList(); + return result; + } + /// + /// 获取分部工程验收合格数(异步) + /// + /// + public static async Task> GetSubProjectAcceptOKNumAsync() + { + return await Task.Run(GetSubProjectAcceptOKNum); + } + /// + /// 获取分项工程验收数 + /// + /// + public static List GetSubdivisionalWorksAcceptNum() + { + var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail + join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId + join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId + where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "6" && x.CreateDate > Const.DtmarkTime + select new Model.InspectionManagementOutput() + { + ProjectId = y.ProjectId, + //ProjectName = p.ProjectName, + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + Id = x.InspectionDetailId, + BreakdownCode = y.BreakdownCode, + BreakdownName = y.BreakdownName, + Basis = y.Basis, + CheckPoints = y.CheckPoints, + }).ToList(); + return result; + } + /// + /// 获取分项工程验收数(异步) + /// + /// + public static async Task> GetSubdivisionalWorksAcceptNumAsync() + { + return await Task.Run(GetSubdivisionalWorksAcceptNum); + } + /// + /// 获取分项工程验收合格数 + /// + /// + public static List GetSubdivisionalWorksAcceptOKNum() + { + var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail + join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId + join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId + where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "6" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime + select new Model.InspectionManagementOutput() + { + ProjectId = y.ProjectId, + //ProjectName = p.ProjectName, + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + Id = x.InspectionDetailId, + BreakdownCode = y.BreakdownCode, + BreakdownName = y.BreakdownName, + Basis = y.Basis, + CheckPoints = y.CheckPoints, + }).ToList(); + return result; + } + /// + /// 获取分项工程验收合格数(异步) + /// + /// + public static async Task> GetSubdivisionalWorksAcceptOKNumAsync() + { + return await Task.Run(GetSubdivisionalWorksAcceptOKNum); + } + + #endregion + } } \ No newline at end of file diff --git a/SUBQHSE/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs b/SUBQHSE/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs index 51fc359..de58415 100644 --- a/SUBQHSE/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs +++ b/SUBQHSE/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs @@ -8,12 +8,14 @@ using System.Linq; using Newtonsoft.Json.Linq; using Model.Customization; using System.Net.PeerToPeer; +using System.Threading.Tasks; namespace BLL { public static class HJGLData_HJGLService { public static SUBQHSEDB db = Funs.DB; + public static List BeUnderConstructionList = ProjectService.GetProjectWorkList().Where(x => (x.ProjectAttribute == "GONGCHENG" || x.ProjectAttribute == null)).Select(x => x.ProjectId).ToList(); #region 获取列表 @@ -389,5 +391,89 @@ namespace BLL } } + + + /// + /// 获取焊工总数 + /// + /// + public static List GetWelderNum() + { + var result = (from x in Funs.DB.BS_Welder + where BeUnderConstructionList.Contains(x.ProjectId) && x.WED_IfOnGuard == true + select new Model.WelderOutput() + { + ProjectId = x.ProjectId, + UnitId = x.WED_Unit, + WEDCode = x.WED_Code, + WEDName = x.WED_Name + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + }).ToList(); + return result; + } + /// + /// 获取焊工总数(异步) + /// + /// + public static async Task> GetWelderNumAsync() + { + return await Task.Run(GetWelderNum); + } + + /// + /// 获取总达因数和完成达因数 + /// + /// + public static List GetDineInfo() + { + var result = (from x in Funs.DB.PW_JointInfo + where BeUnderConstructionList.Contains(x.ProjectId) + select new Model.WeldDineOutput() + { + Id = x.JOT_ID, + ProjectId = x.ProjectId, + Size = x.JOT_Size, + DoneDin = x.JOT_DoneDin + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + }).ToList(); + return result; + } + /// + /// 获取总达因数(异步) + /// + /// + public static async Task> GetDineInfoAsync() + { + return await Task.Run(GetDineInfo); + } + + /// + /// 获取焊接检查信息 + /// + /// + public static List GetCHCheckItem() + { + var result = (from x in Funs.DB.CH_CheckItem + join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID + where BeUnderConstructionList.Contains(y.ProjectId) + select new Model.CHCheckItemOutput() + { + Id = x.CHT_CheckItemID, + ProjectId = y.ProjectId, + UnitId = y.UnitId, + CHT_TotalFilm = x.CHT_TotalFilm, + CHT_PassFilm = x.CHT_PassFilm + //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds), + }).ToList(); + return result; + } + /// + /// 获取焊接检查信息(异步) + /// + /// + public static async Task> GetCHCheckItemAsync() + { + return await Task.Run(GetCHCheckItem); + } } } \ No newline at end of file diff --git a/SUBQHSE/BLL/ZHGL/DataSync/MainSevice.cs b/SUBQHSE/BLL/ZHGL/DataSync/MainSevice.cs index bc6949e..6c1ed34 100644 --- a/SUBQHSE/BLL/ZHGL/DataSync/MainSevice.cs +++ b/SUBQHSE/BLL/ZHGL/DataSync/MainSevice.cs @@ -1,4 +1,5 @@ using Model; +using Model.Enums; using System; using System.Collections.Generic; using System.Linq; @@ -15,6 +16,8 @@ namespace BLL /// private List _beUnderConstructionList; private HSSEData_HSSE _hsseData; + private CQMSData_CQMS _cqmsData; + private HJGLData_HJGL _hjglData; private string _unitId; private int _unitType; @@ -49,7 +52,10 @@ namespace BLL _beUnderConstructionList = new List() { projectId }; } - + /// + /// 安全数据 + /// + /// public async Task GetHsseDataAsync() { try @@ -379,5 +385,254 @@ namespace BLL }).ToList(); return result; } + + + /// + /// 质量数据 + /// + /// + public async Task GetCqmsDataAsync() + { + try + { + // 并行执行异步方法 + var companyPersonNumTask = CQMSDataService.GetCompanyPersonNumAsync(); //获取企业总部人数 + var branchPersonNumTask = CQMSDataService.GetBranchPersonNumAsync(); //获取分支机构人数 + var projectPersonNumTask = CQMSDataService.GetProjectPersonNumAsync(); //获取项目专职人数 + var trainPersonNumTask = CQMSDataService.GetTrainPersonNumAsync(); //获取质量培训人次数 + var technicalDisclosePersonTask = CQMSDataService.GetTechnicalDisclosePersonNumAsync(); //获取技术交底人次数 + + var inspectionEquipmentTask = CQMSDataService.GetComprehensive_InspectionEquipmentAsync(); //获取设备报验 + var inspectionPersonTask = CQMSDataService.GetComprehensive_InspectionPersonAsync(); //获取人员报验 + var inspectionMachineTask = CQMSDataService.GetComprehensive_InspectionMachineAsync(); //获取机具报验 + var useNumTask = CQMSDataService.GetUseNumAsync(); //获取在用计量器具数 + var okNumTask = CQMSDataService.GetOkNumAsync(); //获取校准合格数 + + var singleProjectNumTask = CQMSDataService.GetSingleProjectNumAsync(); //获取单项工程个数 + var unitProjectNumTask = CQMSDataService.GetUnitProjectNumAsync(); //获取单位工程个数 + var subProjectNuTask = CQMSDataService.GetSubProjectNumAsync(); //获取分部工程个数 + var subdivisionalWorksNuTask = CQMSDataService.GetSubdivisionalWorksNumAsync(); //获取分项工程个数 + var inspectionLotNumTask = CQMSDataService.GetInspectionLotNumAsync(); //获取检验批个数 + var constructSolutionTask = CQMSDataService.GetConstructSolutionAsync(); //施工方案数量 + var cqmsProblemTask = CQMSDataService.GetCQMSProblemAsync(); //获取企业级、项目级质量问题 + + //质量验收数据 + var keyProcessNumTask = CQMSDataService.GetKeyProcessNumAsync(); //获取关键工序验收数 + var keyProcessOKNumTask = CQMSDataService.GetKeyProcessOkNumAsync(); //获取关键工序验收合格数 + var specialProcessNumTask = CQMSDataService.GetSpecialProcessNumAsync(); //获取特殊过程验收数 + var specialProcessOKNumTask = CQMSDataService.GetSpecialProcessOkNumAsync(); //获取特殊过程验收合格数 + var concealedWorksNumTask = CQMSDataService.GetConcealedWorksNumAsync(); //获取隐蔽工程验收数 + var concealedWorksOKNumTask = CQMSDataService.GetConcealedWorksOkNumAsync(); //获取隐蔽工程验收合格数 + + var unitProjectAcceptNumTask = CQMSDataService.GetUnitProjectAcceptNumAsync(); //获取单位工程验收数 + var unitProjectAcceptOKNumTask = CQMSDataService.GetUnitProjectAcceptOKNumAsync(); //获取单位工程验收合格数 + var subProjectAcceptNumTask = CQMSDataService.GetSubProjectAcceptNumAsync(); //获取分部工程验收数 + var subProjectAcceptOKNumTask = CQMSDataService.GetSubProjectAcceptOKNumAsync(); //获取分部工程验收合格数 + var subdivisionalWorksAcceptNumTask = CQMSDataService.GetSubdivisionalWorksAcceptNumAsync(); //获取分项工程验收数 + var subdivisionalWorksAcceptOKNumTask = CQMSDataService.GetSubdivisionalWorksAcceptOKNumAsync(); //获取分项工程验收合格数 + + // 等待所有异步方法执行完成 + await Task.WhenAll( + companyPersonNumTask, branchPersonNumTask, projectPersonNumTask, + trainPersonNumTask, technicalDisclosePersonTask, + inspectionEquipmentTask, inspectionPersonTask, inspectionMachineTask, + useNumTask, okNumTask, + singleProjectNumTask, unitProjectNumTask, subProjectNuTask, subdivisionalWorksNuTask, inspectionLotNumTask, + constructSolutionTask, + cqmsProblemTask, + keyProcessNumTask, keyProcessOKNumTask, specialProcessNumTask, specialProcessOKNumTask, concealedWorksNumTask, concealedWorksOKNumTask, + unitProjectAcceptNumTask, unitProjectAcceptOKNumTask, subProjectAcceptNumTask, subProjectAcceptOKNumTask, subdivisionalWorksAcceptNumTask, subdivisionalWorksAcceptOKNumTask + ); + + // 统一获取异步方法的返回值 + var companyPersonNum = await companyPersonNumTask; + var branchPersonNum = await branchPersonNumTask; + var projectPersonNumList = await projectPersonNumTask; + var trainPersonNumList = await trainPersonNumTask; + var technicalDisclosePersonList = await technicalDisclosePersonTask; + + var inspectionEquipmentList = await inspectionEquipmentTask; + var inspectionPersonList = await inspectionPersonTask; + var inspectionMachineList = await inspectionMachineTask; + var useNum = await useNumTask; + var okNum = await okNumTask; + var singleProjectNum = await singleProjectNumTask; + var unitProjectNum = await unitProjectNumTask; + var subProjectNum = await subProjectNuTask; + var subdivisionalWorksNum = await subdivisionalWorksNuTask; + var inspectionLotNum = await inspectionLotNumTask; + + var constructSolutionList = await constructSolutionTask; + var cqmsProblemList = await cqmsProblemTask; + + var keyProcessNum = await keyProcessNumTask; + var keyProcessOKNum = await keyProcessOKNumTask; + var specialProcessNum = await specialProcessNumTask; + var specialProcessOKNum = await specialProcessOKNumTask; + var concealedWorksNum = await concealedWorksNumTask; + var concealedWorksOKNum = await concealedWorksOKNumTask; + + var unitProjectAcceptNum = await unitProjectAcceptNumTask; + var unitProjectAcceptOKNum = await unitProjectAcceptOKNumTask; + var subProjectAcceptNum = await subProjectAcceptNumTask; + var subProjectAcceptOKNum = await subProjectAcceptOKNumTask; + var subdivisionalWorksAcceptNum = await subdivisionalWorksAcceptNumTask; + var subdivisionalWorksAcceptOKNum = await subdivisionalWorksAcceptOKNumTask; + + if (_unitType == 1 || _unitType == 3) + { + 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(); + 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(); + useNum = useNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + okNum = okNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + singleProjectNum = singleProjectNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + unitProjectNum = unitProjectNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + subProjectNum = subProjectNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + subdivisionalWorksNum = subdivisionalWorksNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + inspectionLotNum = inspectionLotNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + constructSolutionList = constructSolutionList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + cqmsProblemList = cqmsProblemList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + keyProcessNum = keyProcessNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + keyProcessOKNum = keyProcessOKNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + specialProcessNum = specialProcessNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + specialProcessOKNum = specialProcessOKNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + concealedWorksNum = concealedWorksNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + concealedWorksOKNum = concealedWorksOKNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + unitProjectAcceptNum = unitProjectAcceptNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + unitProjectAcceptOKNum = unitProjectAcceptOKNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + subProjectAcceptNum = subProjectAcceptNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + subProjectAcceptOKNum = subProjectAcceptOKNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + subdivisionalWorksAcceptNum = subdivisionalWorksAcceptNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + subdivisionalWorksAcceptOKNum = subdivisionalWorksAcceptOKNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + } + // 构造结果对象 + var table = new CQMSData_CQMS + { + CompanyPersonNum = companyPersonNum,// + BranchPersonNum = branchPersonNum,// + ProjectPersonNum = projectPersonNumList.Count(), + TrainPersonNum = trainPersonNumList.Count(), + TechnicalDisclosePersonNum = technicalDisclosePersonList.Sum(x => x.TrainPersonNum), + 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, + UseNum = useNum.Count(), + OKNum = okNum.Count(), + SingleProjectNum = singleProjectNum.Count(), + UnitProjectNum = unitProjectNum.Count(), + SubProjectNum = subProjectNum.Count(), + SubdivisionalWorksNum = subdivisionalWorksNum.Count(), + InspectionLotNum = inspectionLotNum.Count(), + + ConstructSolutionNum = constructSolutionList.Count(), + ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.State == "1").Count(), + ConstructSolutionUnitApproveNum = 0,// + SpecialEquipmentQualityAssuranceSystemNum = 0,// + 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(), + + KeyProcessNum = keyProcessNum.Count(), + KeyProcessOKNum = keyProcessOKNum.Count(), + SpecialProcessNum = specialProcessNum.Count(), + SpecialProcessOKNum = specialProcessOKNum.Count(), + ConcealedWorksNum = concealedWorksNum.Count(), + ConcealedWorksOKNum = concealedWorksOKNum.Count(), + UnitProjectAcceptNum = unitProjectAcceptNum.Count(), + UnitProjectAcceptOKNum = unitProjectAcceptOKNum.Count(), + SubProjectAcceptNum = subProjectAcceptNum.Count(), + SubProjectAcceptOKNum = subProjectAcceptOKNum.Count(), + SubdivisionalWorksAcceptNum = subdivisionalWorksAcceptNum.Count(), + SubdivisionalWorksAcceptOKNum = subdivisionalWorksAcceptOKNum.Count() + }; + + _cqmsData = table; + return _cqmsData; + } + catch (Exception ex) + { + throw; + } + } + + /// + /// 焊接数据 + /// + /// + public async Task GetHjglDataAsync() + { + try + { + // 并行执行异步方法 + var welderNumTask = HJGLData_HJGLService.GetWelderNumAsync(); //获取焊工总数 + var dineInfoListTask = HJGLData_HJGLService.GetDineInfoAsync(); //获达因数信息 + var chCheckItemListTask = HJGLData_HJGLService.GetCHCheckItemAsync(); //获取焊接检查信息 + + // 等待所有异步方法执行完成 + await Task.WhenAll( + welderNumTask, + dineInfoListTask, + chCheckItemListTask + ); + + // 统一获取异步方法的返回值 + var welderNum = await welderNumTask; + var dineInfoList = await dineInfoListTask; + var chCheckItemList = await chCheckItemListTask; + + if (_unitType == 1 || _unitType == 3) + { + welderNum = welderNum.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + dineInfoList = dineInfoList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + chCheckItemList = chCheckItemList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).ToList(); + } + + // 构造结果对象 + var table = new HJGLData_HJGL + { + WelderNum = welderNum.Count(), + TotalDineNum = Convert.ToInt32(dineInfoList.Sum(x => x.Size)), + CompleteDineNum = Convert.ToInt32(dineInfoList.Sum(x => x.DoneDin)), + TotalFilmNum = Convert.ToInt32(chCheckItemList.Sum(x => x.CHT_TotalFilm)), + OKFilmNum = Convert.ToInt32(chCheckItemList.Sum(x => x.CHT_PassFilm)) + }; + _hjglData = table; + return _hjglData; + } + catch (Exception ex) + { + throw; + } + } + + /// + /// 焊接缺陷分析 + /// + /// + public List GetDefectAnalysis() + { + var db = Funs.DB; + var list = (from item in db.CH_CheckItem + join check in db.CH_Check on item.CHT_CheckID equals check.CHT_CheckID + where _beUnderConstructionList.Contains(check.ProjectId) + group item by item.DefectType into g + select new AnalysisData + { + name = Enum.GetName(typeof(DefectTypeEnums), g.Key), + value = g.Count() + }).ToList(); + return list; + } } } \ No newline at end of file diff --git a/SUBQHSE/FineUIPro.Web/common/main.aspx b/SUBQHSE/FineUIPro.Web/common/main.aspx index d64cdb0..57f62e7 100644 --- a/SUBQHSE/FineUIPro.Web/common/main.aspx +++ b/SUBQHSE/FineUIPro.Web/common/main.aspx @@ -702,7 +702,12 @@ branchNum: 0,//分部工程数 itemizeNum: 0,//分项工程数 }, - //质量验收数据 + checkAccepts: [],//质量验收数据——表1：验收数 + checkAcceptOKs: [],//质量验收数据——表1：合格数 + checkAcceptOKRates: [],//质量验收数据——表1：合格率 + checkAccepts2: [],//质量验收数据——表2：验收数 + checkAcceptOKs2: [],//质量验收数据——表2：合格数 + checkAcceptOKRates2: [],//质量验收数据——表2：合格率 specialEquipmentSys: 0,//特种设备质保体系 designBriefing: 0,//图纸会审、设计交底 hsseEduTrain: @@ -769,9 +774,19 @@ if (response.d.success) { // 更新数据成功 that.form = { ...response.d.data }; // 更新表单数据 + //console.log("请求结果：", that.form); + that.checkAccepts = [...response.d.data.checkAccepts]; //获取质量验收数据——表1：验收数 + that.checkAcceptOKs = [...response.d.data.checkAcceptOKs]; //获取质量验收数据——表1：合格数 + that.checkAcceptOKRates = [...response.d.data.checkAcceptOKRates]; //获取质量验收数据——表1：合格率 + that.checkAccepts2 = [...response.d.data.checkAccepts2]; //获取质量验收数据——表2：验收数 + that.checkAcceptOKs2 = [...response.d.data.checkAcceptOKs2]; //获取质量验收数据——表2：合格数 + that.checkAcceptOKRates2 = [...response.d.data.checkAcceptOKRates2]; //获取质量验收数据——表2：合格率 + that.chinaData = [...response.d.data.chinaData]; // 更新地图数据 //console.log("111111111",that.chinaData); that.createChinaMap(that.chinaData); // 重新创建地图 + that.createMap1(that.checkAccepts, that.checkAcceptOKs, that.checkAcceptOKRates); // 更新数据 + that.createMap2(that.checkAccepts2, that.checkAcceptOKs2, that.checkAcceptOKRates2); // 更新数据 } else { // 更新数据失败 alert("加载数据失败：" + response.d.msg); @@ -995,7 +1010,7 @@ * @param {*} data2 合格数 * @param {*} data3 合格率 */ - createMap1(data1, data2, data3) { + createMap1(data1 = [], data2 = [], data3 = []) { if (!this.map1) { this.map1 = echarts.init(document.getElementById('map1')) } @@ -1039,23 +1054,24 @@ } }, yAxis: [ - { type: 'value', name: '数量', position: 'left', + splitNumber: 5, alignTicks: true, splitLine: { lineStyle: { color: '#123858' // 设置Y轴线颜色为白色 } }, - }, { type: 'value', name: '百分比', position: 'right', + splitNumber: 5, + interval: 25, max: 100, min: 0, alignTicks: true, @@ -1069,7 +1085,7 @@ series: [ { name: "验收数", - data: [120, 200, 150], + data: data1, type: 'bar', yAxisIndex: 0, barWidth: 14, @@ -1086,7 +1102,7 @@ }, { name: "合格数", - data: [120, 200, 150], + data: data2, type: 'bar', yAxisIndex: 0, barWidth: 14, @@ -1104,7 +1120,7 @@ { name: "合格率", yAxisIndex: 1, - data: [80, 22.1, 12], + data: data3, type: 'line', smooth: true, // 设置折线图变圆滑 symbol: 'none', @@ -1123,7 +1139,7 @@ * @param {*} data2 合格数 * @param {*} data3 合格率 */ - createMap2(data1, data2, data3) { + createMap2(data1 = [], data2 = [], data3 = []) { if (!this.map2) { this.map2 = echarts.init(document.getElementById('map2')) } @@ -1172,6 +1188,7 @@ type: 'value', name: '数量', position: 'left', + splitNumber: 5, alignTicks: true, splitLine: { lineStyle: { @@ -1184,6 +1201,8 @@ type: 'value', name: '百分比', position: 'right', + splitNumber: 5, + interval: 25, max: 100, min: 0, alignTicks: true, @@ -1197,7 +1216,7 @@ series: [ { name: "验收数", - data: [120, 200, 150], + data: data1, type: 'bar', yAxisIndex: 0, barWidth: 14, @@ -1214,7 +1233,7 @@ }, { name: "合格数", - data: [120, 200, 150], + data: data2, type: 'bar', yAxisIndex: 0, barWidth: 14, @@ -1232,7 +1251,7 @@ { name: "合格率", yAxisIndex: 1, - data: [80, 22.1, 12], + data: data3, type: 'line', smooth: true, // 设置折线图变圆滑 symbol: 'none', diff --git a/SUBQHSE/FineUIPro.Web/common/main.aspx.cs b/SUBQHSE/FineUIPro.Web/common/main.aspx.cs index 67dd8c2..40242f6 100644 --- a/SUBQHSE/FineUIPro.Web/common/main.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/common/main.aspx.cs @@ -34,6 +34,8 @@ namespace FineUIPro.Web.common MainSevice mainSevice = new MainSevice(page.CurrUser.UserId); // 获取HSSE数据 var hsseData = Task.Run(() => mainSevice.GetHsseDataAsync()).Result; + //获取CQMS数据 + var cqmsData = Task.Run(() => mainSevice.GetCqmsDataAsync()).Result; //班前会 var classMeetingList = HSSEData_HSSEService.GetProjectClassMeeting(null); @@ -86,20 +88,20 @@ namespace FineUIPro.Web.common var inspectionMachineList = (from x in db.Comprehensive_InspectionMachine select x).ToList(); - Model.CQMSData_CQMS cqmsData = new Model.CQMSData_CQMS(); + //Model.CQMSData_CQMS cqmsData = new Model.CQMSData_CQMS(); var getCqmsDataCqms = db.CQMSData_CQMS.OrderByDescending(x => x.ReportDate).FirstOrDefault(); if (getCqmsDataCqms == null) { - cqmsData = new Model.CQMSData_CQMS(); + //cqmsData = new Model.CQMSData_CQMS(); } if (unitType == 0) { - cqmsData = getCqmsDataCqms; + //cqmsData = getCqmsDataCqms; } else if (unitType == 1) { - cqmsData = CQMSDataService.GetSubUnitCqmsDataByDate(page.CurrUser.UnitId, getCqmsDataCqms.ReportDate); + //cqmsData = CQMSDataService.GetSubUnitCqmsDataByDate(page.CurrUser.UnitId, getCqmsDataCqms.ReportDate); classMeetingList = classMeetingList.Where(x => _beUnderConstructionList.Contains(x.ProjectId) || x.UnitId == page.CurrUser.UnitId).ToList(); weekMeetingList = weekMeetingList.Where(x => _beUnderConstructionList.Contains(x.ProjectId) || x.UnitId == page.CurrUser.UnitId).ToList(); designDetailsList = designDetailsList.Where(x => _beUnderConstructionList.Contains(x.ProjectId) || x.UnitName == page.CurrUser.UnitId).ToList(); @@ -110,7 +112,7 @@ namespace FineUIPro.Web.common } else if (unitType == 2) { - cqmsData = new Model.CQMSData_CQMS(); + //cqmsData = new Model.CQMSData_CQMS(); classMeetingList = new List(); weekMeetingList = new List(); designDetailsList = new List(); @@ -142,6 +144,56 @@ namespace FineUIPro.Web.common cqmsZGRate = "0"; } + #region 质量验收数据 + + //关键工序合格率 + double keyProcessRate = cqmsData.KeyProcessOKNum > 0 ? Math.Round(100 * ((double)cqmsData.KeyProcessOKNum / (double)cqmsData.KeyProcessNum), 2) : 0; + //特殊工程合格率 + double specialProcessRate = cqmsData.SpecialProcessOKNum > 0 ? Math.Round(100 * ((double)cqmsData.SpecialProcessOKNum / (double)cqmsData.SpecialProcessNum), 2) : 0; + //隐蔽工程合格率 + double concealedWorksRate = cqmsData.ConcealedWorksOKNum > 0 ? Math.Round(100 * ((double)cqmsData.ConcealedWorksOKNum / (double)cqmsData.ConcealedWorksNum), 2) : 0; + + //单位工程合格率 + double unitProjecProcessRate = cqmsData.UnitProjectAcceptNum > 0 ? Math.Round(100 * ((double)cqmsData.UnitProjectAcceptOKNum / (double)cqmsData.UnitProjectAcceptNum), 2) : 0; + //分部工程合格率 + double subProjectProcessRate = cqmsData.SubProjectAcceptOKNum > 0 ? Math.Round(100 * ((double)cqmsData.SubProjectAcceptOKNum / (double)cqmsData.SubProjectAcceptNum), 2) : 0; + //分项工程合格率 + double subdivisionalWorksRate = cqmsData.SubdivisionalWorksAcceptOKNum > 0 ? Math.Round(100 * ((double)cqmsData.SubdivisionalWorksAcceptOKNum / (double)cqmsData.SubdivisionalWorksAcceptNum), 2) : 0; + + //验收数 + List checkAccepts = new List(); + checkAccepts.Add((int)cqmsData.KeyProcessNum); + checkAccepts.Add((int)cqmsData.SpecialProcessNum); + checkAccepts.Add((int)cqmsData.ConcealedWorksNum); + //合格数 + List checkAcceptOKs = new List(); + checkAcceptOKs.Add((int)cqmsData.KeyProcessOKNum); + checkAcceptOKs.Add((int)cqmsData.SpecialProcessOKNum); + checkAcceptOKs.Add((int)cqmsData.ConcealedWorksOKNum); + //合格率 + List checkAcceptOKRates = new List(); + checkAcceptOKRates.Add(keyProcessRate); + checkAcceptOKRates.Add(specialProcessRate); + checkAcceptOKRates.Add(concealedWorksRate); + + //验收数 + List checkAccepts2 = new List(); + checkAccepts2.Add((int)cqmsData.UnitProjectAcceptNum); + checkAccepts2.Add((int)cqmsData.SubProjectAcceptNum); + checkAccepts2.Add((int)cqmsData.SubdivisionalWorksAcceptNum); + //合格数 + List checkAcceptOKs2 = new List(); + checkAcceptOKs2.Add((int)cqmsData.UnitProjectAcceptOKNum); + checkAcceptOKs2.Add((int)cqmsData.SubProjectAcceptOKNum); + checkAcceptOKs2.Add((int)cqmsData.SubdivisionalWorksAcceptOKNum); + //合格率 + List checkAcceptOKRates2 = new List(); + checkAcceptOKRates2.Add(unitProjecProcessRate); + checkAcceptOKRates2.Add(subProjectProcessRate); + checkAcceptOKRates2.Add(subdivisionalWorksRate); + + #endregion + // 构造返回数据 var returnData = new { @@ -241,7 +293,13 @@ namespace FineUIPro.Web.common branchNum = cqmsData.SubProjectNum ?? 0,//分部工程数 itemizeNum = cqmsData.SubdivisionalWorksNum ?? 0,//分项工程数 }, - //质量验收数据【待汇总】 + //质量验收数据 + checkAccepts = checkAccepts, + checkAcceptOKs = checkAcceptOKs, + checkAcceptOKRates = checkAcceptOKRates, + checkAccepts2 = checkAccepts2, + checkAcceptOKs2 = checkAcceptOKs2, + checkAcceptOKRates2 = checkAcceptOKRates2, specialEquipmentSys = 0,//特种设备质保体系【待汇总】 designBriefing = designDetailsList.Count(),//图纸会审、设计交底 hsseEduTrain = new diff --git a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx index b3958e6..89433d8 100644 --- a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx +++ b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx @@ -652,6 +652,12 @@ branchNum: 0,//分部工程数 itemizeNum: 0,//分项工程数 }, + checkAccepts: [],//质量验收数据——表1：验收数 + checkAcceptOKs: [],//质量验收数据——表1：合格数 + checkAcceptOKRates: [],//质量验收数据——表1：合格率 + checkAccepts2: [],//质量验收数据——表2：验收数 + checkAcceptOKs2: [],//质量验收数据——表2：合格数 + checkAcceptOKRates2: [],//质量验收数据——表2：合格率 specialEquipmentSys: 0,//特种设备质保体系 designBriefing: 0,//图纸会审、设计交底 hsseEduTrain: @@ -712,11 +718,20 @@ contentType: "application/json; charset=utf-8", dataType: "json", success: function (response) { - console.log(response.d) + //console.log(response.d) if (response.d.success) { // 更新数据成功 that.form = { ...response.d.data }; // 更新表单数据 - console.log(that.form) + //console.log(that.form) + that.checkAccepts = [...response.d.data.checkAccepts]; //获取质量验收数据——表1：验收数 + that.checkAcceptOKs = [...response.d.data.checkAcceptOKs]; //获取质量验收数据——表1：合格数 + that.checkAcceptOKRates = [...response.d.data.checkAcceptOKRates]; //获取质量验收数据——表1：合格率 + that.checkAccepts2 = [...response.d.data.checkAccepts2]; //获取质量验收数据——表2：验收数 + that.checkAcceptOKs2 = [...response.d.data.checkAcceptOKs2]; //获取质量验收数据——表2：合格数 + that.checkAcceptOKRates2 = [...response.d.data.checkAcceptOKRates2]; //获取质量验收数据——表2：合格率 + + that.createMap1(that.checkAccepts, that.checkAcceptOKs, that.checkAcceptOKRates); // 更新数据 + that.createMap2(that.checkAccepts2, that.checkAcceptOKs2, that.checkAcceptOKRates2); // 更新数据 } else { // 更新数据失败 alert("加载数据失败：" + response.d.msg); @@ -772,7 +787,7 @@ * @param {*} data2 合格数 * @param {*} data3 合格率 */ - createMap1(data1, data2, data3) { + createMap1(data1 = [], data2 = [], data3 = []) { if (!this.map1) { this.map1 = echarts.init(document.getElementById('map1')) } @@ -816,23 +831,24 @@ } }, yAxis: [ - { type: 'value', name: '数量', position: 'left', + splitNumber: 5, alignTicks: true, splitLine: { lineStyle: { color: '#123858' // 设置Y轴线颜色为白色 } }, - }, { type: 'value', name: '百分比', position: 'right', + splitNumber: 5, + interval: 25, max: 100, min: 0, alignTicks: true, @@ -846,7 +862,7 @@ series: [ { name: "验收数", - data: [120, 200, 150], + data: data1, type: 'bar', yAxisIndex: 0, barWidth: 14, @@ -863,7 +879,7 @@ }, { name: "合格数", - data: [120, 200, 150], + data: data2, type: 'bar', yAxisIndex: 0, barWidth: 14, @@ -881,7 +897,7 @@ { name: "合格率", yAxisIndex: 1, - data: [80, 22.1, 12], + data: data3, type: 'line', smooth: true, // 设置折线图变圆滑 symbol: 'none', @@ -900,7 +916,7 @@ * @param {*} data2 合格数 * @param {*} data3 合格率 */ - createMap2(data1, data2, data3) { + createMap2(data1 = [], data2 = [], data3 = []) { if (!this.map2) { this.map2 = echarts.init(document.getElementById('map2')) } @@ -949,6 +965,7 @@ type: 'value', name: '数量', position: 'left', + splitNumber: 5, alignTicks: true, splitLine: { lineStyle: { @@ -961,6 +978,8 @@ type: 'value', name: '百分比', position: 'right', + splitNumber: 5, + interval: 25, max: 100, min: 0, alignTicks: true, @@ -974,7 +993,7 @@ series: [ { name: "验收数", - data: [120, 200, 150], + data: data1, type: 'bar', yAxisIndex: 0, barWidth: 14, @@ -991,7 +1010,7 @@ }, { name: "合格数", - data: [120, 200, 150], + data: data2, type: 'bar', yAxisIndex: 0, barWidth: 14, @@ -1009,7 +1028,7 @@ { name: "合格率", yAxisIndex: 1, - data: [80, 22.1, 12], + data: data3, type: 'line', smooth: true, // 设置折线图变圆滑 symbol: 'none', diff --git a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs index cdba762..c7c01ac 100644 --- a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs @@ -41,6 +41,9 @@ namespace FineUIPro.Web.common //获取HSSE数据 var hsseData = Task.Run(() => mainSevice.GetHsseDataAsync()).Result; + //获取CQMS数据 + var cqmsData = Task.Run(() => mainSevice.GetCqmsDataAsync()).Result; + //安全云视频【待汇总】待配置 string video_Url = string.Empty; var sysSet16 = (from x in Funs.DB.Sys_Set where x.SetName == "视频监控地址" select x).ToList().FirstOrDefault(); @@ -160,6 +163,56 @@ namespace FineUIPro.Web.common double inspectionPersonRate = inspectionPersonIsCheckOk > 0 ? Math.Round((100 * (double)(inspectionPersonIsCheckOk / inspectionPerson)), 2) : 0; double inspectionMachineRate = inspectionMachineIsCheckOk > 0 ? Math.Round((100 * (double)(inspectionMachineIsCheckOk / inspectionMachine)), 2) : 0; + #region 质量验收数据 + + //关键工序合格率 + double keyProcessRate = cqmsData.KeyProcessOKNum > 0 ? Math.Round(100 * ((double)cqmsData.KeyProcessOKNum / (double)cqmsData.KeyProcessNum), 2) : 0; + //特殊工程合格率 + double specialProcessRate = cqmsData.SpecialProcessOKNum > 0 ? Math.Round(100 * ((double)cqmsData.SpecialProcessOKNum / (double)cqmsData.SpecialProcessNum), 2) : 0; + //隐蔽工程合格率 + double concealedWorksRate = cqmsData.ConcealedWorksOKNum > 0 ? Math.Round(100 * ((double)cqmsData.ConcealedWorksOKNum / (double)cqmsData.ConcealedWorksNum), 2) : 0; + + //单位工程合格率 + double unitProjecProcessRate = cqmsData.UnitProjectAcceptNum > 0 ? Math.Round(100 * ((double)cqmsData.UnitProjectAcceptOKNum / (double)cqmsData.UnitProjectAcceptNum), 2) : 0; + //分部工程合格率 + double subProjectProcessRate = cqmsData.SubProjectAcceptOKNum > 0 ? Math.Round(100 * ((double)cqmsData.SubProjectAcceptOKNum / (double)cqmsData.SubProjectAcceptNum), 2) : 0; + //分项工程合格率 + double subdivisionalWorksRate = cqmsData.SubdivisionalWorksAcceptOKNum > 0 ? Math.Round(100 * ((double)cqmsData.SubdivisionalWorksAcceptOKNum / (double)cqmsData.SubdivisionalWorksAcceptNum), 2) : 0; + + //验收数 + List checkAccepts = new List(); + checkAccepts.Add((int)cqmsData.KeyProcessNum); + checkAccepts.Add((int)cqmsData.SpecialProcessNum); + checkAccepts.Add((int)cqmsData.ConcealedWorksNum); + //合格数 + List checkAcceptOKs = new List(); + checkAcceptOKs.Add((int)cqmsData.KeyProcessOKNum); + checkAcceptOKs.Add((int)cqmsData.SpecialProcessOKNum); + checkAcceptOKs.Add((int)cqmsData.ConcealedWorksOKNum); + //合格率 + List checkAcceptOKRates = new List(); + checkAcceptOKRates.Add(keyProcessRate); + checkAcceptOKRates.Add(specialProcessRate); + checkAcceptOKRates.Add(concealedWorksRate); + + //验收数 + List checkAccepts2 = new List(); + checkAccepts2.Add((int)cqmsData.UnitProjectAcceptNum); + checkAccepts2.Add((int)cqmsData.SubProjectAcceptNum); + checkAccepts2.Add((int)cqmsData.SubdivisionalWorksAcceptNum); + //合格数 + List checkAcceptOKs2 = new List(); + checkAcceptOKs2.Add((int)cqmsData.UnitProjectAcceptOKNum); + checkAcceptOKs2.Add((int)cqmsData.SubProjectAcceptOKNum); + checkAcceptOKs2.Add((int)cqmsData.SubdivisionalWorksAcceptOKNum); + //合格率 + List checkAcceptOKRates2 = new List(); + checkAcceptOKRates2.Add(unitProjecProcessRate); + checkAcceptOKRates2.Add(subProjectProcessRate); + checkAcceptOKRates2.Add(subdivisionalWorksRate); + + #endregion + //项目进度计划 var scheduleList = (from x in db.Sys_Schedule where x.ProjectId == projectId @@ -260,7 +313,13 @@ namespace FineUIPro.Web.common branchNum = cqmsProjectData.SubProjectNum ?? 0,//分部工程数 itemizeNum = cqmsProjectData.SubdivisionalWorksNum ?? 0,//分项工程数 }, - //质量验收数据【待汇总】 + //质量验收数据 + checkAccepts = checkAccepts, + checkAcceptOKs = checkAcceptOKs, + checkAcceptOKRates = checkAcceptOKRates, + checkAccepts2 = checkAccepts2, + checkAcceptOKs2 = checkAcceptOKs2, + checkAcceptOKRates2 = checkAcceptOKRates2, specialEquipmentSys = 0,//特种设备质保体系【待汇总】 designBriefing = designDetailsList.Count(),//图纸会审、设计交底 hsseEduTrain = new diff --git a/SUBQHSE/Model/AnalysisData.cs b/SUBQHSE/Model/AnalysisData.cs new file mode 100644 index 0000000..214b089 --- /dev/null +++ b/SUBQHSE/Model/AnalysisData.cs @@ -0,0 +1,10 @@ +using System; + +namespace Model +{ + public class AnalysisData + { + public string name { get; set; } + public int value { get; set; } + } +} diff --git a/SUBQHSE/Model/Enums/DefectTypeEnums.cs b/SUBQHSE/Model/Enums/DefectTypeEnums.cs new file mode 100644 index 0000000..b92c640 --- /dev/null +++ b/SUBQHSE/Model/Enums/DefectTypeEnums.cs @@ -0,0 +1,16 @@ + +namespace Model.Enums +{ + /// + /// 焊接缺陷类型 + /// + public enum DefectTypeEnums + { + 条形缺陷 = 1, + 圆形缺陷 = 2, + 未融合 = 3, + 安装 = 4, + 气孔 = 5, + 其他 = 6 + } +} diff --git a/SUBQHSE/Model/Model.cs b/SUBQHSE/Model/Model.cs index d98d96b..092fb70 100644 --- a/SUBQHSE/Model/Model.cs +++ b/SUBQHSE/Model/Model.cs @@ -55193,6 +55193,8 @@ namespace Model private System.Nullable _DefectHeight; + private int _DefectType; + private EntityRef _CH_Check; private EntityRef _CH_TrustItem; @@ -55249,6 +55251,8 @@ namespace Model partial void OnDefectDepthChanged(); partial void OnDefectHeightChanging(System.Nullable value); partial void OnDefectHeightChanged(); + partial void OnDefectTypeChanging(int value); + partial void OnDefectTypeChanged(); #endregion public CH_CheckItem() @@ -55731,6 +55735,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DefectType", DbType="Int NOT NULL")] + public int DefectType + { + get + { + return this._DefectType; + } + set + { + if ((this._DefectType != value)) + { + this.OnDefectTypeChanging(value); + this.SendPropertyChanging(); + this._DefectType = value; + this.SendPropertyChanged("DefectType"); + this.OnDefectTypeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CH_CHECK_REFERENCE_CH_CHECK", Storage="_CH_Check", ThisKey="CHT_CheckID", OtherKey="CHT_CheckID", IsForeignKey=true)] public CH_Check CH_Check { @@ -127886,6 +127910,44 @@ namespace Model private System.Nullable _CreateDate; + private System.Nullable _EquipmentInspectionNum; + + private System.Nullable _EquipmentInspectionQualifiedNum; + + private System.Nullable _MachineInspectionNum; + + private System.Nullable _MachineInspectionQualifiedNum; + + private System.Nullable _PersonInspectionNum; + + private System.Nullable _PersonInspectionQualifiedNum; + + private System.Nullable _MaterialInspectionNum; + + private System.Nullable _MaterialInspectionQualifiedNum; + + private System.Nullable _ConstructSolutionNum; + + private System.Nullable _ConstructSolutionProjectApproveNum; + + private System.Nullable _ConstructSolutionUnitApproveNum; + + private System.Nullable _SpecialEquipmentQualityAssuranceSystemNum; + + private System.Nullable _DesignDetailsNum; + + private System.Nullable _UnitProjectAcceptNum; + + private System.Nullable _UnitProjectAcceptOKNum; + + private System.Nullable _SubProjectAcceptNum; + + private System.Nullable _SubProjectAcceptOKNum; + + private System.Nullable _SubdivisionalWorksAcceptNum; + + private System.Nullable _SubdivisionalWorksAcceptOKNum; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -127964,6 +128026,44 @@ namespace Model partial void OnCreateManChanged(); partial void OnCreateDateChanging(System.Nullable value); partial void OnCreateDateChanged(); + partial void OnEquipmentInspectionNumChanging(System.Nullable value); + partial void OnEquipmentInspectionNumChanged(); + partial void OnEquipmentInspectionQualifiedNumChanging(System.Nullable value); + partial void OnEquipmentInspectionQualifiedNumChanged(); + partial void OnMachineInspectionNumChanging(System.Nullable value); + partial void OnMachineInspectionNumChanged(); + partial void OnMachineInspectionQualifiedNumChanging(System.Nullable value); + partial void OnMachineInspectionQualifiedNumChanged(); + partial void OnPersonInspectionNumChanging(System.Nullable value); + partial void OnPersonInspectionNumChanged(); + partial void OnPersonInspectionQualifiedNumChanging(System.Nullable value); + partial void OnPersonInspectionQualifiedNumChanged(); + partial void OnMaterialInspectionNumChanging(System.Nullable value); + partial void OnMaterialInspectionNumChanged(); + partial void OnMaterialInspectionQualifiedNumChanging(System.Nullable value); + partial void OnMaterialInspectionQualifiedNumChanged(); + partial void OnConstructSolutionNumChanging(System.Nullable value); + partial void OnConstructSolutionNumChanged(); + partial void OnConstructSolutionProjectApproveNumChanging(System.Nullable value); + partial void OnConstructSolutionProjectApproveNumChanged(); + partial void OnConstructSolutionUnitApproveNumChanging(System.Nullable value); + partial void OnConstructSolutionUnitApproveNumChanged(); + partial void OnSpecialEquipmentQualityAssuranceSystemNumChanging(System.Nullable value); + partial void OnSpecialEquipmentQualityAssuranceSystemNumChanged(); + partial void OnDesignDetailsNumChanging(System.Nullable value); + partial void OnDesignDetailsNumChanged(); + partial void OnUnitProjectAcceptNumChanging(System.Nullable value); + partial void OnUnitProjectAcceptNumChanged(); + partial void OnUnitProjectAcceptOKNumChanging(System.Nullable value); + partial void OnUnitProjectAcceptOKNumChanged(); + partial void OnSubProjectAcceptNumChanging(System.Nullable value); + partial void OnSubProjectAcceptNumChanged(); + partial void OnSubProjectAcceptOKNumChanging(System.Nullable value); + partial void OnSubProjectAcceptOKNumChanged(); + partial void OnSubdivisionalWorksAcceptNumChanging(System.Nullable value); + partial void OnSubdivisionalWorksAcceptNumChanged(); + partial void OnSubdivisionalWorksAcceptOKNumChanging(System.Nullable value); + partial void OnSubdivisionalWorksAcceptOKNumChanged(); #endregion public CQMSData_CQMS() @@ -128711,6 +128811,386 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentInspectionNum", DbType="Int")] + public System.Nullable EquipmentInspectionNum + { + get + { + return this._EquipmentInspectionNum; + } + set + { + if ((this._EquipmentInspectionNum != value)) + { + this.OnEquipmentInspectionNumChanging(value); + this.SendPropertyChanging(); + this._EquipmentInspectionNum = value; + this.SendPropertyChanged("EquipmentInspectionNum"); + this.OnEquipmentInspectionNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentInspectionQualifiedNum", DbType="Int")] + public System.Nullable EquipmentInspectionQualifiedNum + { + get + { + return this._EquipmentInspectionQualifiedNum; + } + set + { + if ((this._EquipmentInspectionQualifiedNum != value)) + { + this.OnEquipmentInspectionQualifiedNumChanging(value); + this.SendPropertyChanging(); + this._EquipmentInspectionQualifiedNum = value; + this.SendPropertyChanged("EquipmentInspectionQualifiedNum"); + this.OnEquipmentInspectionQualifiedNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MachineInspectionNum", DbType="Int")] + public System.Nullable MachineInspectionNum + { + get + { + return this._MachineInspectionNum; + } + set + { + if ((this._MachineInspectionNum != value)) + { + this.OnMachineInspectionNumChanging(value); + this.SendPropertyChanging(); + this._MachineInspectionNum = value; + this.SendPropertyChanged("MachineInspectionNum"); + this.OnMachineInspectionNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MachineInspectionQualifiedNum", DbType="Int")] + public System.Nullable MachineInspectionQualifiedNum + { + get + { + return this._MachineInspectionQualifiedNum; + } + set + { + if ((this._MachineInspectionQualifiedNum != value)) + { + this.OnMachineInspectionQualifiedNumChanging(value); + this.SendPropertyChanging(); + this._MachineInspectionQualifiedNum = value; + this.SendPropertyChanged("MachineInspectionQualifiedNum"); + this.OnMachineInspectionQualifiedNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonInspectionNum", DbType="Int")] + public System.Nullable PersonInspectionNum + { + get + { + return this._PersonInspectionNum; + } + set + { + if ((this._PersonInspectionNum != value)) + { + this.OnPersonInspectionNumChanging(value); + this.SendPropertyChanging(); + this._PersonInspectionNum = value; + this.SendPropertyChanged("PersonInspectionNum"); + this.OnPersonInspectionNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonInspectionQualifiedNum", DbType="Int")] + public System.Nullable PersonInspectionQualifiedNum + { + get + { + return this._PersonInspectionQualifiedNum; + } + set + { + if ((this._PersonInspectionQualifiedNum != value)) + { + this.OnPersonInspectionQualifiedNumChanging(value); + this.SendPropertyChanging(); + this._PersonInspectionQualifiedNum = value; + this.SendPropertyChanged("PersonInspectionQualifiedNum"); + this.OnPersonInspectionQualifiedNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialInspectionNum", DbType="Int")] + public System.Nullable MaterialInspectionNum + { + get + { + return this._MaterialInspectionNum; + } + set + { + if ((this._MaterialInspectionNum != value)) + { + this.OnMaterialInspectionNumChanging(value); + this.SendPropertyChanging(); + this._MaterialInspectionNum = value; + this.SendPropertyChanged("MaterialInspectionNum"); + this.OnMaterialInspectionNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialInspectionQualifiedNum", DbType="Int")] + public System.Nullable MaterialInspectionQualifiedNum + { + get + { + return this._MaterialInspectionQualifiedNum; + } + set + { + if ((this._MaterialInspectionQualifiedNum != value)) + { + this.OnMaterialInspectionQualifiedNumChanging(value); + this.SendPropertyChanging(); + this._MaterialInspectionQualifiedNum = value; + this.SendPropertyChanged("MaterialInspectionQualifiedNum"); + this.OnMaterialInspectionQualifiedNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructSolutionNum", DbType="Int")] + public System.Nullable ConstructSolutionNum + { + get + { + return this._ConstructSolutionNum; + } + set + { + if ((this._ConstructSolutionNum != value)) + { + this.OnConstructSolutionNumChanging(value); + this.SendPropertyChanging(); + this._ConstructSolutionNum = value; + this.SendPropertyChanged("ConstructSolutionNum"); + this.OnConstructSolutionNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructSolutionProjectApproveNum", DbType="Int")] + public System.Nullable ConstructSolutionProjectApproveNum + { + get + { + return this._ConstructSolutionProjectApproveNum; + } + set + { + if ((this._ConstructSolutionProjectApproveNum != value)) + { + this.OnConstructSolutionProjectApproveNumChanging(value); + this.SendPropertyChanging(); + this._ConstructSolutionProjectApproveNum = value; + this.SendPropertyChanged("ConstructSolutionProjectApproveNum"); + this.OnConstructSolutionProjectApproveNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructSolutionUnitApproveNum", DbType="Int")] + public System.Nullable ConstructSolutionUnitApproveNum + { + get + { + return this._ConstructSolutionUnitApproveNum; + } + set + { + if ((this._ConstructSolutionUnitApproveNum != value)) + { + this.OnConstructSolutionUnitApproveNumChanging(value); + this.SendPropertyChanging(); + this._ConstructSolutionUnitApproveNum = value; + this.SendPropertyChanged("ConstructSolutionUnitApproveNum"); + this.OnConstructSolutionUnitApproveNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecialEquipmentQualityAssuranceSystemNum", DbType="Int")] + public System.Nullable SpecialEquipmentQualityAssuranceSystemNum + { + get + { + return this._SpecialEquipmentQualityAssuranceSystemNum; + } + set + { + if ((this._SpecialEquipmentQualityAssuranceSystemNum != value)) + { + this.OnSpecialEquipmentQualityAssuranceSystemNumChanging(value); + this.SendPropertyChanging(); + this._SpecialEquipmentQualityAssuranceSystemNum = value; + this.SendPropertyChanged("SpecialEquipmentQualityAssuranceSystemNum"); + this.OnSpecialEquipmentQualityAssuranceSystemNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesignDetailsNum", DbType="Int")] + public System.Nullable DesignDetailsNum + { + get + { + return this._DesignDetailsNum; + } + set + { + if ((this._DesignDetailsNum != value)) + { + this.OnDesignDetailsNumChanging(value); + this.SendPropertyChanging(); + this._DesignDetailsNum = value; + this.SendPropertyChanged("DesignDetailsNum"); + this.OnDesignDetailsNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitProjectAcceptNum", DbType="Int")] + public System.Nullable UnitProjectAcceptNum + { + get + { + return this._UnitProjectAcceptNum; + } + set + { + if ((this._UnitProjectAcceptNum != value)) + { + this.OnUnitProjectAcceptNumChanging(value); + this.SendPropertyChanging(); + this._UnitProjectAcceptNum = value; + this.SendPropertyChanged("UnitProjectAcceptNum"); + this.OnUnitProjectAcceptNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitProjectAcceptOKNum", DbType="Int")] + public System.Nullable UnitProjectAcceptOKNum + { + get + { + return this._UnitProjectAcceptOKNum; + } + set + { + if ((this._UnitProjectAcceptOKNum != value)) + { + this.OnUnitProjectAcceptOKNumChanging(value); + this.SendPropertyChanging(); + this._UnitProjectAcceptOKNum = value; + this.SendPropertyChanged("UnitProjectAcceptOKNum"); + this.OnUnitProjectAcceptOKNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubProjectAcceptNum", DbType="Int")] + public System.Nullable SubProjectAcceptNum + { + get + { + return this._SubProjectAcceptNum; + } + set + { + if ((this._SubProjectAcceptNum != value)) + { + this.OnSubProjectAcceptNumChanging(value); + this.SendPropertyChanging(); + this._SubProjectAcceptNum = value; + this.SendPropertyChanged("SubProjectAcceptNum"); + this.OnSubProjectAcceptNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubProjectAcceptOKNum", DbType="Int")] + public System.Nullable SubProjectAcceptOKNum + { + get + { + return this._SubProjectAcceptOKNum; + } + set + { + if ((this._SubProjectAcceptOKNum != value)) + { + this.OnSubProjectAcceptOKNumChanging(value); + this.SendPropertyChanging(); + this._SubProjectAcceptOKNum = value; + this.SendPropertyChanged("SubProjectAcceptOKNum"); + this.OnSubProjectAcceptOKNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubdivisionalWorksAcceptNum", DbType="Int")] + public System.Nullable SubdivisionalWorksAcceptNum + { + get + { + return this._SubdivisionalWorksAcceptNum; + } + set + { + if ((this._SubdivisionalWorksAcceptNum != value)) + { + this.OnSubdivisionalWorksAcceptNumChanging(value); + this.SendPropertyChanging(); + this._SubdivisionalWorksAcceptNum = value; + this.SendPropertyChanged("SubdivisionalWorksAcceptNum"); + this.OnSubdivisionalWorksAcceptNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubdivisionalWorksAcceptOKNum", DbType="Int")] + public System.Nullable SubdivisionalWorksAcceptOKNum + { + get + { + return this._SubdivisionalWorksAcceptOKNum; + } + set + { + if ((this._SubdivisionalWorksAcceptOKNum != value)) + { + this.OnSubdivisionalWorksAcceptOKNumChanging(value); + this.SendPropertyChanging(); + this._SubdivisionalWorksAcceptOKNum = value; + this.SendPropertyChanged("SubdivisionalWorksAcceptOKNum"); + this.OnSubdivisionalWorksAcceptOKNumChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -307564,6 +308044,44 @@ namespace Model private System.Nullable _InspectionLotNum; + private System.Nullable _EquipmentInspectionNum; + + private System.Nullable _EquipmentInspectionQualifiedNum; + + private System.Nullable _MachineInspectionNum; + + private System.Nullable _MachineInspectionQualifiedNum; + + private System.Nullable _PersonInspectionNum; + + private System.Nullable _PersonInspectionQualifiedNum; + + private System.Nullable _MaterialInspectionNum; + + private System.Nullable _MaterialInspectionQualifiedNum; + + private System.Nullable _ConstructSolutionNum; + + private System.Nullable _ConstructSolutionProjectApproveNum; + + private System.Nullable _ConstructSolutionUnitApproveNum; + + private System.Nullable _SpecialEquipmentQualityAssuranceSystemNum; + + private System.Nullable _DesignDetailsNum; + + private System.Nullable _UnitProjectAcceptNum; + + private System.Nullable _UnitProjectAcceptOKNum; + + private System.Nullable _SubProjectAcceptNum; + + private System.Nullable _SubProjectAcceptOKNum; + + private System.Nullable _SubdivisionalWorksAcceptNum; + + private System.Nullable _SubdivisionalWorksAcceptOKNum; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -307638,6 +308156,44 @@ namespace Model partial void OnSubdivisionalWorksNumChanged(); partial void OnInspectionLotNumChanging(System.Nullable value); partial void OnInspectionLotNumChanged(); + partial void OnEquipmentInspectionNumChanging(System.Nullable value); + partial void OnEquipmentInspectionNumChanged(); + partial void OnEquipmentInspectionQualifiedNumChanging(System.Nullable value); + partial void OnEquipmentInspectionQualifiedNumChanged(); + partial void OnMachineInspectionNumChanging(System.Nullable value); + partial void OnMachineInspectionNumChanged(); + partial void OnMachineInspectionQualifiedNumChanging(System.Nullable value); + partial void OnMachineInspectionQualifiedNumChanged(); + partial void OnPersonInspectionNumChanging(System.Nullable value); + partial void OnPersonInspectionNumChanged(); + partial void OnPersonInspectionQualifiedNumChanging(System.Nullable value); + partial void OnPersonInspectionQualifiedNumChanged(); + partial void OnMaterialInspectionNumChanging(System.Nullable value); + partial void OnMaterialInspectionNumChanged(); + partial void OnMaterialInspectionQualifiedNumChanging(System.Nullable value); + partial void OnMaterialInspectionQualifiedNumChanged(); + partial void OnConstructSolutionNumChanging(System.Nullable value); + partial void OnConstructSolutionNumChanged(); + partial void OnConstructSolutionProjectApproveNumChanging(System.Nullable value); + partial void OnConstructSolutionProjectApproveNumChanged(); + partial void OnConstructSolutionUnitApproveNumChanging(System.Nullable value); + partial void OnConstructSolutionUnitApproveNumChanged(); + partial void OnSpecialEquipmentQualityAssuranceSystemNumChanging(System.Nullable value); + partial void OnSpecialEquipmentQualityAssuranceSystemNumChanged(); + partial void OnDesignDetailsNumChanging(System.Nullable value); + partial void OnDesignDetailsNumChanged(); + partial void OnUnitProjectAcceptNumChanging(System.Nullable value); + partial void OnUnitProjectAcceptNumChanged(); + partial void OnUnitProjectAcceptOKNumChanging(System.Nullable value); + partial void OnUnitProjectAcceptOKNumChanged(); + partial void OnSubProjectAcceptNumChanging(System.Nullable value); + partial void OnSubProjectAcceptNumChanged(); + partial void OnSubProjectAcceptOKNumChanging(System.Nullable value); + partial void OnSubProjectAcceptOKNumChanged(); + partial void OnSubdivisionalWorksAcceptNumChanging(System.Nullable value); + partial void OnSubdivisionalWorksAcceptNumChanged(); + partial void OnSubdivisionalWorksAcceptOKNumChanging(System.Nullable value); + partial void OnSubdivisionalWorksAcceptOKNumChanged(); #endregion public Project_CQMSData_CQMS() @@ -308345,6 +308901,386 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentInspectionNum", DbType="Int")] + public System.Nullable EquipmentInspectionNum + { + get + { + return this._EquipmentInspectionNum; + } + set + { + if ((this._EquipmentInspectionNum != value)) + { + this.OnEquipmentInspectionNumChanging(value); + this.SendPropertyChanging(); + this._EquipmentInspectionNum = value; + this.SendPropertyChanged("EquipmentInspectionNum"); + this.OnEquipmentInspectionNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentInspectionQualifiedNum", DbType="Int")] + public System.Nullable EquipmentInspectionQualifiedNum + { + get + { + return this._EquipmentInspectionQualifiedNum; + } + set + { + if ((this._EquipmentInspectionQualifiedNum != value)) + { + this.OnEquipmentInspectionQualifiedNumChanging(value); + this.SendPropertyChanging(); + this._EquipmentInspectionQualifiedNum = value; + this.SendPropertyChanged("EquipmentInspectionQualifiedNum"); + this.OnEquipmentInspectionQualifiedNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MachineInspectionNum", DbType="Int")] + public System.Nullable MachineInspectionNum + { + get + { + return this._MachineInspectionNum; + } + set + { + if ((this._MachineInspectionNum != value)) + { + this.OnMachineInspectionNumChanging(value); + this.SendPropertyChanging(); + this._MachineInspectionNum = value; + this.SendPropertyChanged("MachineInspectionNum"); + this.OnMachineInspectionNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MachineInspectionQualifiedNum", DbType="Int")] + public System.Nullable MachineInspectionQualifiedNum + { + get + { + return this._MachineInspectionQualifiedNum; + } + set + { + if ((this._MachineInspectionQualifiedNum != value)) + { + this.OnMachineInspectionQualifiedNumChanging(value); + this.SendPropertyChanging(); + this._MachineInspectionQualifiedNum = value; + this.SendPropertyChanged("MachineInspectionQualifiedNum"); + this.OnMachineInspectionQualifiedNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonInspectionNum", DbType="Int")] + public System.Nullable PersonInspectionNum + { + get + { + return this._PersonInspectionNum; + } + set + { + if ((this._PersonInspectionNum != value)) + { + this.OnPersonInspectionNumChanging(value); + this.SendPropertyChanging(); + this._PersonInspectionNum = value; + this.SendPropertyChanged("PersonInspectionNum"); + this.OnPersonInspectionNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonInspectionQualifiedNum", DbType="Int")] + public System.Nullable PersonInspectionQualifiedNum + { + get + { + return this._PersonInspectionQualifiedNum; + } + set + { + if ((this._PersonInspectionQualifiedNum != value)) + { + this.OnPersonInspectionQualifiedNumChanging(value); + this.SendPropertyChanging(); + this._PersonInspectionQualifiedNum = value; + this.SendPropertyChanged("PersonInspectionQualifiedNum"); + this.OnPersonInspectionQualifiedNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialInspectionNum", DbType="Int")] + public System.Nullable MaterialInspectionNum + { + get + { + return this._MaterialInspectionNum; + } + set + { + if ((this._MaterialInspectionNum != value)) + { + this.OnMaterialInspectionNumChanging(value); + this.SendPropertyChanging(); + this._MaterialInspectionNum = value; + this.SendPropertyChanged("MaterialInspectionNum"); + this.OnMaterialInspectionNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialInspectionQualifiedNum", DbType="Int")] + public System.Nullable MaterialInspectionQualifiedNum + { + get + { + return this._MaterialInspectionQualifiedNum; + } + set + { + if ((this._MaterialInspectionQualifiedNum != value)) + { + this.OnMaterialInspectionQualifiedNumChanging(value); + this.SendPropertyChanging(); + this._MaterialInspectionQualifiedNum = value; + this.SendPropertyChanged("MaterialInspectionQualifiedNum"); + this.OnMaterialInspectionQualifiedNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructSolutionNum", DbType="Int")] + public System.Nullable ConstructSolutionNum + { + get + { + return this._ConstructSolutionNum; + } + set + { + if ((this._ConstructSolutionNum != value)) + { + this.OnConstructSolutionNumChanging(value); + this.SendPropertyChanging(); + this._ConstructSolutionNum = value; + this.SendPropertyChanged("ConstructSolutionNum"); + this.OnConstructSolutionNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructSolutionProjectApproveNum", DbType="Int")] + public System.Nullable ConstructSolutionProjectApproveNum + { + get + { + return this._ConstructSolutionProjectApproveNum; + } + set + { + if ((this._ConstructSolutionProjectApproveNum != value)) + { + this.OnConstructSolutionProjectApproveNumChanging(value); + this.SendPropertyChanging(); + this._ConstructSolutionProjectApproveNum = value; + this.SendPropertyChanged("ConstructSolutionProjectApproveNum"); + this.OnConstructSolutionProjectApproveNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructSolutionUnitApproveNum", DbType="Int")] + public System.Nullable ConstructSolutionUnitApproveNum + { + get + { + return this._ConstructSolutionUnitApproveNum; + } + set + { + if ((this._ConstructSolutionUnitApproveNum != value)) + { + this.OnConstructSolutionUnitApproveNumChanging(value); + this.SendPropertyChanging(); + this._ConstructSolutionUnitApproveNum = value; + this.SendPropertyChanged("ConstructSolutionUnitApproveNum"); + this.OnConstructSolutionUnitApproveNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecialEquipmentQualityAssuranceSystemNum", DbType="Int")] + public System.Nullable SpecialEquipmentQualityAssuranceSystemNum + { + get + { + return this._SpecialEquipmentQualityAssuranceSystemNum; + } + set + { + if ((this._SpecialEquipmentQualityAssuranceSystemNum != value)) + { + this.OnSpecialEquipmentQualityAssuranceSystemNumChanging(value); + this.SendPropertyChanging(); + this._SpecialEquipmentQualityAssuranceSystemNum = value; + this.SendPropertyChanged("SpecialEquipmentQualityAssuranceSystemNum"); + this.OnSpecialEquipmentQualityAssuranceSystemNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesignDetailsNum", DbType="Int")] + public System.Nullable DesignDetailsNum + { + get + { + return this._DesignDetailsNum; + } + set + { + if ((this._DesignDetailsNum != value)) + { + this.OnDesignDetailsNumChanging(value); + this.SendPropertyChanging(); + this._DesignDetailsNum = value; + this.SendPropertyChanged("DesignDetailsNum"); + this.OnDesignDetailsNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitProjectAcceptNum", DbType="Int")] + public System.Nullable UnitProjectAcceptNum + { + get + { + return this._UnitProjectAcceptNum; + } + set + { + if ((this._UnitProjectAcceptNum != value)) + { + this.OnUnitProjectAcceptNumChanging(value); + this.SendPropertyChanging(); + this._UnitProjectAcceptNum = value; + this.SendPropertyChanged("UnitProjectAcceptNum"); + this.OnUnitProjectAcceptNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitProjectAcceptOKNum", DbType="Int")] + public System.Nullable UnitProjectAcceptOKNum + { + get + { + return this._UnitProjectAcceptOKNum; + } + set + { + if ((this._UnitProjectAcceptOKNum != value)) + { + this.OnUnitProjectAcceptOKNumChanging(value); + this.SendPropertyChanging(); + this._UnitProjectAcceptOKNum = value; + this.SendPropertyChanged("UnitProjectAcceptOKNum"); + this.OnUnitProjectAcceptOKNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubProjectAcceptNum", DbType="Int")] + public System.Nullable SubProjectAcceptNum + { + get + { + return this._SubProjectAcceptNum; + } + set + { + if ((this._SubProjectAcceptNum != value)) + { + this.OnSubProjectAcceptNumChanging(value); + this.SendPropertyChanging(); + this._SubProjectAcceptNum = value; + this.SendPropertyChanged("SubProjectAcceptNum"); + this.OnSubProjectAcceptNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubProjectAcceptOKNum", DbType="Int")] + public System.Nullable SubProjectAcceptOKNum + { + get + { + return this._SubProjectAcceptOKNum; + } + set + { + if ((this._SubProjectAcceptOKNum != value)) + { + this.OnSubProjectAcceptOKNumChanging(value); + this.SendPropertyChanging(); + this._SubProjectAcceptOKNum = value; + this.SendPropertyChanged("SubProjectAcceptOKNum"); + this.OnSubProjectAcceptOKNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubdivisionalWorksAcceptNum", DbType="Int")] + public System.Nullable SubdivisionalWorksAcceptNum + { + get + { + return this._SubdivisionalWorksAcceptNum; + } + set + { + if ((this._SubdivisionalWorksAcceptNum != value)) + { + this.OnSubdivisionalWorksAcceptNumChanging(value); + this.SendPropertyChanging(); + this._SubdivisionalWorksAcceptNum = value; + this.SendPropertyChanged("SubdivisionalWorksAcceptNum"); + this.OnSubdivisionalWorksAcceptNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubdivisionalWorksAcceptOKNum", DbType="Int")] + public System.Nullable SubdivisionalWorksAcceptOKNum + { + get + { + return this._SubdivisionalWorksAcceptOKNum; + } + set + { + if ((this._SubdivisionalWorksAcceptOKNum != value)) + { + this.OnSubdivisionalWorksAcceptOKNumChanging(value); + this.SendPropertyChanging(); + this._SubdivisionalWorksAcceptOKNum = value; + this.SendPropertyChanged("SubdivisionalWorksAcceptOKNum"); + this.OnSubdivisionalWorksAcceptOKNumChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -439196,6 +440132,8 @@ namespace Model private string _EItemRussian; + private System.Nullable _Score; + private EntityRef _Training_TestTraining; private EntityRef _Training; @@ -439260,6 +440198,8 @@ namespace Model partial void OnDItemRussianChanged(); partial void OnEItemRussianChanging(string value); partial void OnEItemRussianChanged(); + partial void OnScoreChanging(System.Nullable value); + partial void OnScoreChanged(); #endregion public Training_TestTrainingItem() @@ -439833,6 +440773,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Score", DbType="Int")] + public System.Nullable Score + { + get + { + return this._Score; + } + set + { + if ((this._Score != value)) + { + this.OnScoreChanging(value); + this.SendPropertyChanging(); + this._Score = value; + this.SendPropertyChanged("Score"); + this.OnScoreChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TestTrainingItem_Training_TestTraining", Storage="_Training_TestTraining", ThisKey="TrainingId", OtherKey="TrainingId", IsForeignKey=true)] public Training_TestTraining Training_TestTraining { @@ -456657,6 +457617,8 @@ namespace Model private string _HandleState; + private string _ProblemTypes; + private System.Nullable _SortIndex; private string _Situation; @@ -456965,6 +457927,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemTypes", DbType="Char(1)")] + public string ProblemTypes + { + get + { + return this._ProblemTypes; + } + set + { + if ((this._ProblemTypes != value)) + { + this._ProblemTypes = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")] public System.Nullable SortIndex { @@ -486479,6 +487457,8 @@ namespace Model private System.Nullable _TrainCount; + private System.Nullable _TestCount; + private string _AuditorId; private string _AuditorName; @@ -487217,6 +488197,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestCount", DbType="Int")] + public System.Nullable TestCount + { + get + { + return this._TestCount; + } + set + { + if ((this._TestCount != value)) + { + this._TestCount = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditorId", DbType="NVarChar(50)")] public string AuditorId { @@ -492417,6 +493413,8 @@ namespace Model private string _EItemEng; + private System.Nullable _Score; + private string _AnswerItems; public View_Training_TestTrainingItem() @@ -492791,6 +493789,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Score", DbType="Int")] + public System.Nullable Score + { + get + { + return this._Score; + } + set + { + if ((this._Score != value)) + { + this._Score = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AnswerItems", DbType="NVarChar(50)")] public string AnswerItems { diff --git a/SUBQHSE/Model/Model.csproj b/SUBQHSE/Model/Model.csproj index 6698b91..60b264e 100644 --- a/SUBQHSE/Model/Model.csproj +++ b/SUBQHSE/Model/Model.csproj @@ -239,6 +239,7 @@ + @@ -309,6 +310,7 @@ + @@ -343,6 +345,10 @@ + + + + diff --git a/SUBQHSE/Model/ZHGL/DataSync/CHCheckItemOutput.cs b/SUBQHSE/Model/ZHGL/DataSync/CHCheckItemOutput.cs new file mode 100644 index 0000000..c3a4b03 --- /dev/null +++ b/SUBQHSE/Model/ZHGL/DataSync/CHCheckItemOutput.cs @@ -0,0 +1,20 @@ +using System; + +namespace Model +{ + /// + /// 焊接信息 + /// + public class CHCheckItemOutput : BaseEntities + { + public string Id { get; set; } + /// + /// 总片数 + /// + public int? CHT_TotalFilm { get; set; } + /// + /// 合格片数 + /// + public int? CHT_PassFilm { get; set; } + } +} \ No newline at end of file diff --git a/SUBQHSE/Model/ZHGL/DataSync/InspectionManagementOutput.cs b/SUBQHSE/Model/ZHGL/DataSync/InspectionManagementOutput.cs new file mode 100644 index 0000000..5bbe6e7 --- /dev/null +++ b/SUBQHSE/Model/ZHGL/DataSync/InspectionManagementOutput.cs @@ -0,0 +1,16 @@ +using System; + +namespace Model +{ + /// + /// 质量验收数据 + /// + public class InspectionManagementOutput : BaseEntities + { + public string Id { get; set; } + public string BreakdownCode { get; set; } + public string BreakdownName { get; set; } + public string Basis { get; set; } + public string CheckPoints { get; set; } + } +} \ No newline at end of file diff --git a/SUBQHSE/Model/ZHGL/DataSync/WeldDineOutput.cs b/SUBQHSE/Model/ZHGL/DataSync/WeldDineOutput.cs new file mode 100644 index 0000000..0c831a1 --- /dev/null +++ b/SUBQHSE/Model/ZHGL/DataSync/WeldDineOutput.cs @@ -0,0 +1,20 @@ +using System; + +namespace Model +{ + /// + /// 焊接达因数 + /// + public class WeldDineOutput : BaseEntities + { + public string Id { get; set; } + /// + /// 达因数 + /// + public decimal? Size { get; set; } + /// + /// 完成达因数 + /// + public decimal? DoneDin { get; set; } + } +} \ No newline at end of file diff --git a/SUBQHSE/Model/ZHGL/DataSync/WelderOutput.cs b/SUBQHSE/Model/ZHGL/DataSync/WelderOutput.cs new file mode 100644 index 0000000..c1795d5 --- /dev/null +++ b/SUBQHSE/Model/ZHGL/DataSync/WelderOutput.cs @@ -0,0 +1,14 @@ +using System; + +namespace Model +{ + /// + /// 焊工数据 + /// + public class WelderOutput : BaseEntities + { + public string Id { get; set; } + public string WEDCode { get; set; } + public string WEDName { get; set; } + } +} \ No newline at end of file