|
@@ -60,7 +60,8 @@ public class RevenueServiceImpl implements RevenueService {
|
|
if(i<3){
|
|
if(i<3){
|
|
result.add(monthSell.get(i));
|
|
result.add(monthSell.get(i));
|
|
} else{
|
|
} else{
|
|
- othersUsage+=monthSell.get(i).getWaterUsage();
|
|
|
|
|
|
+ if(monthSell.get(i).getWaterUsage()!=null)
|
|
|
|
+ othersUsage+=monthSell.get(i).getWaterUsage();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
monthSellwaterDto.setPropertyName("其他用水");
|
|
monthSellwaterDto.setPropertyName("其他用水");
|