From 96c0ccb254063510c914af2c3c027eab411223fb Mon Sep 17 00:00:00 2001 From: zhulianghua Date: Wed, 18 Jul 2018 17:41:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9GPS=E4=B8=8D=E5=8F=82?= =?UTF-8?q?=E4=B8=8E=E8=9E=8D=E8=B5=84=E7=94=9F=E6=88=90=E8=B5=84=E9=87=91?= =?UTF-8?q?=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reckon/executor/FundFundPlanExecutor.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java index dbac9da29..3772c9435 100644 --- a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java +++ b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java @@ -99,7 +99,7 @@ public class FundFundPlanExecutor { ffcp.setSettleMethod("payfund6"); ffcp.setPayType(StringUtil.nullToString(param.get("CostType01")).length()>0?param.get("CostType01"):"pay_type_in"); if("NOMINAL_PRICE".equals(entry.getKey())){ - param.put("CostType02", "PaymentTime7"); + param.put("CostType02", "PaymentTime4"); } if("feetype5".equals(item.getItemNo()) && "".equals(StringUtil.nullToString(param.get("CostType02")))) { continue; @@ -110,11 +110,10 @@ public class FundFundPlanExecutor { if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){ ffcp.setPayCust(custid); } - fundPlanBeans.add(ffcp); - if(StringUtil.nullToString(param.get("FINA")).equals("Y")){//需要判断是否融资 - if(con.getAttribute(entry.getKey()).getString().equals("N")) + if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//需要判断是否融资 + if(con.getAttribute(entry.getKey() + "_FINA").getString().equals("finatype01")) { - FundPlanBean ffcp2 = new FundPlanBean(); + /*FundPlanBean ffcp2 = new FundPlanBean(); ffcp2.setFeeType(item.getItemNo());//费用类型 ffcp2.setPlanList("1"); ffcp2.setSettleMethod("payfund6"); @@ -124,8 +123,11 @@ public class FundFundPlanExecutor { if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){ ffcp2.setPayCust(custid); } - fundPlanBeans.add(ffcp2); + fundPlanBeans.add(ffcp2);*/ + fundPlanBeans.add(ffcp); } + } else { + fundPlanBeans.add(ffcp); } } }