解决异常除数
This commit is contained in:
@@ -115,7 +115,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
|
|||||||
if (ObjectUtil.isNotNull(data1)) {
|
if (ObjectUtil.isNotNull(data1)) {
|
||||||
r.setHarmonicName(data1.getName());
|
r.setHarmonicName(data1.getName());
|
||||||
r.setSort(data1.getSort());
|
r.setSort(data1.getSort());
|
||||||
if(r.getOverDay()!=0){
|
if(r.getOverDay()!=0&&r.getOverLimitMeasurementAccrued()!=0){
|
||||||
DecimalFormat df = new DecimalFormat("###.00");
|
DecimalFormat df = new DecimalFormat("###.00");
|
||||||
Float averageOverDay = Float.parseFloat(
|
Float averageOverDay = Float.parseFloat(
|
||||||
df.format(r.getOverDay() / (r.getOverLimitMeasurementAccrued() * 1.0)));
|
df.format(r.getOverDay() / (r.getOverLimitMeasurementAccrued() * 1.0)));
|
||||||
@@ -202,9 +202,14 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
|
|||||||
rIconVO.setOverLimitMeasurementRatioAccrued(orgM.getOverLimitMeasurementRatioAccrued());
|
rIconVO.setOverLimitMeasurementRatioAccrued(orgM.getOverLimitMeasurementRatioAccrued());
|
||||||
rIconVO.setOverLimitMeasurementRatioAverage(orgM.getOverLimitMeasurementRatioAverage());
|
rIconVO.setOverLimitMeasurementRatioAverage(orgM.getOverLimitMeasurementRatioAverage());
|
||||||
DecimalFormat df = new DecimalFormat("###.00");
|
DecimalFormat df = new DecimalFormat("###.00");
|
||||||
Float averageOverDay = Float.parseFloat(
|
if(orgM.getOverDay()!=0&&orgM.getOverLimitMeasurementAccrued()!=0){
|
||||||
df.format(orgM.getOverDay() / (orgM.getOverLimitMeasurementAccrued() * 1.0)));
|
Float averageOverDay = Float.parseFloat(
|
||||||
rIconVO.setAverageOverDay(averageOverDay);
|
df.format(orgM.getOverDay() / (orgM.getOverLimitMeasurementAccrued() * 1.0)));
|
||||||
|
rIconVO.setAverageOverDay(averageOverDay);
|
||||||
|
}else{
|
||||||
|
rIconVO.setAverageOverDay(0f);
|
||||||
|
}
|
||||||
|
|
||||||
arrayVOList.add(rIconVO);
|
arrayVOList.add(rIconVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -273,10 +278,14 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
|
|||||||
DeptDTO deptDTO = deptMap.get(statHarmonic.getOrgNo());
|
DeptDTO deptDTO = deptMap.get(statHarmonic.getOrgNo());
|
||||||
r.setHarmonicName(deptDTO.getName());
|
r.setHarmonicName(deptDTO.getName());
|
||||||
r.setSort(deptDTO.getSort());
|
r.setSort(deptDTO.getSort());
|
||||||
DecimalFormat df = new DecimalFormat("###.00");
|
if(r.getOverDay()!=0&&r.getOverLimitMeasurementAccrued()!=0){
|
||||||
Float averageOverDay = Float.parseFloat(
|
DecimalFormat df = new DecimalFormat("###.00");
|
||||||
df.format(r.getOverDay() / (r.getOverLimitMeasurementAccrued() * 1.0)));
|
Float averageOverDay = Float.parseFloat(
|
||||||
r.setAverageOverDay(averageOverDay);
|
df.format(r.getOverDay() / (r.getOverLimitMeasurementAccrued() * 1.0)));
|
||||||
|
r.setAverageOverDay(averageOverDay);
|
||||||
|
}else{
|
||||||
|
r.setAverageOverDay(0f);
|
||||||
|
}
|
||||||
eventVO.add(r);
|
eventVO.add(r);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -362,10 +371,14 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
|
|||||||
rIconVO.setOverLimitMeasurementAverage(orgM.getOverLimitMeasurementAverage());
|
rIconVO.setOverLimitMeasurementAverage(orgM.getOverLimitMeasurementAverage());
|
||||||
rIconVO.setOverLimitMeasurementRatioAccrued(orgM.getOverLimitMeasurementRatioAccrued());
|
rIconVO.setOverLimitMeasurementRatioAccrued(orgM.getOverLimitMeasurementRatioAccrued());
|
||||||
rIconVO.setOverLimitMeasurementRatioAverage(orgM.getOverLimitMeasurementRatioAverage());
|
rIconVO.setOverLimitMeasurementRatioAverage(orgM.getOverLimitMeasurementRatioAverage());
|
||||||
DecimalFormat df = new DecimalFormat("###.00");
|
if(orgM.getOverDay()!=0&&orgM.getOverLimitMeasurementAccrued()!=0){
|
||||||
Float averageOverDay = Float.parseFloat(
|
DecimalFormat df = new DecimalFormat("###.00");
|
||||||
df.format(orgM.getOverDay() / (orgM.getOverLimitMeasurementAccrued() * 1.0)));
|
Float averageOverDay = Float.parseFloat(
|
||||||
rIconVO.setAverageOverDay(averageOverDay);
|
df.format(orgM.getOverDay() / (orgM.getOverLimitMeasurementAccrued() * 1.0)));
|
||||||
|
rIconVO.setAverageOverDay(averageOverDay);
|
||||||
|
}else{
|
||||||
|
rIconVO.setAverageOverDay(0f);
|
||||||
|
}
|
||||||
arrayVOList.add(rIconVO);
|
arrayVOList.add(rIconVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user