From 118d0e4f7caa36d8322fc1e0f5fe207213dc3047 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Wed, 25 Jul 2018 19:52:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=9C=A8=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A1=A8=E4=B8=AD=E6=8B=B7=E5=85=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=97=B6=EF=BC=8C=E5=B0=86=E5=85=B3=E8=81=94=E7=9A=84?=
 =?UTF-8?q?=E9=93=B6=E8=A1=8C=E8=B4=A6=E6=88=B7=E7=AD=89=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=94=B1=E6=89=BF=E7=A7=9F=E4=BA=BA=E7=9A=84=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E7=9A=84=E3=80=82=202.=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E4=BA=A7=E5=93=81=E4=B8=AD=E5=92=A8=E8=AF=A2=E9=A1=BE?=
 =?UTF-8?q?=E9=97=AE=E8=B4=B9=E3=80=82=203.=E5=AE=9E=E9=99=85=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E6=AC=BE=E5=8F=8A=E5=A4=84=E7=90=86=E6=97=A5=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=98=BE=E7=A4=BA=E4=B8=BA=E5=BD=93=E5=89=8D=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E3=80=82=204.=E5=88=A0=E9=99=A4lc=5Fcontract=5Finfo?=
 =?UTF-8?q?=20=E4=B8=AD=E9=87=8D=E5=A4=8D=E5=AD=97=E6=AE=B5=E3=80=82?=
 =?UTF-8?q?=EF=BC=88=E7=BB=8F=E9=94=80=E5=95=86id=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ActualPayment/ActualPaymentTempList.jsp   | 10 +++++--
 .../etc/app/component/component-config.xml    |  2 +-
 .../app/component/componenttype-config.xml    |  2 +-
 WebContent/WEB-INF/etc/jbo/jbo_lease.xml      |  3 +--
 .../flow/fund/flowpayment/FundPaymentCar.java | 26 +++++++++++++++----
 5 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp
index 402f5c5a4..8919432d0 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp
@@ -93,8 +93,14 @@
 <script type="text/javascript">
 	$(function(){
 		var phaseNo="<%=phaseNo%>";
-		 if("0020"==phaseNo){
-			setItemValue(0,0,"ACCOUNTING_DATE",new Date().format("yyyy/MM/dd"));
+		 if("0020"==phaseNo){ 
+			 for(var i=0;i<getRowCount(0);i++){
+				 var account_date = getItemValue(0,i,"ACCOUNTING_DATE");
+				 if(account_date==""||account_date==null){
+					 setItemValue(0,i,"ACCOUNTING_DATE",new Date().format("yyyy/MM/dd"));	
+					}
+				 
+			 } 
 		} 
 		setdefaultBank();
 		setColRequired();
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index f6e1a0363..50a7a8e48 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -1081,7 +1081,7 @@
 	<Component FORMAT="1" ID="FIRST_PAYMENT" NAME="首付款" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/></Parameters></Component>
 	<Component FORMAT="1" ID="HANDLING_CHARGE_MONEY" NAME="手续费" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="收取方式" PARAMETERID="PoundageStyle" PARAMETERNAME="手续费计算方式" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否差额放款" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款" PRIGHTTYPE="Required"/></Parameters></Component>
 	<Component FORMAT="1" ID="CAUTION_MONEY" NAME="保证金" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="保证金计算方式" PARAMETERID="DepositStyle" PARAMETERNAME="保证金计算方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否差额放款" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款" PRIGHTTYPE="Required"/></Parameters></Component>
-	<Component FORMAT="1" ID="MANAGEMENT_MONEY" NAME="咨询顾问费" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Required"/></Parameters></Component>
+	<Component FORMAT="1" ID="MANAGEMENT_MONEY" NAME="咨询顾问费" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Required"/></Parameters></Component>
 	
 	<Component FORMAT="1" ID="OTHER_INCOME" NAME="其他收入" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component>
 	<Component FORMAT="1" ID="OTHER_EXPENDITURE" NAME="其他支出" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component>
diff --git a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
index e74210bc0..14946a5b7 100644
--- a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
@@ -21,7 +21,7 @@
 	<ComponentType ID="PRD0321" NAME="分段" STATUS="2"/>
 	<ComponentType ID="PRD0307" NAME="还款次序" STATUS="1"/>
 	<ComponentType ID="PRD0302" NAME="利率方案" RELATIVETEMPLETCOLNAME="RAT" STATUS="2"/>
-	<ComponentType ID="PRD0322" NAME="利息处理" STATUS="1"/>
+	<ComponentType ID="PRD0322" NAME="利息处理" STATUS="2"/>
 	<ComponentType ID="PRD0309" NAME="收益核算" STATUS="1"/>
 	<ComponentType ID="PRD0103" NAME="金额期限要求" STATUS="2"/>
 	<ComponentType ID="PRD0105" NAME="担保要求" STATUS="1"/>
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 22fbbc9e1..8e0db8d09 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -906,7 +906,7 @@
 				<attribute name="RENT_METHOD" label="RENT_METHOD" type="STRING" length="30"/>
 				<attribute name="PROJECT_SOURCE" label="PROJECT_SOURCE" type="STRING" length="32"/>
 				<attribute name="PROJECT_INDUSTRY" label="PROJECT_INDUSTRY" type="STRING" length="32"/>
-				<attribute name="distributor_id" label="distributor_id" type="STRING" length="32"/>
+				<attribute name="distributor_id" label="缁忛攢鍟咺D" type="STRING" length="32"/>
 				<attribute name="LEAS_FORM" label="LEAS_FORM" type="STRING" length="32"/>
 				<attribute name="LEASE_FORM" label="绉熻祦褰㈠紡" type="STRING" length="32"/>
 				<attribute name="PROJECT_DEPT" label="PROJECT_DEPT" type="STRING" length="32"/>
@@ -943,7 +943,6 @@
 				<attribute name="SEAL_TYPE" label="鍗扮珷绫诲瀷" type="STRING" length="32"/>
 				<attribute name="MORTGAGE_AGENT" label="鎶垫娂浠ｇ悊浜�" type="STRING" length="32"/>
 				<attribute name="VERSIONID" label="鐗堟湰鍙�" type="STRING" length="64"/>
-				<attribute name="distributor_id" label="distributor_id" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPaymentCar.java b/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPaymentCar.java
index 4930aaa11..83abe623e 100644
--- a/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPaymentCar.java
+++ b/src_tenwa/com/tenwa/flow/fund/flowpayment/FundPaymentCar.java
@@ -4,13 +4,17 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import jbo.app.tenwa.calc.LC_FUND_INCOME;
 import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP;
 import jbo.app.tenwa.calc.LC_FUND_PLAN;
 import jbo.app.tenwa.calc.VI_LC_FUND_PLAN;
 import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT;
+import jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT;
+import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
 import jbo.com.tenwa.lease.comm.LC_PAY_CONDTION;
 import jbo.com.tenwa.lease.comm.LC_PAY_CONDTION_TEMP;
+
 import com.amarsoft.are.jbo.BizObject;
 import com.amarsoft.are.jbo.BizObjectManager;
 import com.amarsoft.are.jbo.JBOFactory;
@@ -132,7 +136,10 @@ public class FundPaymentCar {
 	public String setDeductMoney(JBOTransaction tx) throws Exception{
 		try{
 			BizObject boLFPAMT = JBOFactory.createBizObjectQuery(LC_FUND_PLAN.CLASS_NAME, "contract_id = '" + contractId + "' and fee_type = 'feetype10'").getSingleResult(false);
-			BizObject boCA = JBOFactory.createBizObjectQuery(CUSTOMER_ACCOUNT.CLASS_NAME, "contract_id=:contract_id").setParameter("contract_id", contractId).getSingleResult(false);
+		//	BizObject boCA = JBOFactory.createBizObjectQuery(CUSTOMER_ACCOUNT.CLASS_NAME, "contract_id=:contract_id").setParameter("contract_id", contractId).getSingleResult(false);
+			BizObject boLCI = JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME, "ID=:ID").setParameter("ID", contractId).getSingleResult(false);
+			String distributorId = boLCI.getAttribute("distributor_id").getString();
+			BizObject boDA = JBOFactory.createBizObjectQuery(DISTRIBUTOR_ACCOUNT.CLASS_NAME, "distributor_id=:distributor_id and IS_MAIN='Y'").setParameter("distributor_id", distributorId).getSingleResult(false);
 			BizObjectManager bomLFIT = JBOFactory.getBizObjectManager(LC_FUND_INCOME_TEMP.CLASS_NAME);
 			String incomeID = UUIDUtil.getUUID();
 			BigDecimal outOverMoney = new BigDecimal(boLFPAMT.getAttribute("PLAN_MONEY").getString());
@@ -174,10 +181,14 @@ public class FundPaymentCar {
 				boLFITOut.setAttributeValue("FACT_DATE", boLFPAMT.getAttribute("PLAN_DATE").getString());
 				boLFITOut.setAttributeValue("FACT_MONEY", inOvermoney);
 				boLFITOut.setAttributeValue("FEE_ADJUST", 0);
-				boLFITOut.setAttributeValue("FACT_OBJECT", boCA.getAttribute("ACCOUNT").getString());
+				/*boLFITOut.setAttributeValue("FACT_OBJECT", boCA.getAttribute("ACCOUNT").getString());
 				boLFITOut.setAttributeValue("CLIENT_BANK", boCA.getAttribute("BANK_NAME").getString());
 				boLFITOut.setAttributeValue("CLIENT_ACCOUNT", boCA.getAttribute("ACCOUNT").getString());
-				boLFITOut.setAttributeValue("CLIENT_ACCNUMBER", boCA.getAttribute("ACC_NUMBER").getString());
+				boLFITOut.setAttributeValue("CLIENT_ACCNUMBER", boCA.getAttribute("ACC_NUMBER").getString());*/
+				boLFITOut.setAttributeValue("FACT_OBJECT", boDA.getAttribute("ACCOUNT").getString());
+				boLFITOut.setAttributeValue("CLIENT_BANK", boDA.getAttribute("OPEN_BANK").getString());
+				boLFITOut.setAttributeValue("CLIENT_ACCOUNT", boDA.getAttribute("ACCOUNT").getString());
+				boLFITOut.setAttributeValue("CLIENT_ACCNUMBER", boDA.getAttribute("ACC_NUMBER").getString());
 				boLFITOut.setAttributeValue("APPLYPAY_DATE", boLFP.getAttribute("PLAN_DATE").getString());
 				boLFITOut.setAttributeValue("APPLY_PERSON", userId);
 				boLFITOut.setAttributeValue("APPLY_DEPT", orgId);
@@ -225,10 +236,15 @@ public class FundPaymentCar {
 			boEquipAmt.setAttributeValue("PAYMENT_NUMBER", boLFPAMT.getAttribute("PAYMENT_NUMBER").getString());
 			boEquipAmt.setAttributeValue("PLAN_ID", boLFPAMT.getAttribute("ID").getString());
 			boEquipAmt.setAttributeValue("PLAN_LIST", boLFPAMT.getAttribute("PLAN_LIST").getInt());
-			boEquipAmt.setAttributeValue("FACT_OBJECT", boCA.getAttribute("ACCOUNT").getString());
+			/*boEquipAmt.setAttributeValue("FACT_OBJECT", boCA.getAttribute("ACCOUNT").getString());
 			boEquipAmt.setAttributeValue("CLIENT_BANK", boCA.getAttribute("BANK_NAME").getString());
 			boEquipAmt.setAttributeValue("CLIENT_ACCOUNT", boCA.getAttribute("ACCOUNT").getString());
-			boEquipAmt.setAttributeValue("CLIENT_ACCNUMBER", boCA.getAttribute("ACC_NUMBER").getString());
+			boEquipAmt.setAttributeValue("CLIENT_ACCNUMBER", boCA.getAttribute("ACC_NUMBER").getString());*/
+			boEquipAmt.setAttributeValue("FACT_OBJECT", boDA.getAttribute("ACCOUNT").getString());
+			boEquipAmt.setAttributeValue("CLIENT_BANK", boDA.getAttribute("OPEN_BANK").getString());
+			boEquipAmt.setAttributeValue("CLIENT_ACCOUNT", boDA.getAttribute("ACCOUNT").getString());
+			boEquipAmt.setAttributeValue("CLIENT_ACCNUMBER", boDA.getAttribute("ACC_NUMBER").getString());
+			
 			boEquipAmt.setAttributeValue("APPLYPAY_DATE", boLFPAMT.getAttribute("PLAN_DATE").getString());
 			boEquipAmt.setAttributeValue("APPLY_PERSON", userId);
 			boEquipAmt.setAttributeValue("APPLY_DEPT", orgId);