This commit is contained in:
parent
821ad2e5c9
commit
55255c35fd
|
@ -345,8 +345,10 @@ namespace FineUIPro.Web.common
|
||||||
},
|
},
|
||||||
measuringInstrumentsData = new
|
measuringInstrumentsData = new
|
||||||
{//计量器具数据
|
{//计量器具数据
|
||||||
useNum = cqmsData.UseNum ?? 0,//计量器具
|
// useNum = cqmsData.UseNum ?? 0,//计量器具
|
||||||
okNum = cqmsData.OKNum ?? 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),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -380,8 +380,10 @@ namespace FineUIPro.Web.common
|
||||||
},
|
},
|
||||||
measuringInstrumentsData = new
|
measuringInstrumentsData = new
|
||||||
{//计量器具数据
|
{//计量器具数据
|
||||||
useNum = cqmsProjectData.UseNum ?? 0,//计量器具
|
// useNum = cqmsProjectData.UseNum ?? 0,//计量器具
|
||||||
okNum = cqmsProjectData.OKNum ?? 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),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue