| @@ -929,6 +929,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| result.put("adjustRatio" + i, wxRentContract.getAdjustRatio()); | result.put("adjustRatio" + i, wxRentContract.getAdjustRatio()); | ||||
| result.put("adjustPeriod" + i, wxRentContract.getAdjustPeriod()); | result.put("adjustPeriod" + i, wxRentContract.getAdjustPeriod()); | ||||
| result.put("payRatio" + i, wxRentContract.getPayRatio()); | result.put("payRatio" + i, wxRentContract.getPayRatio()); | ||||
| } | } | ||||
| if (extracount > 0) { | if (extracount > 0) { | ||||
| //额外租期 | //额外租期 | ||||
| @@ -1002,8 +1003,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| rentPrice = rentPrice.multiply(new BigDecimal(adjustRatio)) | rentPrice = rentPrice.multiply(new BigDecimal(adjustRatio)) | ||||
| .add(rentPrice).setScale(2, RoundingMode.HALF_EVEN); | .add(rentPrice).setScale(2, RoundingMode.HALF_EVEN); | ||||
| result.put("priceRentUpper" + i, digitUppercase(rentPrice.doubleValue())); | result.put("priceRentUpper" + i, digitUppercase(rentPrice.doubleValue())); | ||||
| result.put("priceRent" + i, digitUppercase(rentPrice.doubleValue())); | |||||
| result.put("priceRent" + i, rentPrice.doubleValue()); | |||||
| } | } | ||||
| result.put("adjustRatio" + i, wxRentContract.getAdjustRatio()); | |||||
| } | } | ||||
| if (extracount > 0) { | if (extracount > 0) { | ||||
| //额外租期 | //额外租期 | ||||
| @@ -1032,7 +1034,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| rentPrice = rentPrice.multiply(new BigDecimal(adjustRatio)) | rentPrice = rentPrice.multiply(new BigDecimal(adjustRatio)) | ||||
| .add(rentPrice).setScale(2, RoundingMode.HALF_EVEN); | .add(rentPrice).setScale(2, RoundingMode.HALF_EVEN); | ||||
| result.put("priceRentUpper" + count, digitUppercase(rentPrice.doubleValue())); | result.put("priceRentUpper" + count, digitUppercase(rentPrice.doubleValue())); | ||||
| result.put("priceRent" + count, digitUppercase(rentPrice.doubleValue())); | |||||
| result.put("priceRent" + count, rentPrice.doubleValue()); | |||||
| result.put("adjustRatio" + count, wxRentContract.getAdjustRatio()); | |||||
| } | } | ||||
| //无数据租期 | //无数据租期 | ||||
| @@ -1047,6 +1050,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| result.put("rentalEndDateDay" + i, "/"); | result.put("rentalEndDateDay" + i, "/"); | ||||
| result.put("priceRentUpper" + i, "/"); | result.put("priceRentUpper" + i, "/"); | ||||
| result.put("priceRent" + i, "/"); | result.put("priceRent" + i, "/"); | ||||
| result.put("adjustRatio" + i, "/"); | |||||
| } | } | ||||
| } | } | ||||