From 55465d854b7bd54d7042b3543f7b6dabb754a875 Mon Sep 17 00:00:00 2001 From: zhulianghua Date: Tue, 18 Sep 2018 12:27:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=86=85=E9=83=A8=E6=94=B6?= =?UTF-8?q?=E7=9B=8A=E7=8E=87=E7=9A=84=E6=B5=8B=E7=AE=97=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc/com/tenwa/reckon/help/ConditionHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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()); }