diff --git a/calc/com/tenwa/reckon/help/ConditionHelper.java b/calc/com/tenwa/reckon/help/ConditionHelper.java index eaceefc20..00f790c41 100644 --- a/calc/com/tenwa/reckon/help/ConditionHelper.java +++ b/calc/com/tenwa/reckon/help/ConditionHelper.java @@ -48,15 +48,15 @@ public class ConditionHelper { this.getFirstPaymentTotal(rentPlan, cb, bean); Map params = new HashMap(); //irr ¼ÆË㷽ʽÐÞ¸Ä (1+irr/100)^12 -1 - if ("STAGE_IRR".equals(cb.getIrrType())) { + /*if ("STAGE_IRR".equals(cb.getIrrType())) { String incomeNumberYear = cb.getIncomeNumberYear() ; int incomeType = incomeNumberYear.contains("_") == true ? Integer.valueOf(incomeNumberYear.split("_")[1]):Integer.valueOf(incomeNumberYear); //Integer.valueOf(incomeNumberYear.split("_")[1]); double irr = new BigDecimal(Double.valueOf(cb.getIrr())/12).setScale(6, BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(100)).add(new BigDecimal(1)).pow(incomeType).subtract(new BigDecimal(1)).multiply(new BigDecimal(100)).setScale(6, BigDecimal.ROUND_HALF_UP).doubleValue(); params.put("irr", String.valueOf(irr)); - }else{ + }else{*/ params.put("irr", cb.getIrr()); - } + //} if((!cb.getSettleMethod().equals("even_interest"))&&(!cb.getRentOrRate().equals("rate"))||flag){ params.put("year_rate", cb.getYearRate()); }