From c24905c80902c03adbd686d8a9d5809cfbc9ed83 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 9 Oct 2019 16:09:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=B4=A2=E5=8A=A1=E6=9C=AC?= =?UTF-8?q?=E9=87=91=EF=BC=88=E6=9C=B1=E8=89=AF=E5=8D=8E=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reckon/executor/EvenInterestExecutor.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/calc/com/tenwa/reckon/executor/EvenInterestExecutor.java b/calc/com/tenwa/reckon/executor/EvenInterestExecutor.java index 38ad1b6d7..6144cecbd 100644 --- a/calc/com/tenwa/reckon/executor/EvenInterestExecutor.java +++ b/calc/com/tenwa/reckon/executor/EvenInterestExecutor.java @@ -87,14 +87,15 @@ public class EvenInterestExecutor extends FundRentPlanExecutor { public void calFina(ConditionBean cb, TabCalBean tcb, int startList, FundRentPlanBean frpb) throws Exception { // 加载利息列表 - //InterestCalServiceImpl icsi = new InterestCalServiceImpl(); - //List interests = icsi.getInterestList(frpb.getRentList(), cb.getCleanLeaseMoney(), cb.getYearRate(), cb.getPeriodType(), cb.getGrace(), cb.getIncomeNumberYear(), cb.getEquipEndValue(),cb.getRateAdjustType()); - frpb.setInterestBusinessList(frpb.getColumn_2()); - + InterestCalServiceImpl icsi = new InterestCalServiceImpl(); + List interests = icsi.getInterestList(frpb.getRentList(), cb.getCleanLeaseMoney(), cb.getYearRate(), cb.getPeriodType(), cb.getGrace(), cb.getIncomeNumberYear(), cb.getEquipEndValue(),cb.getRateAdjustType()); + // frpb.setInterestBusinessList(frpb.getColumn_2()); + frpb.setInterestBusinessList(interests); // 加载本金列表 - //CorpusServiceImpl csi = new CorpusServiceImpl(); - //List corpusList = csi.getCorpusList(frpb.getRentList(), frpb.getInterestBusinessList()); - frpb.setCorpusBusinessList(frpb.getColumn_1()); + CorpusServiceImpl csi = new CorpusServiceImpl(); + List corpusList = csi.getCorpusList(frpb.getRentList(), frpb.getInterestBusinessList()); + // frpb.setCorpusBusinessList(frpb.getColumn_1()); + frpb.setCorpusBusinessList(corpusList); // 加载调整信息列表 RentPlanServiceImpl rpsi = new RentPlanServiceImpl();