提交定制会内容
This commit is contained in:
@@ -113,11 +113,15 @@ namespace BLL
|
||||
ReportDate = newtable.ReportDate,
|
||||
TrainPersonNum = newtable.TrainPersonNum,
|
||||
TechnicalDisclosePersonNum = newtable.TechnicalDisclosePersonNum,
|
||||
ComprehensiveConTechnologyDisclosureNum = newtable.ComprehensiveConTechnologyDisclosureNum,
|
||||
ComprehensiveConTechnologyDisclosurePersonNum = newtable.ComprehensiveConTechnologyDisclosurePersonNum,
|
||||
ComprehensiveReviewDrawingsNum = newtable.ComprehensiveReviewDrawingsNum,
|
||||
UseNum = newtable.UseNum,
|
||||
OKNum = newtable.OKNum,
|
||||
CompanyPersonNum = newtable.CompanyPersonNum,
|
||||
BranchPersonNum = newtable.BranchPersonNum,
|
||||
ProjectPersonNum = newtable.ProjectPersonNum,
|
||||
ProjectSubPersonNum = newtable.ProjectSubPersonNum,
|
||||
ProblemNum = newtable.ProblemNum,
|
||||
ProblemCompletedNum = newtable.ProblemCompletedNum,
|
||||
ProblemNotCompletedNum = newtable.ProblemNotCompletedNum,
|
||||
@@ -159,12 +163,15 @@ namespace BLL
|
||||
SubProjectAcceptOKNum = newtable.SubProjectAcceptOKNum,
|
||||
SubdivisionalWorksAcceptNum = newtable.SubdivisionalWorksAcceptNum,
|
||||
SubdivisionalWorksAcceptOKNum = newtable.SubdivisionalWorksAcceptOKNum,
|
||||
InspectionMachineNum = newtable.InspectionMachineNum,
|
||||
InspectionMachineQualifiedNum = newtable.InspectionMachineQualifiedNum,
|
||||
State = newtable.State,
|
||||
CreateDate = newtable.CreateDate,
|
||||
CreateMan = newtable.CreateMan
|
||||
};
|
||||
db.CQMSData_CQMS.InsertOnSubmit(table);
|
||||
db.SubmitChanges();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -182,14 +189,24 @@ namespace BLL
|
||||
table.ReportDate = newtable.ReportDate;
|
||||
table.TrainPersonNum = newtable.TrainPersonNum;
|
||||
table.TechnicalDisclosePersonNum = newtable.TechnicalDisclosePersonNum;
|
||||
table.ComprehensiveConTechnologyDisclosureNum = newtable.ComprehensiveConTechnologyDisclosureNum;
|
||||
table.ComprehensiveConTechnologyDisclosurePersonNum = newtable.ComprehensiveConTechnologyDisclosurePersonNum;
|
||||
table.ComprehensiveReviewDrawingsNum = newtable.ComprehensiveReviewDrawingsNum;
|
||||
table.UseNum = newtable.UseNum;
|
||||
table.OKNum = newtable.OKNum;
|
||||
table.CompanyPersonNum = newtable.CompanyPersonNum;
|
||||
table.BranchPersonNum = newtable.BranchPersonNum;
|
||||
table.ProjectPersonNum = newtable.ProjectPersonNum;
|
||||
table.ProjectSubPersonNum = newtable.ProjectSubPersonNum;
|
||||
table.ProblemNum = newtable.ProblemNum;
|
||||
table.ProblemCompletedNum = newtable.ProblemCompletedNum;
|
||||
table.ProblemNotCompletedNum = newtable.ProblemNotCompletedNum;
|
||||
table.UnitCheckNum = newtable.UnitCheckNum;
|
||||
table.UnitCheckClosedNum = newtable.UnitCheckClosedNum;
|
||||
table.UnitCheckNotClosedNum = newtable.UnitCheckNotClosedNum;
|
||||
table.BranchCheckNum = newtable.BranchCheckNum;
|
||||
table.BranchCheckClosedNum = newtable.BranchCheckClosedNum;
|
||||
table.BranchCheckNotClosedNum = newtable.BranchCheckNotClosedNum;
|
||||
table.SNum = newtable.SNum;
|
||||
table.ANum = newtable.ANum;
|
||||
table.BNum = newtable.BNum;
|
||||
@@ -228,11 +245,14 @@ namespace BLL
|
||||
table.SubProjectAcceptOKNum = newtable.SubProjectAcceptOKNum;
|
||||
table.SubdivisionalWorksAcceptNum = newtable.SubdivisionalWorksAcceptNum;
|
||||
table.SubdivisionalWorksAcceptOKNum = newtable.SubdivisionalWorksAcceptOKNum;
|
||||
table.InspectionMachineNum = newtable.InspectionMachineNum;
|
||||
table.InspectionMachineQualifiedNum = newtable.InspectionMachineQualifiedNum;
|
||||
table.State = newtable.State;
|
||||
table.CreateMan = newtable.CreateMan;
|
||||
table.CreateDate = newtable.CreateDate;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -371,6 +391,9 @@ namespace BLL
|
||||
ReportDate = DateTime.Now.Date,
|
||||
TrainPersonNum = ProjectData.Sum(x => x.TrainPersonNum),
|
||||
TechnicalDisclosePersonNum = ProjectData.Sum(x => x.TechnicalDisclosePersonNum),
|
||||
ComprehensiveConTechnologyDisclosureNum = ProjectData.Sum(x => x.ComprehensiveConTechnologyDisclosureNum),
|
||||
ComprehensiveConTechnologyDisclosurePersonNum = ProjectData.Sum(x => x.ComprehensiveConTechnologyDisclosurePersonNum),
|
||||
ComprehensiveReviewDrawingsNum = ProjectData.Sum(x => x.ComprehensiveReviewDrawingsNum),
|
||||
UseNum = ProjectData.Sum(x => x.UseNum),
|
||||
OKNum = ProjectData.Sum(x => x.OKNum),
|
||||
CompanyPersonNum = GetCompanyPersonNum(),
|
||||
@@ -398,10 +421,14 @@ namespace BLL
|
||||
SubProjectNum = ProjectData.Sum(x => x.SubProjectNum),
|
||||
SubdivisionalWorksNum = ProjectData.Sum(x => x.SubdivisionalWorksNum),
|
||||
InspectionLotNum = ProjectData.Sum(x => x.InspectionLotNum),
|
||||
InspectionMachineNum = ProjectData.Sum(x => x.InspectionMachineNum),
|
||||
InspectionMachineQualifiedNum = ProjectData.Sum(x => x.InspectionMachineQualifiedNum),
|
||||
SpecialEquipmentQualityAssuranceSystemNum = ProjectData.Sum(x => x.SpecialEquipmentQualityAssuranceSystemNum),
|
||||
CreateMan = Const.sysglyId,
|
||||
CreateDate = DateTime.Now
|
||||
};
|
||||
return result;
|
||||
|
||||
}
|
||||
public static void UpdateTodyData_State()
|
||||
{
|
||||
@@ -547,11 +574,15 @@ namespace BLL
|
||||
var branchPersonNumTask = CQMSDataService.GetBranchPersonNumAsync(); //获取分支机构人数
|
||||
var projectPersonNumTask = CQMSDataService.GetProjectPersonNumAsync(); //获取项目专职人数
|
||||
var trainPersonNumTask = CQMSDataService.GetTrainPersonNumAsync(); //获取质量培训人次数
|
||||
var technicalDisclosePersonTask = CQMSDataService.GetTechnicalDisclosePersonNumAsync(); //获取技术交底人次数
|
||||
var technicalDisclosePersonTask = CQMSDataService.GetTechnicalDisclosePersonNumAsync(); //获取设计交底人次数
|
||||
var qualityAssuranceNumTask = CQMSDataService.GetQualityAssuranceNumAsync(); //获取特设质保体系数量
|
||||
var comprehensiveConTechnologyDisclosureTask = CQMSDataService.GetComprehensiveConTechnologyDisclosureAsync(); //获取施工技术交底
|
||||
var comprehensiveReviewDrawingsTask = CQMSDataService.GetComprehensiveReviewDrawingsAsync(); //获取图纸会审
|
||||
|
||||
var inspectionEquipmentTask = CQMSDataService.GetComprehensive_InspectionEquipmentAsync(); //获取设备报验
|
||||
var inspectionPersonTask = CQMSDataService.GetComprehensive_InspectionPersonAsync(); //获取人员报验
|
||||
var inspectionMachineTask = CQMSDataService.GetComprehensive_InspectionMachineAsync(); //获取机具报验
|
||||
var inspectionMachineEquipmentTask = CQMSDataService.GetComprehensive_InspectionMachineEquipmentAsync(); //获取设备报验报检
|
||||
var useNumTask = CQMSDataService.GetUseNumAsync(); //获取在用计量器具数
|
||||
var okNumTask = CQMSDataService.GetOkNumAsync(); //获取校准合格数
|
||||
|
||||
@@ -562,6 +593,8 @@ namespace BLL
|
||||
var inspectionLotNumTask = CQMSDataService.GetInspectionLotNumAsync(); //获取检验批个数
|
||||
var constructSolutionTask = CQMSDataService.GetConstructSolutionAsync(); //施工方案数量
|
||||
var cqmsProblemTask = CQMSDataService.GetCQMSProblemAsync(); //获取企业级、项目级质量问题
|
||||
var cqmsBranchMajorCheckTask = CQMSDataService.GetBranchMajorCheckAsync(); //获取分支机构质量大检查次数
|
||||
var cqmsCompanyMajorCheckTask = CQMSDataService.GetCompanyMajorCheckAsync(); //获取企业质量大检查次数
|
||||
|
||||
//质量验收数据
|
||||
var keyProcessNumTask = CQMSDataService.GetKeyProcessNumAsync(); //获取关键工序验收数
|
||||
@@ -584,14 +617,16 @@ namespace BLL
|
||||
await Task.WhenAll(
|
||||
companyPersonNumTask, branchPersonNumTask, projectPersonNumTask,
|
||||
trainPersonNumTask, technicalDisclosePersonTask,
|
||||
comprehensiveConTechnologyDisclosureTask, comprehensiveReviewDrawingsTask,
|
||||
inspectionEquipmentTask, inspectionPersonTask, inspectionMachineTask,
|
||||
useNumTask, okNumTask,
|
||||
singleProjectNumTask, unitProjectNumTask, subProjectNuTask, subdivisionalWorksNuTask, inspectionLotNumTask,
|
||||
constructSolutionTask,
|
||||
cqmsProblemTask,
|
||||
cqmsProblemTask, cqmsBranchMajorCheckTask, cqmsCompanyMajorCheckTask,
|
||||
keyProcessNumTask, keyProcessOKNumTask, specialProcessNumTask, specialProcessOKNumTask, concealedWorksNumTask, concealedWorksOKNumTask,
|
||||
unitProjectAcceptNumTask, unitProjectAcceptOKNumTask, subProjectAcceptNumTask, subProjectAcceptOKNumTask, subdivisionalWorksAcceptNumTask, subdivisionalWorksAcceptOKNumTask,
|
||||
materialInRecheckNumTask, materialInRecheckOKNumTask
|
||||
materialInRecheckNumTask, materialInRecheckOKNumTask, inspectionMachineEquipmentTask,
|
||||
qualityAssuranceNumTask
|
||||
);
|
||||
|
||||
// 统一获取异步方法的返回值
|
||||
@@ -600,10 +635,13 @@ namespace BLL
|
||||
var projectPersonNumList = await projectPersonNumTask;
|
||||
var trainPersonNumList = await trainPersonNumTask;
|
||||
var technicalDisclosePersonList = await technicalDisclosePersonTask;
|
||||
var comprehensiveConTechnologyDisclosureList = await comprehensiveConTechnologyDisclosureTask;
|
||||
var comprehensiveReviewDrawingsList = await comprehensiveReviewDrawingsTask;
|
||||
|
||||
var inspectionEquipmentList = await inspectionEquipmentTask;
|
||||
var inspectionPersonList = await inspectionPersonTask;
|
||||
var inspectionMachineList = await inspectionMachineTask;
|
||||
var inspectionMachineEquipmentList = await inspectionMachineEquipmentTask;
|
||||
var useNum = await useNumTask;
|
||||
var okNum = await okNumTask;
|
||||
var singleProjectNum = await singleProjectNumTask;
|
||||
@@ -614,6 +652,8 @@ namespace BLL
|
||||
|
||||
var constructSolutionList = await constructSolutionTask;
|
||||
var cqmsProblemList = await cqmsProblemTask;
|
||||
var cqmsBranchMajorCheckList = await cqmsBranchMajorCheckTask;
|
||||
var cqmsCompanyMajorCheckList = await cqmsCompanyMajorCheckTask;
|
||||
|
||||
var keyProcessNum = await keyProcessNumTask;
|
||||
var keyProcessOKNum = await keyProcessOKNumTask;
|
||||
@@ -630,6 +670,7 @@ namespace BLL
|
||||
var subdivisionalWorksAcceptOKNum = await subdivisionalWorksAcceptOKNumTask;
|
||||
var materialInRecheckNum = await materialInRecheckNumTask;
|
||||
var materialInRecheckOKNum = await materialInRecheckOKNumTask;
|
||||
var qualityAssuranceNum = await qualityAssuranceNumTask;
|
||||
|
||||
// 构造结果对象
|
||||
var table = new CQMSData_CQMS
|
||||
@@ -640,15 +681,21 @@ namespace BLL
|
||||
ReportDate = DateTime.Now.Date,
|
||||
CompanyPersonNum = companyPersonNum,//
|
||||
BranchPersonNum = branchPersonNum,//
|
||||
ProjectPersonNum = projectPersonNumList.Count(),
|
||||
ProjectPersonNum = projectPersonNumList.Count(x => x.IsOffice == true),
|
||||
ProjectSubPersonNum = projectPersonNumList.Count(x => x.IsOffice == false),
|
||||
TrainPersonNum = trainPersonNumList.Count(),
|
||||
TechnicalDisclosePersonNum = technicalDisclosePersonList.Sum(x => x.TrainPersonNum),
|
||||
ComprehensiveConTechnologyDisclosureNum = comprehensiveConTechnologyDisclosureList.Count(),
|
||||
ComprehensiveConTechnologyDisclosurePersonNum = comprehensiveConTechnologyDisclosureList.Sum(x => x.TrainPersonNum),
|
||||
ComprehensiveReviewDrawingsNum = comprehensiveReviewDrawingsList.Count(),
|
||||
|
||||
EquipmentInspectionNum = inspectionEquipmentList.Count(),
|
||||
EquipmentInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.IsCheckCertificate == true).Count(),
|
||||
EquipmentInspectionQualifiedNum = inspectionEquipmentList.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(),
|
||||
@@ -662,12 +709,18 @@ namespace BLL
|
||||
ConstructSolutionNum = constructSolutionList.Count(),
|
||||
ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.State == "1").Count(),
|
||||
ConstructSolutionUnitApproveNum = 0,//
|
||||
SpecialEquipmentQualityAssuranceSystemNum = 0,//
|
||||
SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(),
|
||||
DesignDetailsNum = technicalDisclosePersonList.Sum(x => x.TrainPersonNum),
|
||||
|
||||
ProblemNum = cqmsProblemList.Count(),
|
||||
ProblemCompletedNum = cqmsProblemList.Where(x => x.State == "7").Count(),
|
||||
ProblemNotCompletedNum = cqmsProblemList.Where(x => x.State != "7").Count(),
|
||||
BranchCheckNum = cqmsBranchMajorCheckList.Count(),
|
||||
BranchCheckClosedNum = cqmsBranchMajorCheckList.Count(),
|
||||
BranchCheckNotClosedNum = 0,
|
||||
UnitCheckNum = cqmsCompanyMajorCheckList.Count(),
|
||||
UnitCheckClosedNum = cqmsCompanyMajorCheckList.Count(),
|
||||
UnitCheckNotClosedNum = 0,
|
||||
|
||||
KeyProcessNum = keyProcessNum.Count(),
|
||||
KeyProcessOKNum = keyProcessOKNum.Count(),
|
||||
@@ -682,7 +735,10 @@ namespace BLL
|
||||
SubdivisionalWorksAcceptNum = subdivisionalWorksAcceptNum.Count(),
|
||||
SubdivisionalWorksAcceptOKNum = subdivisionalWorksAcceptOKNum.Count(),
|
||||
MaterialInRecheckNum = materialInRecheckNum.Count(),
|
||||
MaterialInRecheckOKNum = materialInRecheckOKNum.Count()
|
||||
MaterialInRecheckOKNum = materialInRecheckOKNum.Count(),
|
||||
InspectionMachineNum = inspectionMachineEquipmentList.Count(),
|
||||
InspectionMachineQualifiedNum = inspectionMachineEquipmentList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true).Count(),
|
||||
|
||||
};
|
||||
#region 添加项目统计数据
|
||||
|
||||
@@ -699,11 +755,15 @@ namespace BLL
|
||||
ReportDate = DateTime.Now.Date,
|
||||
CompanyPersonNum = companyPersonNum,//
|
||||
BranchPersonNum = branchPersonNum,//
|
||||
ProjectPersonNum = projectPersonNumList.Count(x => x.ProjectId == projectid),
|
||||
ProjectPersonNum = projectPersonNumList.Count(x => x.ProjectId == projectid && x.IsOffice == true),
|
||||
ProjectSubPersonNum = projectPersonNumList.Count(x => x.ProjectId == projectid && x.IsOffice == false),
|
||||
TrainPersonNum = trainPersonNumList.Count(x => x.ProjectId == projectid),
|
||||
TechnicalDisclosePersonNum = technicalDisclosePersonList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
|
||||
ComprehensiveConTechnologyDisclosureNum = comprehensiveConTechnologyDisclosureList.Count(x => x.ProjectId == projectid),
|
||||
ComprehensiveConTechnologyDisclosurePersonNum = comprehensiveConTechnologyDisclosureList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
|
||||
ComprehensiveReviewDrawingsNum = comprehensiveReviewDrawingsList.Count(x => x.ProjectId == projectid),
|
||||
EquipmentInspectionNum = inspectionEquipmentList.Count(x => x.ProjectId == projectid),
|
||||
EquipmentInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.IsCheckCertificate == true && x.ProjectId == projectid).Count(),
|
||||
EquipmentInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.ProjectId == projectid).Count(),
|
||||
PersonInspectionNum = inspectionPersonList.Count(x => x.ProjectId == projectid),
|
||||
PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.IsOnSite.HasValue && x.IsOnSite == true && x.ProjectId == projectid).Count(),
|
||||
MachineInspectionNum = inspectionMachineList.Count(x => x.ProjectId == projectid),
|
||||
@@ -721,7 +781,7 @@ namespace BLL
|
||||
ConstructSolutionNum = constructSolutionList.Count(x => x.ProjectId == projectid),
|
||||
ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.State == "1" && x.ProjectId == projectid).Count(),
|
||||
ConstructSolutionUnitApproveNum = 0,//
|
||||
SpecialEquipmentQualityAssuranceSystemNum = 0,//
|
||||
SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(x => x.ProjectId == projectid),
|
||||
DesignDetailsNum = technicalDisclosePersonList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
|
||||
|
||||
ProblemNum = cqmsProblemList.Count(x => x.ProjectId == projectid),
|
||||
@@ -741,9 +801,13 @@ namespace BLL
|
||||
SubdivisionalWorksAcceptNum = subdivisionalWorksAcceptNum.Count(x => x.ProjectId == projectid),
|
||||
SubdivisionalWorksAcceptOKNum = subdivisionalWorksAcceptOKNum.Count(x => x.ProjectId == projectid),
|
||||
MaterialInRecheckNum = materialInRecheckNum.Count(x => x.ProjectId == projectid),
|
||||
MaterialInRecheckOKNum = materialInRecheckOKNum.Count(x => x.ProjectId == projectid)
|
||||
MaterialInRecheckOKNum = materialInRecheckOKNum.Count(x => x.ProjectId == projectid),
|
||||
InspectionMachineNum = inspectionMachineEquipmentList.Count(x => x.ProjectId == projectid),
|
||||
InspectionMachineQualifiedNum = inspectionMachineEquipmentList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true && x.ProjectId == projectid).Count(),
|
||||
|
||||
};
|
||||
Project_CQMSDataService.AddProject_CQMSData_CQMS(projectCqmsData);
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
@@ -765,6 +829,7 @@ namespace BLL
|
||||
data = GetDataByCQMSData_CQMS(table);
|
||||
return data;
|
||||
|
||||
|
||||
}
|
||||
|
||||
public static CQMSData GetDataByCQMSData_CQMS(CQMSData_CQMS table)
|
||||
@@ -777,15 +842,25 @@ namespace BLL
|
||||
item.CollCropCode = table.CollCropCode;
|
||||
item.TrainPersonNum = table.TrainPersonNum;
|
||||
item.TechnicalDisclosePersonNum = table.TechnicalDisclosePersonNum;
|
||||
item.ComprehensiveConTechnologyDisclosureNum = table.ComprehensiveConTechnologyDisclosureNum;
|
||||
item.ComprehensiveConTechnologyDisclosurePersonNum = table.ComprehensiveConTechnologyDisclosurePersonNum;
|
||||
item.ComprehensiveReviewDrawingsNum = table.ComprehensiveReviewDrawingsNum;
|
||||
item.UseNum = table.UseNum;
|
||||
item.OKNum = table.OKNum;
|
||||
item.CompanyPersonNum = table.CompanyPersonNum;
|
||||
item.BranchPersonNum = table.BranchPersonNum;
|
||||
item.ProjectPersonNum = table.ProjectPersonNum;
|
||||
item.ProjectSubPersonNum = table.ProjectSubPersonNum;
|
||||
item.ProblemNum = table.ProblemNum;
|
||||
item.ProblemCompletedNum = table.ProblemCompletedNum;
|
||||
item.ProblemNotCompletedNum = table.ProblemNotCompletedNum;
|
||||
item.ProblemRate = "";
|
||||
item.UnitCheckNum = table.UnitCheckNum;
|
||||
item.UnitCheckClosedNum = table.UnitCheckClosedNum;
|
||||
item.UnitCheckNotClosedNum = table.UnitCheckNotClosedNum;
|
||||
item.BranchCheckNum = table.BranchCheckNum;
|
||||
item.BranchCheckClosedNum = table.BranchCheckClosedNum;
|
||||
item.BranchCheckNotClosedNum = table.BranchCheckNotClosedNum;
|
||||
item.SNum = table.SNum;
|
||||
item.ANum = table.ANum;
|
||||
item.BNum = table.BNum;
|
||||
@@ -829,10 +904,13 @@ namespace BLL
|
||||
item.SubProjectAcceptOKNum = table.SubProjectAcceptOKNum;
|
||||
item.SubdivisionalWorksAcceptNum = table.SubdivisionalWorksAcceptNum;
|
||||
item.SubdivisionalWorksAcceptOKNum = table.SubdivisionalWorksAcceptOKNum;
|
||||
item.InspectionMachineNum = table.InspectionMachineNum;
|
||||
item.InspectionMachineQualifiedNum = table.InspectionMachineQualifiedNum;
|
||||
var cqmsDataItems = new List<CqmsDataItem>();
|
||||
cqmsDataItems.Add(item);
|
||||
data.CQMSDataItems = cqmsDataItems;
|
||||
return data;
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -898,18 +976,20 @@ namespace BLL
|
||||
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()
|
||||
where BeUnderConstructionList.Contains(p.ProjectId) && y.IsCQMS == true
|
||||
where BeUnderConstructionList.Contains(p.ProjectId) && y.IsCQMS == true
|
||||
select new Model.OfSafetySupervisorsOutput
|
||||
{
|
||||
ProjectId = x.ProjectId,
|
||||
ProjectName = p.ProjectName,
|
||||
ProjectFromUnitId = p.UnitId,
|
||||
UnitId = u.UnitId,
|
||||
UnitName = u.UnitName,
|
||||
Name = x.PersonName,
|
||||
Sex = z.Sex == null ? "" : (z.Sex == "1" ? "男" : "女"),
|
||||
IdentityCard = x.IdentityCard,
|
||||
WorkPostName = y.WorkPostName == null ? "" : y.WorkPostName,
|
||||
Phone = z.Telephone
|
||||
Phone = z.Telephone,
|
||||
IsOffice = (u.UnitId == BLL.Const.UnitId_SEDIN ? true : false)
|
||||
}).ToList();
|
||||
result = result
|
||||
.GroupBy(x => x.IdentityCard)
|
||||
@@ -926,6 +1006,110 @@ namespace BLL
|
||||
return await Task.Run(GetProjectPersonNum);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 特设质保体系数量
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static List<Comprehensive_QualityAssurance> GetQualityAssuranceNum()
|
||||
{
|
||||
var result = (from x in Funs.DB.Comprehensive_QualityAssurance
|
||||
where BeUnderConstructionList.Contains(x.ProjectId)
|
||||
select x).ToList();
|
||||
return result;
|
||||
}
|
||||
/// <summary>
|
||||
/// 特设质保体系数量(异步)
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<Comprehensive_QualityAssurance>> GetQualityAssuranceNumAsync()
|
||||
{
|
||||
return await Task.Run(GetQualityAssuranceNum);
|
||||
}
|
||||
|
||||
#region 质量监督大检查数据
|
||||
|
||||
#region 企业级-本单位
|
||||
|
||||
/// <summary>
|
||||
/// 获取企业质量大检查次数
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static List<CheckOutput> GetCompanyMajorCheck()
|
||||
{
|
||||
var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
|
||||
join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
|
||||
from p in pGroup.DefaultIfEmpty()
|
||||
join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId into uGroup
|
||||
from u in uGroup.DefaultIfEmpty()
|
||||
join cu in Funs.DB.Base_Unit on x.CheckUnitId equals cu.UnitId into cuGroup
|
||||
from cu in cuGroup.DefaultIfEmpty()
|
||||
where cu.UnitId == BLL.Const.UnitId_SEDIN && x.CheckMainType == "1" && x.CheckDate > Const.DtmarkTime //&& x.CheckType == "1"
|
||||
select new Model.CheckOutput()
|
||||
{
|
||||
ProjectId = x.ProjectId,
|
||||
ProjectName = p.ProjectName,
|
||||
UnitId = x.UnitId,
|
||||
UnitName = u.UnitName,
|
||||
Id = x.SuperviseCheckReportId,
|
||||
CheckTeam = x.CheckTeam,
|
||||
CheckDate = x.CheckDate,
|
||||
});
|
||||
return result.ToList();
|
||||
}
|
||||
/// <summary>
|
||||
/// 获取企业质量大检查次数(异步)
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<CheckOutput>> GetCompanyMajorCheckAsync()
|
||||
{
|
||||
return await Task.Run(GetCompanyMajorCheck);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 分支机构
|
||||
|
||||
/// <summary>
|
||||
/// 获取分支机构质量大检查次数
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static List<CheckOutput> GetBranchMajorCheck()
|
||||
{
|
||||
var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
|
||||
join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
|
||||
from p in pGroup.DefaultIfEmpty()
|
||||
join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId into uGroup
|
||||
from u in uGroup.DefaultIfEmpty()
|
||||
join cu in Funs.DB.Base_Unit on x.CheckUnitId equals cu.UnitId into cuGroup
|
||||
from cu in cuGroup.DefaultIfEmpty()
|
||||
where cu.IsBranch == true && x.CheckMainType == "1" && x.CheckDate > Const.DtmarkTime//&& x.CheckType == "1"
|
||||
select new Model.CheckOutput()
|
||||
{
|
||||
ProjectId = x.ProjectId,
|
||||
ProjectName = p.ProjectName,
|
||||
UnitId = x.UnitId,
|
||||
UnitName = u.UnitName,
|
||||
Id = x.SuperviseCheckReportId,
|
||||
CheckTeam = x.CheckTeam,
|
||||
CheckDate = x.CheckDate,
|
||||
});
|
||||
return result.ToList();
|
||||
}
|
||||
/// <summary>
|
||||
/// 获取分支机构质量大检查次数(异步)
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<CheckOutput>> GetBranchMajorCheckAsync()
|
||||
{
|
||||
return await Task.Run(GetBranchMajorCheck);
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取质量培训人次数
|
||||
/// </summary>
|
||||
@@ -1248,6 +1432,89 @@ namespace BLL
|
||||
return await Task.Run(GetConstructSolution);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取施工技术交底
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static List<Model.EduTrainOutput> GetComprehensiveConTechnologyDisclosure()
|
||||
{
|
||||
var result = (from x in Funs.DB.Comprehensive_ConTechnologyDisclosure
|
||||
join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
|
||||
from p in pGroup.DefaultIfEmpty()
|
||||
where BeUnderConstructionList.Contains(p.ProjectId) && x.CompileDate > Const.DtmarkTime
|
||||
select new Model.EduTrainOutput()
|
||||
{
|
||||
ProjectId = x.ProjectId,
|
||||
ProjectName = p.ProjectName,
|
||||
UnitName = "",
|
||||
Id = x.ConTechnologyDisclosureId,
|
||||
TrainTitle = "",
|
||||
TrainStartDate = null,
|
||||
TrainEndDate = null,
|
||||
TrainPersonNum = x.DisclosurePersonNum ?? 0,
|
||||
}).ToList();
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取施工技术交底(异步)
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<EduTrainOutput>> GetComprehensiveConTechnologyDisclosureAsync()
|
||||
{
|
||||
return await Task.Run(GetComprehensiveConTechnologyDisclosure);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取图纸会审
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static List<Model.EduTrainOutput> GetComprehensiveReviewDrawings()
|
||||
{
|
||||
var result = (from x in Funs.DB.Comprehensive_ReviewDrawings
|
||||
join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
|
||||
from p in pGroup.DefaultIfEmpty()
|
||||
where BeUnderConstructionList.Contains(p.ProjectId) && x.CreateDate > Const.DtmarkTime
|
||||
select new Model.EduTrainOutput()
|
||||
{
|
||||
ProjectId = x.ProjectId,
|
||||
ProjectName = p.ProjectName,
|
||||
UnitName = "",
|
||||
Id = x.Id
|
||||
}).ToList();
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取图纸会审(异步)
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<EduTrainOutput>> GetComprehensiveReviewDrawingsAsync()
|
||||
{
|
||||
return await Task.Run(GetComprehensiveReviewDrawings);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取设备报验
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static List<Model.Comprehensive_InspectionMachine> GetComprehensive_InspectionMachineEquipment()
|
||||
{
|
||||
var result = (from x in Funs.DB.Comprehensive_InspectionMachine
|
||||
where BeUnderConstructionList.Contains(x.ProjectId) && x.SType == "设备" && x.CompileDate > Const.DtmarkTime
|
||||
select x).ToList();
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取设备报验(异步)
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<Comprehensive_InspectionMachine>> GetComprehensive_InspectionMachineEquipmentAsync()
|
||||
{
|
||||
return await Task.Run(GetComprehensive_InspectionMachineEquipment);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取质量问题
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user