|
|
|
@@ -316,7 +316,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
if (revenue.compareTo(start) >= 0 && revenue.compareTo(end)<= 0){ |
|
|
|
ratioVo.setRatio(ratio); |
|
|
|
ratioVo.setPrice(countPrice(ratioVo.getRatio(),revenueLong,timeType,period,from)); |
|
|
|
ratioVo.setUseRatio(ratioVo.getUseRatio()+"'"+e+"',"); |
|
|
|
ratioVo.setUseRatio(ratioVo.getUseRatio()+"\""+e+"\","); |
|
|
|
break; |
|
|
|
} |
|
|
|
}else if(e.indexOf(">") >= 0){ |
|
|
|
@@ -343,7 +343,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
|
|
|
|
if (revenue.compareTo(end) >= 0){ |
|
|
|
ratioVo.setRatio(ratio); |
|
|
|
ratioVo.setUseRatio(ratioVo.getUseRatio()+"'"+e+"',"); |
|
|
|
ratioVo.setUseRatio(ratioVo.getUseRatio()+"\""+e+"\","); |
|
|
|
|
|
|
|
//计算超出部分 |
|
|
|
BigDecimal payRatio = new BigDecimal(ratio).divide(new BigDecimal(10000)); |
|
|
|
|