pms加上数据验证
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.njcn.harmonic.service.majornetwork.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.njcn.common.pojo.param.StatisticsBizBaseParam;
|
||||
@@ -72,19 +73,35 @@ public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM
|
||||
DeptDTO deptDTO = deptMap.get(key);
|
||||
RStatOrgVO rStatOrgVO = new RStatOrgVO();
|
||||
rStatOrgVO.setOrgName(deptDTO.getName());
|
||||
if(rStatOrgM.getOverDayAccrued()!=null&&rStatOrgM.getEffectiveMeasurementAccrued()!=null&&
|
||||
rStatOrgM.getOverDayAccrued()!=0&&rStatOrgM.getEffectiveMeasurementAccrued()!=0){
|
||||
Float averageOverDay = Float.parseFloat(
|
||||
df.format(rStatOrgM.getOverDayAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued() * 1.0)));
|
||||
rStatOrgVO.setAverageOverDay(averageOverDay);
|
||||
}else{
|
||||
rStatOrgVO.setAverageOverDay(0.0f);
|
||||
}
|
||||
|
||||
rStatOrgVO.setEffectiveMeasurementAverage(rStatOrgM.getEffectiveMeasurementAverage());
|
||||
rStatOrgVO.setEffectiveMeasurementAccrued(rStatOrgM.getEffectiveMeasurementAccrued());
|
||||
rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgM.getHarmonicMeasurementAverage());
|
||||
rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgM.getHarmonicMeasurementAccrued());
|
||||
if(rStatOrgM.getHarmonicMeasurementAverage()!=null&&rStatOrgM.getEffectiveMeasurementAverage()!=null&&
|
||||
rStatOrgM.getHarmonicMeasurementAverage()!=0&&rStatOrgM.getEffectiveMeasurementAverage()!=0){
|
||||
Float harmonicMeasurementRatioAverage = Float.parseFloat(
|
||||
df.format(rStatOrgM.getHarmonicMeasurementAverage() / (rStatOrgM.getEffectiveMeasurementAverage() * 1.0)));
|
||||
rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
|
||||
}else{
|
||||
rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f);
|
||||
}
|
||||
if(rStatOrgM.getHarmonicMeasurementAccrued()!=null&&rStatOrgM.getEffectiveMeasurementAccrued()!=null&&
|
||||
rStatOrgM.getHarmonicMeasurementAccrued()!=0&&rStatOrgM.getEffectiveMeasurementAccrued()!=0){
|
||||
Float harmonicMeasurementRatioAccrued = Float.parseFloat(
|
||||
df.format(rStatOrgM.getHarmonicMeasurementAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued() * 1.0)));
|
||||
rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
|
||||
}else{
|
||||
rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f);
|
||||
}
|
||||
newList.add(rStatOrgVO);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,12 +74,24 @@ public class RStatOrgQServiceImpl extends ServiceImpl<RStatOrgQMapper, RStatOrgQ
|
||||
rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgQ.getHarmonicMeasurementAverage());
|
||||
rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgQ.getHarmonicMeasurementAccrued());
|
||||
DecimalFormat df = new DecimalFormat("###.00");
|
||||
if(rStatOrgQ.getHarmonicMeasurementAverage()!=null&&rStatOrgQ.getEffectiveMeasurementAverage()!=null&&
|
||||
rStatOrgQ.getHarmonicMeasurementAverage()!=0&&rStatOrgQ.getEffectiveMeasurementAverage()!=0){
|
||||
Float harmonicMeasurementRatioAverage = Float.parseFloat(
|
||||
df.format(rStatOrgQ.getHarmonicMeasurementAverage() / (rStatOrgQ.getEffectiveMeasurementAverage() * 1.0)));
|
||||
rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
|
||||
}else{
|
||||
rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f);
|
||||
}
|
||||
if(rStatOrgQ.getHarmonicMeasurementAccrued()!=null&&rStatOrgQ.getEffectiveMeasurementAccrued()!=null&&
|
||||
rStatOrgQ.getHarmonicMeasurementAccrued()!=0&&rStatOrgQ.getEffectiveMeasurementAccrued()!=0){
|
||||
Float harmonicMeasurementRatioAccrued = Float.parseFloat(
|
||||
df.format(rStatOrgQ.getHarmonicMeasurementAccrued() / (rStatOrgQ.getEffectiveMeasurementAccrued() * 1.0)));
|
||||
rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
|
||||
}else{
|
||||
rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f);
|
||||
}
|
||||
|
||||
|
||||
newList.add(rStatOrgVO);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -99,12 +99,22 @@ public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY
|
||||
rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgY.getOverLimitMeasurementAverage());
|
||||
rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgY.getOverLimitMeasurementAccrued());
|
||||
DecimalFormat df = new DecimalFormat("###.00");
|
||||
if(rStatOrgY.getOverLimitMeasurementAverage()!=null&&rStatOrgY.getEffectiveMeasurementAverage()!=null&&
|
||||
rStatOrgY.getOverLimitMeasurementAverage()!=0&&rStatOrgY.getEffectiveMeasurementAverage()!=0){
|
||||
Float harmonicMeasurementRatioAverage = Float.parseFloat(
|
||||
df.format(rStatOrgY.getOverLimitMeasurementAverage() / (rStatOrgY.getEffectiveMeasurementAverage() * 1.0)));
|
||||
rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
|
||||
}else{
|
||||
rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f);
|
||||
}
|
||||
if(rStatOrgY.getOverLimitMeasurementAccrued()!=null&&rStatOrgY.getEffectiveMeasurementAccrued()!=null&&
|
||||
rStatOrgY.getOverLimitMeasurementAccrued()!=0&&rStatOrgY.getEffectiveMeasurementAccrued()!=0){
|
||||
Float harmonicMeasurementRatioAccrued = Float.parseFloat(
|
||||
df.format(rStatOrgY.getOverLimitMeasurementAccrued() / (rStatOrgY.getEffectiveMeasurementAccrued() * 1.0)));
|
||||
rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
|
||||
}else{
|
||||
rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f);
|
||||
}
|
||||
newList.add(rStatOrgVO);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user