This commit is contained in:
geh 2025-08-21 14:37:28 +08:00
parent 821ad2e5c9
commit 55255c35fd
2 changed files with 8 additions and 4 deletions

View File

@ -345,8 +345,10 @@ namespace FineUIPro.Web.common
},
measuringInstrumentsData = new
{//计量器具数据
useNum = cqmsData.UseNum ?? 0,//计量器具
okNum = cqmsData.OKNum ?? 0,//校准合格
// useNum = cqmsData.UseNum ?? 0,//计量器具
// okNum = cqmsData.OKNum ?? 0,//校准合格
useNum = inspectionMachineList.Where(x => x.InspectionType == "计量").Sum(x => x.UnitsCount ?? 0),
okNum = inspectionMachineList.Where(x => x.InspectionType == "计量" && x.IsCheckOK.HasValue && x.IsCheckOK == true).Sum(x => x.UnitsCount ?? 0),
},
}
};

View File

@ -380,8 +380,10 @@ namespace FineUIPro.Web.common
},
measuringInstrumentsData = new
{//计量器具数据
useNum = cqmsProjectData.UseNum ?? 0,//计量器具
okNum = cqmsProjectData.OKNum ?? 0,//校准合格
// useNum = cqmsProjectData.UseNum ?? 0,//计量器具
// okNum = cqmsProjectData.OKNum ?? 0,//校准合格
useNum = inspectionMachineList.Where(x => x.InspectionType == "计量").Sum(x => x.UnitsCount ?? 0),
okNum = inspectionMachineList.Where(x => x.InspectionType == "计量" && x.IsCheckOK.HasValue && x.IsCheckOK == true).Sum(x => x.UnitsCount ?? 0),
},
}
};