From 10d04b649430ec053606e05db6fc1f4ff968dd98 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Tue, 18 Sep 2018 09:35:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=90=84=E4=B8=AA=E7=A7=9F=E9=87=91=E6=B5=8B?=
 =?UTF-8?q?=E7=AE=97=E8=A1=A8=E9=87=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 34 ++++++++++++++++---------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index d39119cec..cf44f07b8 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -695,6 +695,8 @@
 				<attribute name="ALL_FIRST_PAYMENT" label="综合首付款" type="DOUBLE" length="22" scale="2"/>
 				<attribute name="ALL_FIRST_PAYMENT_RATIO" label="综合首付款比例 " type="DOUBLE" length="22" scale="6"/>
 				<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
+				<attribute name="OTHER_MONEY" label="其他" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="RATE_TYPE" label="利率类型" type="STRING" length="32" />
 				
 			</attributes>
 			<manager>
@@ -981,6 +983,8 @@
 				<attribute name="ALL_FIRST_PAYMENT_RATIO" label="综合首付款比例 " type="DOUBLE" length="22" scale="6"/>
 				<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
 				<attribute name="FACTORY_ACCESSORIES" label="原厂配件费" type="STRING" length="22" scale="2" />
+				<attribute name="OTHER_MONEY" label="其他" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="RATE_TYPE" label="利率类型" type="STRING" length="32" />
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -1307,6 +1311,8 @@
 				<attribute name="ALL_FIRST_PAYMENT" label="综合首付款" type="DOUBLE" length="22" scale="2"/>
 				<attribute name="ALL_FIRST_PAYMENT_RATIO" label="综合首付款比例 " type="DOUBLE" length="22" scale="6"/>
 				<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
+				<attribute name="OTHER_MONEY" label="其他" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="RATE_TYPE" label="利率类型" type="STRING" length="32" />
 				
 			</attributes>
 			<manager>
@@ -2548,6 +2554,8 @@
 				<attribute name="ALL_FIRST_PAYMENT" label="综合首付款" type="DOUBLE" length="22" scale="2"/>
 				<attribute name="ALL_FIRST_PAYMENT_RATIO" label="综合首付款比例 " type="DOUBLE" length="22" scale="6"/>
 				<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
+				<attribute name="OTHER_MONEY" label="其他" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="RATE_TYPE" label="利率类型" type="STRING" length="32" />
 				
 			</attributes>
 			<manager>
@@ -2744,6 +2752,8 @@
 				<attribute name="ALL_FIRST_PAYMENT" label="综合首付款" type="DOUBLE" length="22" scale="2"/>
 				<attribute name="ALL_FIRST_PAYMENT_RATIO" label="综合首付款比例 " type="DOUBLE" length="22" scale="6"/>
 				<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
+				<attribute name="OTHER_MONEY" label="其他" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="RATE_TYPE" label="利率类型" type="STRING" length="32" />
 				
 			</attributes>
 			<manager>
@@ -3111,7 +3121,7 @@
 				<attribute name="ALL_FIRST_PAYMENT_RATIO" label="综合首付款比例 " type="DOUBLE" length="22" scale="6"/>
 				<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
 				<attribute name="OTHER_MONEY" label="其他" type="DOUBLE" length="22" scale="2"/>
-				<attribute name="RATE_TYPE" label="利率类型" type="STRING" length="32"/>
+				<attribute name="RATE_TYPE" label="利率类型" type="STRING" length="32" />
 				
 			</attributes>
 			<manager>
@@ -3701,23 +3711,23 @@
 					<property name="createKey" value="true" />
 				</managerProperties>
 			</manager>
-		</class>
-		<class name="VI_CONTRACT_OVERDUE" label="" keyAttributes="contract_id">
-			<attributes>
+		</class>
+		<class name="VI_CONTRACT_OVERDUE" label="" keyAttributes="contract_id">
+			<attributes>
 				<attribute name="contract_id" label="合同id" type="STRING"/>
 				<attribute name="contract_number" label="合同编号" type="STRING"/>
 				<attribute name="CONTRACT_STATUS" label="合同状态" type="STRING"/>
 				<attribute name="over_list" label="逾期期数" type="STRING"/>
 				<attribute name="over_days" label="逾期天数" type="STRING"/>
 				<attribute name="over_money" label="逾期金额" type="STRING"/>
-				<attribute name="over_penalty" label="逾期罚息" type="STRING"/>
-			</attributes>
-			<manager>
-				<managerProperties>
-					<property name="table" value="vi_contract_overdue" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager>
+				<attribute name="over_penalty" label="逾期罚息" type="STRING"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="vi_contract_overdue" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
 		</class>
 	</package>
 </jbo>