From c18e0e993551631dec6b4bdba825bc32333eff93 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Thu, 9 Aug 2018 19:53:04 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9C=AC=E6=96=B9=E8=B4=A6=E6=88=B7=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=92=E6=96=A5=E3=80=82=202.=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E6=98=8E=E7=BB=86=E5=90=88=E5=90=8C=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=93=BE=E6=8E=A5=E3=80=82=203.=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E9=85=8D=E7=BD=AEGPS=E5=AE=89=E8=A3=85=E9=85=8D?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=91=E9=A2=9D=E9=99=90=E5=AE=9A=E5=92=8C?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=AA=E8=AF=BB=E3=80=82=204.jbo=5Flease.x?=
 =?UTF-8?q?ml=E4=B8=AD=E5=90=88=E5=90=8C=E6=AD=A3=E5=BC=8F/=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6/=E5=8E=86=E5=8F=B2=E8=A1=A8=E6=B7=BB=E5=8A=A0LENDING?=
 =?UTF-8?q?=5FTYPE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OwnConfig/BOwnAccount/BOwnAccount.jsp     | 15 ++++++-
 .../ActualPaymentCarTempList.jsp              |  4 +-
 .../etc/app/component/component-config.xml    |  2 +-
 WebContent/WEB-INF/etc/jbo/jbo_lease.xml      |  6 +++
 .../reckon/copydata/CalcRentCompare.java      | 44 +++++++++++++++++++
 5 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
index 7b7ea5305..1c2095dce 100644
--- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
+++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
@@ -68,8 +68,19 @@
 <%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info06;Describe=定义按钮事件-;]~*/%>
 <script type="text/javascript">
 /*~[Describe=保存记录;InputParam=无;OutPutParam=无;]~*/
-	function saveRecord(){	 	
-		as_save("myiframe0","parent.AsDialog.ClosePage()");
+	function saveRecord(){
+	debugger;
+		var accountType = getItemValue(0, 0, "account_type");
+		var accType = getItemValue(0, 0, "acc_type");
+		var state = getItemValue(0, 0, "state_");
+		var FbSdk = getItemValue(0,0,"FbSdk");
+		var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk;
+		var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams );
+		if(sReturn=="null"||(sReturn=="notNull"&&state!="0010")||(sReturn=="notNull"&&state=="0010"&&FbSdk!="Y")){
+			as_save("myiframe0","parent.AsDialog.ClosePage()");
+		}else{
+			alert("启用状态下的账户账号类型已存在，请检查！");
+		} 
 	}
 	
 	//请选择出租人
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp
index 8d5107430..785cb0ed1 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp
@@ -105,7 +105,7 @@
 		setColRequired();
 	})
 	function afterSearch(){
-		var rows = getRowCount(0);
+		/* var rows = getRowCount(0);
 		for(var i=0;i<rows;i++){
 			var CONTRACT_ID = getItemValue(0,i,"CONTRACT_ID");
 			var result = RunJavaMethodTrans("com.tenwa.flow.fund.fundcollection.FundIncomeMethod","getContactId","CONTRACT_ID="+CONTRACT_ID);
@@ -114,7 +114,7 @@
 			sPars=result.split("@"); //字符分割 
 			sRun = "<a style='color:blue;font-size:15px;font-family:宋体;' onclick='opeTrigger("+ps+")'>" +sPars[1]+ "</a>";
 			getObj(0,i,"CONTRACT_ID").innerHTML = sRun;
-		}		
+		}	 */	
 	}
 	function createFundIncomeExcel(){
 		var rows = getCheckedRows(0);
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index 199396fa0..5bd437301 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -1097,7 +1097,7 @@
 	
 	<Component FORMAT="1" ID="DISCOUNT" NAME="贴息" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="单台金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="总贴息金额" PARAMETERID="DISCOUNT_ALL" PARAMETERNAME="总贴息金额" PRIGHTTYPE="All"/></Parameters></Component>
 	<Component FORMAT="1" ID="PURCHASE_TAX" 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="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="首付款比例" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="首付款比例" PRIGHTTYPE="None"/></Parameters></Component>
-	<Component FORMAT="1" ID="VEHICLE_TAX" NAME="车船税" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="GPS_FEE" NAME="GPS安装服务费" 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="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="首付款比例" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="首付款比例" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否只读" PARAMETERID="RentMonthReadOnly" PARAMETERNAME="是否只读" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="TABLEWARE_FEE" 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="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="首付款比例" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="首付款比例" PRIGHTTYPE="None"/></Parameters></Component><Component FORMAT="1" ID="MAINTAIN_FEE" NAME="保养费" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="INSURANCE_PREMIUM" 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="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="首付款比例" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="首付款比例" PRIGHTTYPE="None"/></Parameters></Component>
+	<Component FORMAT="1" ID="VEHICLE_TAX" NAME="车船税" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="GPS_FEE" NAME="GPS安装服务费" 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="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="首付款比例" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="首付款比例" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否只读" PARAMETERID="RentMonthReadOnly" PARAMETERNAME="是否只读" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="TABLEWARE_FEE" 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="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="首付款比例" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="首付款比例" PRIGHTTYPE="None"/></Parameters></Component><Component FORMAT="1" ID="MAINTAIN_FEE" NAME="保养费" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="INSURANCE_PREMIUM" 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="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="首付款比例" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="首付款比例" PRIGHTTYPE="None"/></Parameters></Component>
 	<Component FORMAT="1" ID="telephone_home_visit" NAME="电核家访" STATUS="1" TYPE="PRD0382"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="电核家访" PARAMETERID="TelephoneHomeVisit" PARAMETERNAME="电核家访" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="investment_rate" NAME="光大出资比例" STATUS="1" TYPE="PRD0384"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="光大出资比例" PARAMETERID="InvestmentRate" PARAMETERNAME="光大出资比例" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="Interest_days" NAME="计息基础" STATUS="1" TYPE="PRD0383"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="计息基础" PARAMETERID="InterestDays" PARAMETERNAME="计息基础" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="Invoice_processing" NAME="开票处理" STATUS="2" TYPE="PRD0381"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="税率" PARAMETERID="TaxRate" PARAMETERNAME="税率" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="开票时点" PARAMETERID="BillingPoint" PARAMETERNAME="开票时点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否足期开票" PARAMETERID="PeriodInvoice" PARAMETERNAME="是否足期开票" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="提前开票天数" PARAMETERID="AdvanceInvoicing" PARAMETERNAME="提前开票天数" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="Residual_value_limit" NAME="残值限定" STATUS="2" TYPE="PRD0380"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="读写方式" PARAMETERID="ReadWriteMode" PARAMETERNAME="读写方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="默认值" PARAMETERID="DefaultValue" PARAMETERNAME="默认值" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="残值比例限定" PARAMETERID="EndValueRatio" PARAMETERNAME="残值比例限定" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="残值输入方式" PARAMETERID="InputType" PARAMETERNAME="残值输入方式" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="Residual_method" NAME="残值处理方式" STATUS="1" TYPE="PRD0380"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="残值处理方式" PARAMETERID="ResidualMethod" PARAMETERNAME="残值处理方式" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="PayDisparity" NAME="是否差额放款" STATUS="1" TYPE="PRD0385"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否差额放款" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ChannelGuarantee" NAME="渠道方担保" STATUS="1" TYPE="PRD0386"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="担保人名称" PARAMETERID="GuaranteeName" PARAMETERNAME="担保人名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="担保人电话" PARAMETERID="GuaranteePhone" PARAMETERNAME="担保人电话" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="担保人地址" PARAMETERID="GuaranteeAddress" PARAMETERNAME="担保人地址" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="担保人证件号" PARAMETERID="GuaranteeNumber" PARAMETERNAME="担保人证件号" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="法定代表人" PARAMETERID="GuaranteeLegalName" PARAMETERNAME="法定代表人" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="担保类型" PARAMETERID="GuaranteeType" PARAMETERNAME="担保类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="关系" PARAMETERID="Relationship" PARAMETERNAME="关系" PRIGHTTYPE="Required"/></Parameters></Component>
 	<Component FORMAT="1" ID="CHANNEL_CAUTION_MONEY" NAME="渠道风险抵押金" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Hide"/><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="SigningAddress" NAME="签约地点" STATUS="1" TYPE="PRD0386"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="签约地点" PARAMETERID="SigningAddress" PARAMETERNAME="签约地点" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="MoneyLimits" NAME="融资额上下限" STATUS="1" TYPE="PRD0350"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="融资额下限" PARAMETERID="MoneyLowLimits" PARAMETERNAME="融资额下限" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="融资额上限" PARAMETERID="EquipUplimpits" PARAMETERNAME="融资额上限" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="贷款比例上限" PARAMETERID="MoneyUpLimits" PARAMETERNAME="贷款比例上限" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="GuarantorPeople" NAME="保证人" STATUS="1" TYPE="PRD0386"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="保证人名称" PARAMETERID="GuarantorName" PARAMETERNAME="保证人名称" PRIGHTTYPE="Required"/></Parameters></Component>
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 007478a5a..0e83bad69 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -715,6 +715,7 @@
 				<attribute name="BUSINESSTYPE" label="涓氬姟绫诲瀷" type="STRING" length="64"/>
 				<attribute name="AREA_CODE" label="杞︾墝鍙峰搴旀墍鍦ㄥ尯鍙�" type="STRING" length="32"/>
 				<attribute name="CAR_TYPE" label="杞﹁締绫诲瀷" type="STRING" length="64"/>
+				<attribute name="LENDING_TYPE" label="淇濆崟鏀炬鏂规硶" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -951,6 +952,7 @@
 				<attribute name="BUSINESSTYPE" label="涓氬姟绫诲瀷" type="STRING" length="64"/>
 				<attribute name="AREA_CODE" label="杞︾墝鍙峰搴旀墍鍦ㄥ尯鍙�" type="STRING" length="32"/>
 				<attribute name="CAR_TYPE" label="杞﹁締绫诲瀷" type="STRING" length="64"/>
+				<attribute name="LENDING_TYPE" label="淇濆崟鏀炬鏂规硶" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -2596,6 +2598,10 @@
 				<attribute name="CONTRACT_INVOICE_STATUS" label="鍚堝悓寮�绁ㄧ姸鎬�" type="STRING" length="32"/>
 				<attribute name="VERSIONID" label="鐗堟湰鍙�" type="STRING" length="64"/>
 				<attribute name="distributor_id" label="distributor_id" type="STRING" length="32"/>
+				<attribute name="BUSINESSTYPE" label="涓氬姟绫诲瀷" type="STRING" length="64"/>
+				<attribute name="AREA_CODE" label="杞︾墝鍙峰搴旀墍鍦ㄥ尯鍙�" type="STRING" length="32"/>
+				<attribute name="CAR_TYPE" label="杞﹁締绫诲瀷" type="STRING" length="64"/>
+				<attribute name="LENDING_TYPE" label="淇濆崟鏀炬鏂规硶" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java
index d36a717dc..3d8bb8e49 100644
--- a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java
+++ b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java
@@ -1,9 +1,19 @@
 package com.tenwa.reckon.copydata;
 
+import jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT;
+
 import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
 import com.tenwa.comm.util.jboutil.BizObjectCompare;
 
 public class CalcRentCompare implements BizObjectCompare{
+	private String accountType;
+	private String accType;
+	private String state;
+	private String FbSdk;
+
 
 	@Override
 	public boolean ObjectCompare(BizObject cObject, BizObject toObject)
@@ -13,5 +23,39 @@ public class CalcRentCompare implements BizObjectCompare{
 		}
 		return false;
 	}
+	
+	public String getAccountType() {
+		return accountType;
+	}
+	public void setAccountType(String accountType) {
+		this.accountType = accountType;
+	}
+	public String getAccType() {
+		return accType;
+	}
+	public void setAccType(String accType) {
+		this.accType = accType;
+	}
+	public String getState() {
+		return state;
+	}
+	public void setState(String state) {
+		this.state = state;
+	}
+	public String getFbSdk() {
+		return FbSdk;
+	}
+	public void setFbSdk(String fbSdk) {
+		FbSdk = fbSdk;
+	}
+	public String compare(JBOTransaction tx) throws JBOException{
+		String sql ="select * from O where O.state_='0010' and O.ACC_TYPE=:accType and ACCOUNT_TYPE=:accountType and FbSdk='Y'";
+		BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql)
+				.setParameter("accType", accType).setParameter("accountType", accountType).getSingleResult(false);
+		if(bo==null||"".equals(bo)){
+			return "null";
+		}
+		return "notNull";
+	}
 
 }