From e6e26105be2409d4daff8fd09cb2bc77d94d6481 Mon Sep 17 00:00:00 2001
From: admin <admin@DESKTOP-M120RON.sinopharmholding.com>
Date: Fri, 10 Aug 2018 15:30:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E4=B8=8E=E8=9E=8D=E8=B5=84=E6=98=AF?=
 =?UTF-8?q?=E4=B8=8E=E5=90=A6,=E9=83=BD=E8=BF=9B=E8=A1=8C=E6=B5=8B?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tenwa/reckon/executor/FundFundPlanExecutor.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
index 06a7b1e59..fe2c8d105 100644
--- a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
+++ b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
@@ -213,10 +213,10 @@ public class FundFundPlanExecutor {
 	  				if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){
 		  				ffcp.setPayCust(custid);
 	  				}
-	  				if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//需要判断是否融资
+	  				/*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");
@@ -226,12 +226,14 @@ 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);
-	  				}
+	  				}*/
+	  				//不管是否参与融资,都生成租金计划	by	K	2018/08/10
+	  				fundPlanBeans.add(ffcp);
 	  			}
 			}
 			return fundPlanBeans;