xiaju
/
SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

人员报验

This commit is contained in:
geh 2025-07-09 11:27:45 +08:00
parent b076bad2e1
commit a7a27e086b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SUBQHSE/BLL/ZHGL/DataSync/CQMSDataService.cs
View File

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