diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java index 70987fc..4e18f2f 100644 --- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java +++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java @@ -376,17 +376,17 @@ public class BerthsStatisticController extends BizController { if (!parkLotMap.containsKey(key)) { Map timeAndVal = Maps.newHashMap(); if (ParkConstant.ParkingLotUseStatistic.BerthRatioType.FREE == berthRatio) { - timeAndVal.put(statisEndTime, statisticDTO.getFreeRatio() * 100); + timeAndVal.put(statisEndTime, null==statisticDTO.getFreeRatio()? 0: statisticDTO.getFreeRatio()* 100); parkLotMap.put(key, timeAndVal); } else if (ParkConstant.ParkingLotUseStatistic.BerthRatioType.TURNOVER == berthRatio) { - timeAndVal.put(statisEndTime, statisticDTO.getTurnoverRatio() ); + timeAndVal.put(statisEndTime, null==statisticDTO.getTurnoverRatio()?0:statisticDTO.getTurnoverRatio() ); parkLotMap.put(key, timeAndVal); } } else { if (ParkConstant.ParkingLotUseStatistic.BerthRatioType.FREE == berthRatio) { - parkLotMap.get(key).put(statisEndTime, statisticDTO.getFreeRatio() * 100); + parkLotMap.get(key).put(statisEndTime, null==statisticDTO.getFreeRatio()? 0: statisticDTO.getFreeRatio()* 100); } else if (ParkConstant.ParkingLotUseStatistic.BerthRatioType.TURNOVER == berthRatio) { - parkLotMap.get(key).put(statisEndTime, statisticDTO.getTurnoverRatio() ); + parkLotMap.get(key).put(statisEndTime, null==statisticDTO.getTurnoverRatio()?0:statisticDTO.getTurnoverRatio() ); } }