|
@@ -304,7 +304,15 @@ public class AmountWaterUsedAmountServiceImpl implements AmountWaterUsedAmountSe
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ BigInteger WaterPropertyId = customerInfo.getWaterPropertyId();
|
|
|
+ if(WaterPropertyId != null){
|
|
|
+ //根据用水性质ID查找是否是阶梯
|
|
|
+ BaseWaterPropertyDto waterPropertyDto = baseWaterPropertyMapper.get(WaterPropertyId,loginUser.getSiteId(),loginUser.getCustomerId());
|
|
|
+ Integer laddertype = waterPropertyDto.getLaddertype();
|
|
|
+ if(laddertype != null && laddertype == 0){
|
|
|
+ isEnable = 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
//计算欠费
|
|
|
if (isEnable==0) {
|
|
|
//非阶梯
|