This commit is contained in:
parent
5dd7ea5b01
commit
dc10099f97
|
@ -137,7 +137,10 @@ namespace FineUIPro.Web.common
|
||||||
string cqmsZGRate = "0";
|
string cqmsZGRate = "0";
|
||||||
if (cqmsData.ProblemNum.HasValue && cqmsData.ProblemCompletedNum.HasValue)
|
if (cqmsData.ProblemNum.HasValue && cqmsData.ProblemCompletedNum.HasValue)
|
||||||
{
|
{
|
||||||
cqmsZGRate = String.Format("{0:N2}", 100 * cqmsData.ProblemCompletedNum.Value / cqmsData.ProblemNum.Value);
|
if (cqmsData.ProblemNum.Value > 0)
|
||||||
|
{
|
||||||
|
cqmsZGRate = String.Format("{0:N2}", 100 * cqmsData.ProblemCompletedNum.Value / cqmsData.ProblemNum.Value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -127,9 +127,9 @@ namespace FineUIPro.Web.common
|
||||||
// where x.ProjectId == projectId
|
// where x.ProjectId == projectId
|
||||||
// select x;
|
// select x;
|
||||||
// 问题总数
|
// 问题总数
|
||||||
int cqmsProblemNum = cqmsProjectData.ProblemNum ?? 0;
|
int cqmsProblemNum = cqmsProjectData?.ProblemNum ?? 0;
|
||||||
int cqmsCompletedNum = cqmsProjectData.ProblemCompletedNum ?? 0;
|
int cqmsCompletedNum = cqmsProjectData?.ProblemCompletedNum ?? 0;
|
||||||
int cqmsNotCompletedNumt = cqmsProjectData.ProblemNotCompletedNum ?? 0;
|
int cqmsNotCompletedNumt = cqmsProjectData?.ProblemNotCompletedNum ?? 0;
|
||||||
//int cqmsAllCount = getJointCheckDetail.Count() + getCheckControl.Count();
|
//int cqmsAllCount = getJointCheckDetail.Count() + getCheckControl.Count();
|
||||||
//int cqmsOkNum = 0;//已完成
|
//int cqmsOkNum = 0;//已完成
|
||||||
//int cqmsIncompleteNum = 0; //未完成
|
//int cqmsIncompleteNum = 0; //未完成
|
||||||
|
@ -313,9 +313,9 @@ namespace FineUIPro.Web.common
|
||||||
},
|
},
|
||||||
engineeringDivision = new
|
engineeringDivision = new
|
||||||
{//工程划分
|
{//工程划分
|
||||||
unitNum = cqmsProjectData.UnitProjectNum ?? 0,//单位工程数
|
unitNum = cqmsProjectData?.UnitProjectNum ?? 0,//单位工程数
|
||||||
branchNum = cqmsProjectData.SubProjectNum ?? 0,//分部工程数
|
branchNum = cqmsProjectData?.SubProjectNum ?? 0,//分部工程数
|
||||||
itemizeNum = cqmsProjectData.SubdivisionalWorksNum ?? 0,//分项工程数
|
itemizeNum = cqmsProjectData?.SubdivisionalWorksNum ?? 0,//分项工程数
|
||||||
},
|
},
|
||||||
//质量验收数据
|
//质量验收数据
|
||||||
checkAccepts = checkAccepts,
|
checkAccepts = checkAccepts,
|
||||||
|
@ -357,8 +357,8 @@ namespace FineUIPro.Web.common
|
||||||
},
|
},
|
||||||
measuringInstrumentsData = new
|
measuringInstrumentsData = new
|
||||||
{//计量器具数据
|
{//计量器具数据
|
||||||
useNum = cqmsProjectData.UseNum ?? 0,//计量器具
|
useNum = cqmsProjectData?.UseNum ?? 0,//计量器具
|
||||||
okNum = cqmsProjectData.OKNum ?? 0,//校准合格
|
okNum = cqmsProjectData?.OKNum ?? 0,//校准合格
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue