人员报验
This commit is contained in:
parent
b076bad2e1
commit
a7a27e086b
|
@ -634,8 +634,7 @@ namespace BLL
|
|||
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(),
|
||||
PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.ValidityDate == null || (x.ValidityDate.HasValue && x.ValidityDate >= DateTime.Now)).Count(),
|
||||
MachineInspectionNum = inspectionMachineList.Count(),
|
||||
MachineInspectionQualifiedNum =
|
||||
inspectionMachineList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true).Count(),
|
||||
|
@ -718,8 +717,7 @@ namespace BLL
|
|||
EquipmentInspectionQualifiedNum = inspectionEquipmentList
|
||||
.Where(x => x.SamplingResult == "1" && 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(),
|
||||
PersonInspectionQualifiedNum = inspectionPersonList.Where(x => (x.ValidityDate == null || (x.ValidityDate.HasValue && x.ValidityDate >= DateTime.Now)) && x.ProjectId == projectid).Count(),
|
||||
MachineInspectionNum = inspectionMachineList.Count(x => x.ProjectId == projectid),
|
||||
MachineInspectionQualifiedNum = inspectionMachineList.Where(x =>
|
||||
x.IsCheckOK.HasValue && x.IsCheckOK == true && x.ProjectId == projectid).Count(),
|
||||
|
@ -1178,14 +1176,14 @@ namespace BLL
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取人员报验
|
||||
/// 获取人员报验(总数取在场人员)
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static List<Model.Comprehensive_InspectionPerson> GetComprehensive_InspectionPerson()
|
||||
{
|
||||
var result = (from x in Funs.DB.Comprehensive_InspectionPerson
|
||||
where BeUnderConstructionList.Contains(x.ProjectId) && x.CompileDate > Const.DtmarkTime
|
||||
select x).ToList();
|
||||
where BeUnderConstructionList.Contains(x.ProjectId) && x.IsOnSite.HasValue && x.IsOnSite == true && x.CompileDate > Const.DtmarkTime
|
||||
select x).ToList();
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue