| @@ -2317,9 +2317,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| result.put("twoRentalEndDateDay1",incrementStartDate.substring(8,10)); | result.put("twoRentalEndDateDay1",incrementStartDate.substring(8,10)); | ||||
| result.put("twoRentalStartDateYear2",incrementStartDate.substring(0,4)); | |||||
| result.put("twoRentalStartDateMonth2",incrementStartDate.substring(5,7)); | |||||
| result.put("twoRentalStartDateDay2",incrementStartDate.substring(8,10)); | |||||
| result.put("twoRentalStartDateYear2",tempAdjustRatio.substring(0,4)); | |||||
| result.put("twoRentalStartDateMonth2",tempAdjustRatio.substring(5,7)); | |||||
| result.put("twoRentalStartDateDay2",tempAdjustRatio.substring(8,10)); | |||||
| result.put("twoRentIncreasing2",increasingProportion); | result.put("twoRentIncreasing2",increasingProportion); | ||||
| Double twoPayRatio2 = new BigDecimal(twoPayRatio1) | Double twoPayRatio2 = new BigDecimal(twoPayRatio1) | ||||
| .add(new BigDecimal(increasingProportion)) | .add(new BigDecimal(increasingProportion)) | ||||
| @@ -2356,9 +2356,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| result.put("threeRentalEndDateDay1",incrementStartDate.substring(8,10)); | result.put("threeRentalEndDateDay1",incrementStartDate.substring(8,10)); | ||||
| result.put("threeRentalStartDateYear2",incrementStartDate.substring(0,4)); | |||||
| result.put("threeRentalStartDateMonth2",incrementStartDate.substring(5,7)); | |||||
| result.put("threeRentalStartDateDay2",incrementStartDate.substring(8,10)); | |||||
| result.put("threeRentalStartDateYear2",tempAdjustRatio.substring(0,4)); | |||||
| result.put("threeRentalStartDateMonth2",tempAdjustRatio.substring(5,7)); | |||||
| result.put("threeRentalStartDateDay2",tempAdjustRatio.substring(8,10)); | |||||
| double threeProgressivePay2 = new BigDecimal(priceRent) | double threeProgressivePay2 = new BigDecimal(priceRent) | ||||
| .multiply(new BigDecimal(1).add(new BigDecimal(progressivePay).divide(new BigDecimal(100)))) | .multiply(new BigDecimal(1).add(new BigDecimal(progressivePay).divide(new BigDecimal(100)))) | ||||
| .setScale(2, RoundingMode.HALF_EVEN).doubleValue(); | .setScale(2, RoundingMode.HALF_EVEN).doubleValue(); | ||||