From e4bcbfad51161f562ee38bc3935f973e7601335b Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Fri, 20 Jul 2018 09:53:24 +0800
Subject: [PATCH 01/19] =?UTF-8?q?1.=E6=9B=B4=E6=94=B9=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E6=B5=81=E7=A8=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Fund/ActualPayment/ActualPaymentTempList.jsp     |  6 +++++-
 .../ActualPaymentTempListBySubtotal1.jsp             | 12 ++++++++----
 .../Rent/CautionMoneyDeduction/ContractInfoPay.jsp   |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp
index 72f5b79db..969d17753 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp
@@ -26,7 +26,7 @@
 	dwTemp.MultiSelect = true;
 	dwTemp.ReadOnly = "0";
 	dwTemp.ShowSummary = "1";
-	if("0030".equals(phaseNo)){
+	if(!"0020".equals(phaseNo)){
 		rightType = "ReadOnly";
 		dwTemp.ReadOnly = "1";
 	}
@@ -92,6 +92,10 @@
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
 	$(function(){
+		var phaseNo="<%=phaseNo%>";
+		 if("0020"==phaseNo){
+			setItemValue(0,0,"ACCOUNTING_DATE",new Date().format("yyyy/MM/dd"));
+		} 
 		setdefaultBank();
 		setColRequired();
 	})
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
index d4b846095..f2e0bb063 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
@@ -6,7 +6,7 @@
         History Log: 
     */
     String phaseNo = CurPage.getParameter("PhaseNo");
-	String rightType = CurComp.getParameter("RightType");
+	String rightType = CurPage.getParameter("RightType");
     String flowunid = CurPage.getParameter("FlowUnid");
     String ishistory = CurPage.getParameter("IsHistory");
 	ASObjectModel doTemp = new ASObjectModel("LC_FUND_INCOME_TEMP_HXM");
@@ -18,7 +18,7 @@
 	dwTemp.MultiSelect = true;
 	dwTemp.ReadOnly = "0";
 	dwTemp.ShowSummary = "1";
-	if("0030".equals(phaseNo)){
+	if("0010".equals(phaseNo)){
 		rightType = "ReadOnly";
 		dwTemp.ReadOnly = "1";
 	}
@@ -35,14 +35,18 @@
 	if("ReadOnly".equals(rightType)){
 		sButtons = new String[][]{
 			};
-	}else{
+	}else if("0020".equals(phaseNo)){
 		sButtons = new String[][]{
 				{"true","","Button","发起付款申请","保存","cmb_tp_pay()","","","","btn_icon_save",""},
-				{"true","","Button","付款结果回盘","付款结果回盘","cmb_tp_callback()","","","","btn_icon_delete",""}
 			};
+	}else if("0030".equals(phaseNo)){
+		sButtons = new String[][]{
+				{"true","","Button","付款结果回盘","付款结果回盘","cmb_tp_callback()","","","","btn_icon_delete",""},	
+		};
 	}
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
+
 function cmb_tp_pay(){
 	 var plist = getItemValueArray(0,"distributor_no")+"";
 	 if(typeof(plist)=="undefined" || plist.length==0 ){
diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
index adebbd27f..385c26372 100644
--- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
@@ -15,7 +15,7 @@
 	} */
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";
-//	dwTemp.ReadOnly = "0";
+	dwTemp.ReadOnly = "1";
 	dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid"));
 	
 	String sButtons[][] = {

From 9cdcb29810dead7d3b594484e6fbfe1277492bb1 Mon Sep 17 00:00:00 2001
From: liuz <liuz@DESKTOP-BF9USEF>
Date: Fri, 20 Jul 2018 10:14:24 +0800
Subject: [PATCH 02/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=AD=A3=E5=BC=8F=EF=BC=8C=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=86=E5=8F=B2=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_customer.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index afe8dc460..7f95665de 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -265,6 +265,7 @@
 				<attribute name="sposition" label="鑱屼綅" type="STRING" length="32" />
 				<attribute name="spnumber" label="鎵嬫満鍙�" type="STRING" length="32" />
 				<attribute name="smincome" label="鏈堟敹鍏�" type="DOUBLE" length="22" scale="2" />
+				<attribute name="e_mail" label="鐢靛瓙閭" type="STRING" length="32" />
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -399,6 +400,7 @@
 				<attribute name="sposition" label="鑱屼綅" type="STRING" length="32" />
 				<attribute name="spnumber" label="鎵嬫満鍙�" type="STRING" length="32" />
 				<attribute name="smincome" label="鏈堟敹鍏�" type="DOUBLE" length="22" scale="2" />
+				<attribute name="e_mail" label="鐢靛瓙閭" type="STRING" length="32" />
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -2333,7 +2335,8 @@
 				<attribute name="suphone" label="鍗曚綅鐢佃瘽-閰嶅伓" type="STRING" length="32"/>
 				<attribute name="sposition" label="鑱屼綅鈥旈厤鍋�" type="STRING" length="32"/>
 				<attribute name="spnumber" label="鎵嬫満鍙封�斺�旈厤鍋�" type="STRING" length="32"/>
-				<attribute name="smincome" label="鏈堟敹鍏モ�斺�旈厤鍋�" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="smincome" label="鏈堟敹鍏モ�斺�旈厤鍋�" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="e_mail" label="鐢靛瓙閭" type="STRING" length="32" />
 			</attributes>
 			<manager>
 				<managerProperties>

From a741644e09b3928e1513c94c94c28d0213f2e806 Mon Sep 17 00:00:00 2001
From: jianghongdong <jianghd@tenwa.com.cn>
Date: Fri, 20 Jul 2018 10:22:48 +0800
Subject: [PATCH 03/19] =?UTF-8?q?234=5F=E4=BF=9D=E8=AF=81=E9=87=91?=
 =?UTF-8?q?=E6=8A=B5=E6=89=A3=E7=94=B3=E8=AF=B7=E5=8F=AA=E8=83=BD=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=9C=80=E5=90=8E=E4=B8=80=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CautionMoneyDeduction/VILCRentPlanForDeductionList.jsp    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/VILCRentPlanForDeductionList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/VILCRentPlanForDeductionList.jsp
index 27a6e30a7..de6fa0a53 100644
--- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/VILCRentPlanForDeductionList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/VILCRentPlanForDeductionList.jsp
@@ -8,9 +8,13 @@
 	String phaseNo = CurPage.getParameter("PhaseNo");
 	String flowunid = CurPage.getParameter("FlowUnid");
 	String rightType = CurPage.getParameter("RightType");
+	String FlowNo = CurPage.getParameter("FlowNo");
 	String paymentNumber = JBOFactory.createBizObjectQuery(FLOW_BUSSINESS_OBJECT.CLASS_NAME, "flow_unid=:flowunid")
 							.setParameter("flowunid", flowunid).getSingleResult(false).getAttribute("flow_key").getString();
 	ASObjectModel doTemp = new ASObjectModel("VILCRentPlanForDeductionList");
+	if("CautionMoneyDeductionFlow".equals(FlowNo)){
+		doTemp.appendJboWhere(" and O.plan_list =(select max(pl.plan_list) from jbo.app.tenwa.calc.VI_LC_RENT_PLAN pl WHERE pl.payment_number ='"+paymentNumber+"' AND (pl.rent_over > 0 OR pl.penalty_over > 0 ))");
+	}
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	dwTemp.Style="1";      	     //--设置为Grid风格--
 	dwTemp.ReadOnly = "1";	 //只读模式

From 1bb1ed4e076de102b4fe2f132a0f977e4d9da94c Mon Sep 17 00:00:00 2001
From: liuz <liuz@DESKTOP-BF9USEF>
Date: Fri, 20 Jul 2018 10:57:15 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=A2=9E=E5=8A=A0=E5=9B=9B=E5=BC=A0=E6=96=B0=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_customer.xml | 85 +++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index 7f95665de..bdb9462b6 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -2680,5 +2680,90 @@
 			</manager>
 		</class>
 		
+		<class name="LB_CARDATA_COMMERCIAL_BRAND" label="" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="鏍囪瘑缂栧彿" type="STRING" length="32"/>
+				<attribute name="brand_id" label="鍝佺墝ID" type="STRING" length="100"/>
+				<attribute name="brand_name" label="鍝佺墝鍚嶇О" type="STRING" length="100"/>
+				<attribute name="brand_initial" label="鍝佺墝棣栧瓧姣�" type="STRING" length="100"/>
+				<attribute name="initialversion" label="鍒濆鐗堟湰鍙�" type="STRING" length="100"/>
+				<attribute name="inputuserid" label="鐧昏浜�" type="STRING" length="100"/>
+				<attribute name="inputorgid" label="鐧昏閮ㄩ棬" type="STRING" length="100"/>
+				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="100"/>
+				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="100"/>
+				<attribute name="updateorgid" label="鏇存柊閮ㄩ棬" type="STRING" length="100"/>
+				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="100"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_cardata_commercial_brand" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+		<class name="LB_CARDATA_COMMERCIAL_MODEL" label="" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="鏍囪瘑缂栧彿" type="STRING" length="32"/>
+				<attribute name="model_id" label="杞﹀瀷缂栧彿" type="STRING" length="100"/>
+				<attribute name="model_name" label="杞﹀瀷鍚嶇О" type="STRING" length="100"/>
+				<attribute name="series_id" label="杞︾郴缂栧彿" type="STRING" length="100"/>
+				<attribute name="series_name" label="杞︾郴鍚嶇О" type="STRING" length="100"/>
+				<attribute name="brand_id" label="鍝佺墝缂栧彿" type="STRING" length="100"/>
+				<attribute name="brand_name" label="鍝佺墝鍚嶇О" type="STRING" length="100"/>
+				<attribute name="price" label="鏂拌溅鎸囧浠�" type="STRING" length="100"/>
+				<attribute name="liter" label="鎺掗噺" type="STRING" length="100"/>
+				<attribute name="vehicle_type" label="杞﹁締绫诲瀷" type="STRING" length="100"/>
+				<attribute name="level" label="绾у埆" type="STRING" length="100"/>
+				<attribute name="initialversion" label="鍒濆鐗堟湰鍙�" type="STRING" length="100"/>
+				<attribute name="inputuserid" label="鐧昏浜�" type="STRING" length="100"/>
+				<attribute name="inputorgid" label="鐧昏閮ㄩ棬" type="STRING" length="100"/>
+				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="100"/>
+				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="100"/>
+				<attribute name="updateorgid" label="鏇存柊閮ㄩ棬" type="STRING" length="100"/>
+				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="100"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_cardata_commercial_model" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+		<class name="LB_CARDATA_COMMERCIAL_SERIES" label="" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="鏍囪瘑缂栧彿" type="STRING" length="32"/>
+				<attribute name="series_id" label="杞︾郴缂栧彿" type="STRING" length="100"/>
+				<attribute name="series_name" label="杞︾郴鍚嶇О" type="STRING" length="100"/>
+				<attribute name="brand_id" label="鍝佺墝缂栧彿" type="STRING" length="100"/>
+				<attribute name="brand_name" label="鍝佺墝鍚嶇О" type="STRING" length="100"/>
+				<attribute name="car_type" label="杞﹁締绫诲瀷" type="STRING" length="100"/>
+				<attribute name="initialversion" label="鍒濆鐗堟湰鍙�" type="STRING" length="100"/>
+				<attribute name="inputuserid" label="鐧昏浜�" type="STRING" length="100"/>
+				<attribute name="inputorgid" label="鐧昏閮ㄩ棬" type="STRING" length="100"/>
+				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="100"/>
+				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="100"/>
+				<attribute name="updateorgid" label="鏇存柊閮ㄩ棬" type="STRING" length="100"/>
+				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="100"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_cardata_commercial_series" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+		<class name="LB_CARDATA_COMMERCIAL_VERSION" label="" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="ID" type="STRING" length="32"/>
+				<attribute name="initialversion" label="鍒濆鐗堟湰鍙�" type="STRING" length="100"/>
+				<attribute name="currentversion" label="褰撳墠鐗堟湰鍙�" type="STRING" length="100"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_cardata_commercial_version" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 	</package>
 </jbo>

From 15e120317fc1275469d6318236e4533b1cbf4ff7 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Fri, 20 Jul 2018 13:04:19 +0800
Subject: [PATCH 05/19] =?UTF-8?q?1.=E6=9B=B4=E6=94=B9=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp     | 2 +-
 WebContent/WEB-INF/etc/app/component/component-config.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp
index 969d17753..402f5c5a4 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempList.jsp
@@ -85,7 +85,7 @@
 			};
 	}else{
 		sButtons = new String[][]{
-				{"true","","Button","确认信息","确认信息","as_save(0,'setColRequired()')","","","","btn_icon_save",""},
+				{"true","","Button","保存","确认信息","as_save(0,'setColRequired()')","","","","btn_icon_save",""},
 				{"true","","Button","批量修改","批量修改","batchModify()","","","","btn_icon_delete",""}
 			};
 	}
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index 9dc6a3f8b..11c688595 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -1085,7 +1085,7 @@
 	
 	<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>
-	<Component FORMAT="1" ID="even_rent_day" NAME="等额租金按日计息" STATUS="2" TYPE="PRD0301"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="默认还款日" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="默认还款周期" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="指定周期(月)" PARAMETERID="PayFrequency" PARAMETERNAME="指定周期" PRIGHTTYPE="All"/></Parameters></Component><Component FORMAT="1" ID="OVER_INCOME" NAME="是否允许超期核销" STATUS="2" TYPE="PRD0307"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否允许超期核销" PARAMETERID="over_income" PARAMETERNAME="是否允许超期核销" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="PenaltyRule" NAME="罚息特殊处理规则" STATUS="2" TYPE="PRD0307"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="罚息特殊处理规则" PARAMETERID="PenaltyRule" PARAMETERNAME="罚息特殊处理规则" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ADJUST_INTEREST" NAME="调息" STATUS="1" TYPE="PRD0320"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="是否调息" PARAMETERID="ISADJUST_INTEREST" PARAMETERNAME="是否调息" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="调息计算方式" PARAMETERID="rate_float_type" PARAMETERNAME="调息计算方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="调息生效节点" PARAMETERID="adjust_style" PARAMETERNAME="调息生效节点" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ISSUBSECTION" NAME="是否支持分段" STATUS="1" TYPE="PRD0321"><Parameters/></Component><Component FORMAT="1" ID="FIRSTRENT_DAY" NAME="是否首期按日计息" STATUS="1" TYPE="PRD0322"/><Component FORMAT="1" ID="LASTRENT_DAY" NAME="是否末期按日计息" STATUS="1" TYPE="PRD0322"/><Component FORMAT="1" ID="RentRound" NAME="租金圆整" STATUS="1" TYPE="PRD0323"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="租金圆整" PARAMETERID="RentRound" PARAMETERNAME="租金圆整" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="租金圆整方式" PARAMETERID="RentRoundType" PARAMETERNAME="租金圆整方式" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="DocList" NAME="流程、资料清单类别、资料清单" STATUS="1" TYPE="PRD0412"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="类型" PARAMETERID="TYPE" PARAMETERNAME="类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="All"/></Parameters><ChildrenComponents><ChildrenComponent FORMAT="2" ID="资料组件配置" NAME="DOC_GROUP_CONFIG" STATUS="1" TYPE="PRD0412"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="序号" PARAMETERID="POSITION" PARAMETERNAME="序号" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="主体类型" PARAMETERID="MainType" PARAMETERNAME="主体类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></ChildrenComponent></ChildrenComponents></Component><Component FORMAT="2" ID="DOC_GROUP_CONFIG" NAME="资料组合配置" STATUS="1" TYPE="PRD0413"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="序号" PARAMETERID="POSITION" PARAMETERNAME="序号" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="主体类型" PARAMETERID="MainType" PARAMETERNAME="主体类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="FlowAccessory" NAME="流程附件" STATUS="1" TYPE="PRD0414"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="AssessmentReport" NAME="流程、评分模型" STATUS="1" TYPE="PRD0415"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="评估报告" PARAMETERID="AssessReport" PARAMETERNAME="评估报告" PRIGHTTYPE="Required"/></Parameters></Component>
+	<Component FORMAT="1" ID="even_rent_day" NAME="等额租金按日计息" STATUS="2" TYPE="PRD0301"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="默认还款日" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="默认还款周期" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="指定周期(月)" PARAMETERID="PayFrequency" PARAMETERNAME="指定周期" PRIGHTTYPE="All"/></Parameters></Component><Component FORMAT="1" ID="OVER_INCOME" NAME="是否允许超期核销" STATUS="2" TYPE="PRD0307"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否允许超期核销" PARAMETERID="over_income" PARAMETERNAME="是否允许超期核销" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="PenaltyRule" NAME="罚息特殊处理规则" STATUS="2" TYPE="PRD0307"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="罚息特殊处理规则" PARAMETERID="PenaltyRule" PARAMETERNAME="罚息特殊处理规则" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ADJUST_INTEREST" NAME="利率类型" STATUS="1" TYPE="PRD0320"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="利率类型" PARAMETERID="ISADJUST_INTEREST" PARAMETERNAME="是否调息" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="调息计算方式" PARAMETERID="rate_float_type" PARAMETERNAME="调息计算方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="调息生效节点" PARAMETERID="adjust_style" PARAMETERNAME="调息生效节点" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ISSUBSECTION" NAME="是否支持分段" STATUS="1" TYPE="PRD0321"><Parameters/></Component><Component FORMAT="1" ID="FIRSTRENT_DAY" NAME="是否首期按日计息" STATUS="1" TYPE="PRD0322"/><Component FORMAT="1" ID="LASTRENT_DAY" NAME="是否末期按日计息" STATUS="1" TYPE="PRD0322"/><Component FORMAT="1" ID="RentRound" NAME="租金圆整" STATUS="1" TYPE="PRD0323"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="租金圆整" PARAMETERID="RentRound" PARAMETERNAME="租金圆整" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="租金圆整方式" PARAMETERID="RentRoundType" PARAMETERNAME="租金圆整方式" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="DocList" NAME="流程、资料清单类别、资料清单" STATUS="1" TYPE="PRD0412"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="类型" PARAMETERID="TYPE" PARAMETERNAME="类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="All"/></Parameters><ChildrenComponents><ChildrenComponent FORMAT="2" ID="资料组件配置" NAME="DOC_GROUP_CONFIG" STATUS="1" TYPE="PRD0412"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="序号" PARAMETERID="POSITION" PARAMETERNAME="序号" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="主体类型" PARAMETERID="MainType" PARAMETERNAME="主体类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></ChildrenComponent></ChildrenComponents></Component><Component FORMAT="2" ID="DOC_GROUP_CONFIG" NAME="资料组合配置" STATUS="1" TYPE="PRD0413"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="序号" PARAMETERID="POSITION" PARAMETERNAME="序号" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="主体类型" PARAMETERID="MainType" PARAMETERNAME="主体类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="FlowAccessory" NAME="流程附件" STATUS="1" TYPE="PRD0414"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="AssessmentReport" NAME="流程、评分模型" STATUS="1" TYPE="PRD0415"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="评估报告" PARAMETERID="AssessReport" PARAMETERNAME="评估报告" PRIGHTTYPE="Required"/></Parameters></Component>
 	<Component FORMAT="1" ID="PENALTY_RATE_DAY" NAME="罚息日利率" STATUS="1" TYPE="PRD0308">
 		<Parameters>
 			<Parameter ARIGHTTYPE="Required" DISPLAYNAME="罚息日利率%%" PARAMETERID="PENALTY_RATE_DAY" PARAMETERNAME="罚息日利率" PRIGHTTYPE="Required"/>

From f330ad47f1082e3da79f3145beec977538d06599 Mon Sep 17 00:00:00 2001
From: liuz <liuz@DESKTOP-BF9USEF>
Date: Fri, 20 Jul 2018 14:00:29 +0800
Subject: [PATCH 06/19] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=A1=A8=E5=8A=A0=E6=80=BB=E9=A2=9D=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_customer.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index bdb9462b6..5a600b3c1 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -1013,6 +1013,7 @@
 				<attribute name="ORGID" label="閮ㄩ棬缂栧彿" type="STRING" length="32"/>
 				<attribute name="PROVINCES" label="鐪佷唤" type="STRING" length="32"/>
 				<attribute name="DISTRIBUTOR_CODING" label="缁忛攢鍟嗙紪鍙�" type="STRING" length="32"/>
+				<attribute name="TOTAL" label="鎬婚" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -1304,6 +1305,7 @@
 				<attribute name="ORGID" label="閮ㄩ棬缂栧彿" type="STRING" length="32"/>
 				<attribute name="PROVINCES" label="鐪佷唤" type="STRING" length="32"/>
 				<attribute name="DISTRIBUTOR_CODING" label="缁忛攢鍟嗙紪鐮�" type="STRING" length="32"/>
+				<attribute name="TOTAL" label="鎬婚" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>

From 91c7c9bb61cca84b402b2b4325dd5e6c9b48ee19 Mon Sep 17 00:00:00 2001
From: zhouyahui <zhouyh@mail2.tenwa.com.cn>
Date: Fri, 20 Jul 2018 14:02:42 +0800
Subject: [PATCH 07/19] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=86=85=E7=BD=AE=E6=8C=89=E9=92=AE=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributorApproval/LDistributorInfo.jsp              | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp
index 253d05571..73c4e5113 100644
--- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp
+++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp
@@ -19,11 +19,15 @@
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	doTemp.setDefaultValue("FLOWUNID", sFlowUnid);
 	doTemp.setDefaultValue("DISTRIBUTOR_NO", DISTRIBUTOR_NO);
-	
-	if("0020".equals(PhaseNo)){
+	if("ReadOnly".equals(RightType)){
 		doTemp.setRequired("RETAIL_OPEN_DATE",true);//(0, "RETAIL_OPEN_DATE", true);
 		doTemp.setReadOnly("",true);//先把页面所有字段设为只读状态
 		doTemp.setReadOnly("RETAIL_OPEN_DATE",false);//唯独把这个字段设为必填
+		doTemp.setReadOnly("RETAIL_OPEN_DATE",false);//唯独把这个字段设为必填
+		doTemp.setReadOnly("PROVINCES",true);//省份只读
+		doTemp.setReadOnly("SUBSIDIARY_COMPANY",true);//所属母公司
+		doTemp.setColInnerBtEvent("PROVINCES,SUBSIDIARY_COMPANY,DISTRIBUTOR_ADDRESSNAME", "");
+
 // 		dwTemp.getDataObject().set.setReadOnly("RETAIL_OPEN_DATE", false);
 // 		dwTemp.getDataObject().setRequired("RETAIL_OPEN_DATE", true);
 	}

From 6098479deb4c89618a32e7dd3cf8827101a4b906 Mon Sep 17 00:00:00 2001
From: liuz <liuz@DESKTOP-BF9USEF>
Date: Fri, 20 Jul 2018 14:11:09 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_customer.xml | 165 ++++++++++----------
 1 file changed, 84 insertions(+), 81 deletions(-)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index 5a600b3c1..d1bf1a8ac 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -2682,90 +2682,93 @@
 			</manager>
 		</class>
 		
-		<class name="LB_CARDATA_COMMERCIAL_BRAND" label="" keyAttributes="ID">
-			<attributes>
-				<attribute name="ID" label="鏍囪瘑缂栧彿" type="STRING" length="32"/>
-				<attribute name="brand_id" label="鍝佺墝ID" type="STRING" length="100"/>
-				<attribute name="brand_name" label="鍝佺墝鍚嶇О" type="STRING" length="100"/>
-				<attribute name="brand_initial" label="鍝佺墝棣栧瓧姣�" type="STRING" length="100"/>
-				<attribute name="initialversion" label="鍒濆鐗堟湰鍙�" type="STRING" length="100"/>
-				<attribute name="inputuserid" label="鐧昏浜�" type="STRING" length="100"/>
-				<attribute name="inputorgid" label="鐧昏閮ㄩ棬" type="STRING" length="100"/>
-				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="100"/>
-				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="100"/>
-				<attribute name="updateorgid" label="鏇存柊閮ㄩ棬" type="STRING" length="100"/>
-				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="100"/>
-			</attributes>
-			<manager>
-				<managerProperties>
-					<property name="table" value="lb_cardata_commercial_brand" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager>
+		<class name="LB_CARDATA_COMMERCIAL_BRAND" label="鍟嗙敤杞﹀搧鐗岃〃" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="鏍囪瘑缂栧彿" type="STRING" length="32"/>
+				<attribute name="brand_id" label="鍝佺墝ID" type="STRING" length="100"/>
+				<attribute name="brand_name" label="鍝佺墝鍚嶇О" type="STRING" length="100"/>
+				<attribute name="brand_initial" label="鍝佺墝棣栧瓧姣�" type="STRING" length="100"/>
+				<attribute name="initialversion" label="鍒濆鐗堟湰鍙�" type="STRING" length="100"/>
+				<attribute name="inputuserid" label="鐧昏浜�" type="STRING" length="100"/>
+				<attribute name="inputorgid" label="鐧昏閮ㄩ棬" type="STRING" length="100"/>
+				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="100"/>
+				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="100"/>
+				<attribute name="updateorgid" label="鏇存柊閮ㄩ棬" type="STRING" length="100"/>
+				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="100"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_cardata_commercial_brand" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
 		</class>
-		<class name="LB_CARDATA_COMMERCIAL_MODEL" label="" keyAttributes="ID">
-			<attributes>
-				<attribute name="ID" label="鏍囪瘑缂栧彿" type="STRING" length="32"/>
-				<attribute name="model_id" label="杞﹀瀷缂栧彿" type="STRING" length="100"/>
-				<attribute name="model_name" label="杞﹀瀷鍚嶇О" type="STRING" length="100"/>
-				<attribute name="series_id" label="杞︾郴缂栧彿" type="STRING" length="100"/>
-				<attribute name="series_name" label="杞︾郴鍚嶇О" type="STRING" length="100"/>
-				<attribute name="brand_id" label="鍝佺墝缂栧彿" type="STRING" length="100"/>
-				<attribute name="brand_name" label="鍝佺墝鍚嶇О" type="STRING" length="100"/>
-				<attribute name="price" label="鏂拌溅鎸囧浠�" type="STRING" length="100"/>
-				<attribute name="liter" label="鎺掗噺" type="STRING" length="100"/>
-				<attribute name="vehicle_type" label="杞﹁締绫诲瀷" type="STRING" length="100"/>
-				<attribute name="level" label="绾у埆" type="STRING" length="100"/>
-				<attribute name="initialversion" label="鍒濆鐗堟湰鍙�" type="STRING" length="100"/>
-				<attribute name="inputuserid" label="鐧昏浜�" type="STRING" length="100"/>
-				<attribute name="inputorgid" label="鐧昏閮ㄩ棬" type="STRING" length="100"/>
-				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="100"/>
-				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="100"/>
-				<attribute name="updateorgid" label="鏇存柊閮ㄩ棬" type="STRING" length="100"/>
-				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="100"/>
-			</attributes>
-			<manager>
-				<managerProperties>
-					<property name="table" value="lb_cardata_commercial_model" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager>
+		<class name="LB_CARDATA_COMMERCIAL_MODEL" label="鍟嗙敤杞﹁溅鍨嬭〃" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="鏍囪瘑缂栧彿" type="STRING" length="32"/>
+				<attribute name="model_id" label="杞﹀瀷缂栧彿" type="STRING" length="100"/>
+				<attribute name="model_name" label="杞﹀瀷鍚嶇О" type="STRING" length="100"/>
+				<attribute name="series_id" label="杞︾郴缂栧彿" type="STRING" length="100"/>
+				<attribute name="series_name" label="杞︾郴鍚嶇О" type="STRING" length="100"/>
+				<attribute name="brand_id" label="鍝佺墝缂栧彿" type="STRING" length="100"/>
+				<attribute name="brand_name" label="鍝佺墝鍚嶇О" type="STRING" length="100"/>
+				<attribute name="price" label="鏂拌溅鎸囧浠�" type="STRING" length="100"/>
+				<attribute name="liter" label="鎺掗噺" type="STRING" length="100"/>
+				<attribute name="vehicle_type" label="杞﹁締绫诲瀷" type="STRING" length="100"/>
+				<attribute name="level" label="绾у埆" type="STRING" length="100"/>
+				<attribute name="initialversion" label="鍒濆鐗堟湰鍙�" type="STRING" length="100"/>
+				<attribute name="inputuserid" label="鐧昏浜�" type="STRING" length="100"/>
+				<attribute name="inputorgid" label="鐧昏閮ㄩ棬" type="STRING" length="100"/>
+				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="100"/>
+				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="100"/>
+				<attribute name="updateorgid" label="鏇存柊閮ㄩ棬" type="STRING" length="100"/>
+				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="100"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_cardata_commercial_model" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
 		</class>
-		<class name="LB_CARDATA_COMMERCIAL_SERIES" label="" keyAttributes="ID">
-			<attributes>
-				<attribute name="ID" label="鏍囪瘑缂栧彿" type="STRING" length="32"/>
-				<attribute name="series_id" label="杞︾郴缂栧彿" type="STRING" length="100"/>
-				<attribute name="series_name" label="杞︾郴鍚嶇О" type="STRING" length="100"/>
-				<attribute name="brand_id" label="鍝佺墝缂栧彿" type="STRING" length="100"/>
-				<attribute name="brand_name" label="鍝佺墝鍚嶇О" type="STRING" length="100"/>
-				<attribute name="car_type" label="杞﹁締绫诲瀷" type="STRING" length="100"/>
-				<attribute name="initialversion" label="鍒濆鐗堟湰鍙�" type="STRING" length="100"/>
-				<attribute name="inputuserid" label="鐧昏浜�" type="STRING" length="100"/>
-				<attribute name="inputorgid" label="鐧昏閮ㄩ棬" type="STRING" length="100"/>
-				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="100"/>
-				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="100"/>
-				<attribute name="updateorgid" label="鏇存柊閮ㄩ棬" type="STRING" length="100"/>
-				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="100"/>
-			</attributes>
-			<manager>
-				<managerProperties>
-					<property name="table" value="lb_cardata_commercial_series" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager>
+		<class name="LB_CARDATA_COMMERCIAL_SERIES" label="鍟嗙敤杞﹁溅绯昏〃" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="鏍囪瘑缂栧彿" type="STRING" length="32"/>
+				<attribute name="series_id" label="杞︾郴缂栧彿" type="STRING" length="100"/>
+				<attribute name="series_name" label="杞︾郴鍚嶇О" type="STRING" length="100"/>
+				<attribute name="brand_id" label="鍝佺墝缂栧彿" type="STRING" length="100"/>
+				<attribute name="brand_name" label="鍝佺墝鍚嶇О" type="STRING" length="100"/>
+				<attribute name="car_type" label="杞﹁締绫诲瀷" type="STRING" length="100"/>
+				<attribute name="initialversion" label="鍒濆鐗堟湰鍙�" type="STRING" length="100"/>
+				<attribute name="inputuserid" label="鐧昏浜�" type="STRING" length="100"/>
+				<attribute name="inputorgid" label="鐧昏閮ㄩ棬" type="STRING" length="100"/>
+				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="100"/>
+				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="100"/>
+				<attribute name="updateorgid" label="鏇存柊閮ㄩ棬" type="STRING" length="100"/>
+				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="100"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_cardata_commercial_series" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
 		</class>
-		<class name="LB_CARDATA_COMMERCIAL_VERSION" label="" keyAttributes="ID">
-			<attributes>
-				<attribute name="ID" label="ID" type="STRING" length="32"/>
-				<attribute name="initialversion" label="鍒濆鐗堟湰鍙�" type="STRING" length="100"/>
-				<attribute name="currentversion" label="褰撳墠鐗堟湰鍙�" type="STRING" length="100"/>
-			</attributes>
-			<manager>
-				<managerProperties>
-					<property name="table" value="lb_cardata_commercial_version" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager>
+		<class name="LB_CARDATA_COMMERCIAL_VERSION" label="鍟嗙敤杞︾増鏈〃" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="ID" type="STRING" length="32"/>
+				<attribute name="initialversion" label="鍒濆鐗堟湰鍙�" type="STRING" length="100"/>
+				<attribute name="currentversion" label="褰撳墠鐗堟湰鍙�" type="STRING" length="100"/>
+				<attribute name="series_version_time" label="杞︾郴鐗堟湰鏇存柊鏃堕棿" type="STRING" length="100"/>
+				<attribute name="brand_version_time" label="鍝佺墝鐗堟湰鏇存柊鏃堕棿" type="STRING" length="100"/>
+				<attribute name="model_version_time" label="杞﹀瀷鐗堟湰鏇存柊鏃堕棿" type="STRING" length="100"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_cardata_commercial_version" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
 		</class>
 	</package>
 </jbo>

From 073077ae3afa2a760475458205dc0794fefa8465 Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Fri, 20 Jul 2018 14:15:57 +0800
Subject: [PATCH 09/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B5=B7=E7=A7=9F?=
 =?UTF-8?q?=E5=90=8E=E5=8F=98=E6=9B=B4=E6=89=BF=E7=A7=9F=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=97=A0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commbusiness/LBCustomerRelaFormalToTempBusiness.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaFormalToTempBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaFormalToTempBusiness.java
index 7aa907e21..b4c5f9256 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaFormalToTempBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaFormalToTempBusiness.java
@@ -13,6 +13,7 @@ import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP;
 import jbo.app.tenwa.customer.CUSTOMER_PERSON;
 import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP;
 import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT;
+import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP;
 import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE;
 
 import com.amarsoft.are.jbo.BizObject;
@@ -43,6 +44,11 @@ public class LBCustomerRelaFormalToTempBusiness  extends BaseBussiness {
 	        DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS.CLASS_NAME, fromCondtion, CUSTOMER_ADDRESS_TEMP.CLASS_NAME, null, other, null, Sqlca);
 		}
 		for(BizObject unit:unitList){
+			//担保人从正式表到临时表
+			fromCondtion.clear();
+			fromCondtion.put("id", unit.getAttribute("id").getString());
+			DataOperatorUtil.copySingleJBO(LB_GUARANTEE_UNIT.CLASS_NAME, fromCondtion, LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, null, other, Sqlca);
+			
 			fromCondtion.clear();
 			fromCondtion.put("customerid", unit.getAttribute("ASSUROR").getString());
 	        DataOperatorUtil.copyJBOSet(CUSTOMER_PERSON.CLASS_NAME, fromCondtion, CUSTOMER_PERSON_TEMP.CLASS_NAME, null, other, null, Sqlca);

From f5262d7a2788d1e59038753b2a427d746aa96bb7 Mon Sep 17 00:00:00 2001
From: liuz <liuz@DESKTOP-BF9USEF>
Date: Fri, 20 Jul 2018 14:26:32 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E5=B8=A6=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributorApproval/LDistributorInfo.jsp  | 50 ++++---------------
 .../group/CustomerGroupCompanyController.java | 17 ++++++-
 .../businessapply/AccountInfoManage.java      | 31 ++++++++++++
 3 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp
index 253d05571..f225d2743 100644
--- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp
+++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp
@@ -44,6 +44,7 @@
 	sButtonPosition = "north";
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
+	//组织机构验证码的的校验
 	function Checkfield(){
 		var businessLicenseNo = getItemValue(0,getRow(0),"BUSINESS_LICENSE_NO");
 // 		if(businessLicenseNo==""){
@@ -53,14 +54,11 @@
 		if(checkORGRight1(businessLicenseNo)){
 			return true;
 		}else{
-			setErrorTips("BUSINESS_LICENSE_NO","组织机构代码格式不正确!");
+			//setErrorTips("BUSINESS_LICENSE_NO","组织机构代码格式不正确!");
 			alert("组织机构代码格式不正确!");
 			return false;
  		}
 	}
-	
-	
-	
 	//校验经销商编号是否唯一
 	function Uniquenesscheck(){
 		var DISTRIBUTOR_CODING = getItemValue(0,0,'DISTRIBUTOR_CODING');
@@ -72,15 +70,14 @@
 			return true;
 		}
 	}
-
-  	
- 	<%-- $(function(){
- 		if("<%=PhaseNo%>"=="0020"){
- 			setItemRequired(0, "RETAIL_OPEN_DATE", true);
- 			$("#RETAIL_OPEN_DATE")
- 		}
- 	}) --%>
- 
+<%-- 	function Uniquenesscheck(){
+		var flowunid = "<%=sFlowUnid%>"
+		var DISTRIBUTOR_CODING = getItemValue(0,0,'DISTRIBUTOR_CODING');
+		var sReturnInfo = RunJavaMethodTrans("com.tenwa.customer.controller.group.CustomerGroupCompanyController","distributor_basicS","flowunid="+flowunid);
+		if("distributor_coding".equals(sReturnInfo)){
+			return true;
+		}
+	} --%>
 	function save() {
 		var result = false;
 		var distributor_coding = getItemValue(0,0,'DISTRIBUTOR_CODING');
@@ -89,7 +86,6 @@
 		}else{
 			result = Uniquenesscheck();
 		}
-// 		 result = Uniquenesscheck();
 		var result1 = Checkfield();
 		//if(result==true){
 			if(result==true && result1==true){
@@ -97,9 +93,6 @@
 			}
 	}
 			
-	
-		
-		
 	function saveproj_name(){
 		var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businesspply.CustomerInfoManage","saveDistributorInfo","flowunid=<%=sFlowUnid%>");	
 	
@@ -146,29 +139,6 @@
 	    	setItemValue(0,getRow(),"SUBSIDIARY_COMPANY",sReturn[0]);//向页面的框中添加数据
 			},"请选择经销商");
 	}
-
- 	//省市
- /* 	function selectRegionCode(){
-		var area_code = getItemValue(0,getRow(),"DISTRIBUTOR_ADDRESS");
-		AsDialog.PopView("/Common/ToolsA/AreaVFrame.jsp","AreaCode="+area_code,"dialogWidth=850px;dialogHeight=450px;center:yes;status:no;statusbar:no",function(sAreaCodeInfo){
-			//增加清空功能的判断
-			if( sAreaCodeInfo == '_CANCEL_'){
-				return;
-			}
-			if(sAreaCodeInfo == "NO" || sAreaCodeInfo == '_CLEAR_'){
-				setItemValue(0,getRow(),"DISTRIBUTOR_ADDRESS","");
-				setItemValue(0,getRow(),"DISTRIBUTOR_ADDRESSNAME","");
-			}else{
-				 if(typeof(sAreaCodeInfo) != "undefined" && sAreaCodeInfo != ""){
-						sAreaCodeInfo = sAreaCodeInfo.split('@');
-						sAreaCodeValue = sAreaCodeInfo[0];//-- 行政区划代码
-						sAreaCodeName = sAreaCodeInfo[1];//--行政区划名称
-						setItemValue(0,getRow(),"DISTRIBUTOR_ADDRESS",sAreaCodeValue);
-						setItemValue(0,getRow(),"DISTRIBUTOR_ADDRESSNAME",sAreaCodeName);				
-				}
-			}
-		},'请选择省市');
-	}  */
 	var  province="";//定义一个全局变量
 	// 选择省份
      function selectProvinceCode(){ 
diff --git a/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java b/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java
index 139f77084..389359262 100644
--- a/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java
+++ b/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java
@@ -18,6 +18,15 @@ public class CustomerGroupCompanyController {
 	private String group_name = "";
 	private String group_no = "";
 	private String DISTRIBUTOR_CODING = "";
+	private String flowunid;
+
+	public String getFlowunid() {
+		return flowunid;
+	}
+
+	public void setFlowunid(String flowunid) {
+		this.flowunid = flowunid;
+	}
 
 	public String getDISTRIBUTOR_CODING() {
 		return DISTRIBUTOR_CODING;
@@ -156,7 +165,13 @@ public class CustomerGroupCompanyController {
 			return "false";
 		}
 	}
-	
+	//判断经销商编码是否是当前页面
+	/*public String distributor_basicS(JBOTransaction tx) throws Exception{
+		BizObjectManager dgcm = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME);
+		BizObject dgc = dgcm.createQuery("flowunid=:flowunid").setParameter("flowunid", this.flowunid).getSingleResult(true);
+		String distributor_coding = dgc.getAttribute("DISTRIBUTOR_CODING").toString();
+		return distributor_coding;
+	}*/
 	public String getNewId(JBOTransaction tx) throws Exception{
 		String id="";
 		BizObjectManager dgcm = JBOFactory.getBizObjectManager(DISTRIBUTOR_GROUP_COMPANY.CLASS_NAME);
diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/AccountInfoManage.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/AccountInfoManage.java
index 44ae7dff0..d2b99a653 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/AccountInfoManage.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/AccountInfoManage.java
@@ -7,6 +7,7 @@ import java.util.Set;
 
 import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP;
 import jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT_TEMP;
+import jbo.app.tenwa.customer.DISTRIBUTOR_INFO_TEMP;
 
 import com.amarsoft.are.jbo.BizObject;
 import com.amarsoft.are.jbo.BizObjectManager;
@@ -17,7 +18,25 @@ import com.amarsoft.are.jbo.JBOTransaction;
 public class AccountInfoManage {
 
 	private String flowunid;
+	private String id;
+	private String DISTRIBUTOR_NO;
 	
+	public String getDISTRIBUTOR_NO() {
+		return DISTRIBUTOR_NO;
+	}
+
+	public void setDISTRIBUTOR_NO(String dISTRIBUTOR_NO) {
+		DISTRIBUTOR_NO = dISTRIBUTOR_NO;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
 	public String CheckPartnerInfo(JBOTransaction tx) throws JBOException{
 		BizObjectManager bm = JBOFactory.getBizObjectManager(DISTRIBUTOR_ACCOUNT_TEMP.CLASS_NAME,tx);
 		List<BizObject> bos = bm.createQuery("flowunid=:flowunid").setParameter("flowunid",this.flowunid).getResultList(false);
@@ -48,5 +67,17 @@ public class AccountInfoManage {
 	public void setFlowunid(String flowunid) {
 		this.flowunid = flowunid;
 	}
+	//带值
+	public String Checkbasicinfo(JBOTransaction tx) throws JBOException{
+		BizObjectManager bs = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME,tx);
+		BizObject dgc = bs.createQuery("flowunid=:flowunid").setParameter("flowunid", this.getFlowunid()).getSingleResult(false);
+		String distributorName = dgc.getAttribute("DISTRIBUTOR_NAME").toString();
+		/*BizObjectManager bms = JBOFactory.getBizObjectManager(DISTRIBUTOR_ACCOUNT_TEMP.CLASS_NAME,tx);
+		BizObject account = bms.newObject();
+		account.setAttributeValue("ACCOUNT", distributorName);
+		bms.saveObject(account);*/
+		return distributorName;
+		
+	}
 	
 }

From 08f1c2a5473ea10bd5d692d4d415b5a4c3b51c9b Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei>
Date: Fri, 20 Jul 2018 14:27:44 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../validate/IdentityVerification.java        |  3 -
 .../flow/project/validate/SoapRequest.java    | 86 +++++++++++++------
 2 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java b/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java
index 572948604..3dedef60e 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java
@@ -90,9 +90,6 @@ public class IdentityVerification {
 								//读取授权文件
 								String license =ValidatePropertiesUtil.get("key");
 								String decode = new String(new BASE64Decoder().decodeBuffer(license));
-								if(coborrowerResult == null || guarantorResultList == null){
-										return "请完善共同申请人与担保人信息!";
-								}
 								//将申请人,共同申请人,担保人等信息传入该类构建xml入参参数
 								String  inConditions = SoapRequest.XMLConfiguration(borrowerResult,coborrowerResult,guarantorResultList);
 								String result  = NciicClient.executeClient("NciicServices",decode,inConditions);
diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java b/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java
index 1d24b4eb7..b06de9bed 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java
@@ -7,39 +7,73 @@ public class SoapRequest {
 			
 			public static String XMLConfiguration(BizObject biz1,BizObject biz2,List<BizObject> bizList) throws Exception {
 			        StringBuffer sb = new StringBuffer("");
-			        sb.append("<?xml version='1.0' encoding='UTF-8'?>");
-			        sb.append("<ROWS>");
-			        sb.append("<INFO>");
-			        sb.append("<SBM>安鹏国际融资租赁有限公司</SBM>");
-			        sb.append("</INFO>");
-			        sb.append("<ROW>");
-			        sb.append("<GMSFHM>公民身份号码</GMSFHM>");
-			        sb.append("<XM>姓名</XM>");
-			        sb.append("</ROW>");
-			        sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
-			        //入参申请人身份证号码
-			        sb.append("<GMSFHM>"+biz1.getAttribute("CERTID").getString()+"</GMSFHM>");
-			        //入参申请人姓名
-			        sb.append("<XM>"+biz1.getAttribute("FULLNAME").getString()+"</XM>");		        
-			        sb.append("</ROW>");
-			        sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
-			        //入参共同申请人身份证号码
-			        sb.append("<GMSFHM>"+biz2.getAttribute("certid").getString()+"</GMSFHM>");
-			        //入参共同申请人姓名
-			        sb.append("<XM>"+biz2.getAttribute("name").getString()+"</XM>");	
-			        sb.append("</ROW>");
-			        for(int i=0;i<bizList.size();i++){
-			        	sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
+			        if(bizList.size()>0 && biz2 != null){
+			        	sb.append(BaseXMLConfiguration(biz1));
+				        sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
 				        //入参共同申请人身份证号码
-				        sb.append("<GMSFHM>"+bizList.get(i).getAttribute("CERTID").getString()+"</GMSFHM>");
+				        sb.append("<GMSFHM>"+biz2.getAttribute("certid").getString()+"</GMSFHM>");
 				        //入参共同申请人姓名
-				        sb.append("<XM>"+bizList.get(i).getAttribute("FULLNAME").getString()+"</XM>");	
+				        sb.append("<XM>"+biz2.getAttribute("name").getString()+"</XM>");	
 				        sb.append("</ROW>");
+				        for(int i=0;i<bizList.size();i++){
+				        	sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
+					        //入参共同申请人身份证号码
+					        sb.append("<GMSFHM>"+bizList.get(i).getAttribute("CERTID").getString()+"</GMSFHM>");
+					        //入参共同申请人姓名
+					        sb.append("<XM>"+bizList.get(i).getAttribute("FULLNAME").getString()+"</XM>");	
+					        sb.append("</ROW>");
+				        }
+				        sb.append("</ROWS>");
+			        }else if(biz2 == null && bizList.size()>0){
+			        	sb.append(BaseXMLConfiguration(biz1));
+				        for(int i=0;i<bizList.size();i++){
+				        	sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
+					        //入参共同申请人身份证号码
+					        sb.append("<GMSFHM>"+bizList.get(i).getAttribute("CERTID").getString()+"</GMSFHM>");
+					        //入参共同申请人姓名
+					        sb.append("<XM>"+bizList.get(i).getAttribute("FULLNAME").getString()+"</XM>");	
+					        sb.append("</ROW>");
+				        }
+				        sb.append("</ROWS>");
+			        }else if(biz2 != null && bizList.size()<=0){
+			        	sb.append(BaseXMLConfiguration(biz1));
+				        sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
+				        //入参共同申请人身份证号码
+				        sb.append("<GMSFHM>"+biz2.getAttribute("certid").getString()+"</GMSFHM>");
+				        //入参共同申请人姓名
+				        sb.append("<XM>"+biz2.getAttribute("name").getString()+"</XM>");	
+				        sb.append("</ROW>");
+				        sb.append("</ROWS>");
+			        }else{
+			        	sb.append(BaseXMLConfiguration(biz1));
 			        }
-			        sb.append("</ROWS>");
 			        System.out.println("HttpClient 发送SOAP请求");
 			        String xmldata = sb.toString();
 			        System.out.println(xmldata);
 			        return xmldata;
 			}
+			public static String BaseXMLConfiguration(BizObject biz1){
+					try {
+							StringBuffer sb = new StringBuffer("");
+						   	sb.append("<?xml version='1.0' encoding='UTF-8'?>");
+					        sb.append("<ROWS>");
+					        sb.append("<INFO>");
+					        sb.append("<SBM>安鹏国际融资租赁有限公司</SBM>");
+					        sb.append("</INFO>");
+					        sb.append("<ROW>");
+					        sb.append("<GMSFHM>公民身份号码</GMSFHM>");
+					        sb.append("<XM>姓名</XM>");
+					        sb.append("</ROW>");
+					        sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
+					        //入参申请人身份证号码
+					        sb.append("<GMSFHM>"+biz1.getAttribute("CERTID").getString()+"</GMSFHM>");
+					        //入参申请人姓名
+					        sb.append("<XM>"+biz1.getAttribute("FULLNAME").getString()+"</XM>");		        
+					        sb.append("</ROW>");
+							return sb.toString();
+					} catch (Exception e) {
+							e.printStackTrace();
+					}
+					return null;
+			}
 }

From eb93ffd9fec5865adeec9182d3bf59506957cdd4 Mon Sep 17 00:00:00 2001
From: liuz <liuz@DESKTOP-BF9USEF>
Date: Fri, 20 Jul 2018 14:31:37 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E5=86=85=E5=A4=96?=
 =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../businessapply/CustomerInfoManage.java     | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java
index 9a737d6ec..639ed10b7 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java
@@ -5,10 +5,13 @@ import jbo.app.tenwa.customer.CUSTOMER_CERT_TEMP;
 import jbo.app.tenwa.customer.CUSTOMER_FAMILY;
 import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP;
 import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP;
+import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
 import jbo.app.tenwa.customer.DISTRIBUTOR_INFO_TEMP;
 import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
 import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
 
+import org.bouncycastle.crypto.tls.AlertDescription;
+
 import com.amarsoft.are.jbo.BizObject;
 import com.amarsoft.are.jbo.BizObjectManager;
 import com.amarsoft.are.jbo.JBOException;
@@ -17,6 +20,8 @@ import com.amarsoft.are.jbo.JBOTransaction;
 import com.amarsoft.are.util.StringFunction;
 
 public class CustomerInfoManage {
+	private String F_I_TYPE;
+	private String DISTRIBUTOR_STATUS;
 	private String flowunid;
 	private String status;
 	private String relative;
@@ -37,14 +42,21 @@ public class CustomerInfoManage {
 	private String smincome;
 	private String shukou;
 	private String projectId;
-	private String workunit;
 	
-	public String getWorkunit() {
-		return workunit;
+	public String getF_I_TYPE() {
+		return F_I_TYPE;
 	}
 
-	public void setWorkunit(String workunit) {
-		this.workunit = workunit;
+	public void setF_I_TYPE(String f_I_TYPE) {
+		F_I_TYPE = f_I_TYPE;
+	}
+
+	public String getDISTRIBUTOR_STATUS() {
+		return DISTRIBUTOR_STATUS;
+	}
+
+	public void setDISTRIBUTOR_STATUS(String dISTRIBUTOR_STATUS) {
+		DISTRIBUTOR_STATUS = dISTRIBUTOR_STATUS;
 	}
 
 	public String getProjectId() {
@@ -249,7 +261,6 @@ public class CustomerInfoManage {
 				bo.setAttributeValue("shukou", shukou);
 				bo.setAttributeValue("Spouse_", "Y");
 				bo.setAttributeValue("PROJECT_ID", projectId);
-				bo.setAttributeValue("workunit", workunit);
 			}else{
 				bo = bom.newObject();
 				bo.setAttributeValue("flowunid", flowunid);
@@ -268,7 +279,6 @@ public class CustomerInfoManage {
 				bo.setAttributeValue("shukou", shukou);
 				bo.setAttributeValue("Spouse_", "Y");
 				bo.setAttributeValue("PROJECT_ID", projectId);
-				bo.setAttributeValue("workunit", workunit);
 			}
 			bom.saveObject(bo);
 		}catch(Exception e){
@@ -367,4 +377,14 @@ public class CustomerInfoManage {
 		return "SUCCESS";
 	}
 	
+/*	public String SelectGroup(JBOTransaction tx){
+			if(this.F_I_TYPE=="f_i_type02" && this.DISTRIBUTOR_STATUS=="distributor_status04"){
+				return "true";
+			}
+		
+		return "false";
+	}*/
+	
+	
+	
 }

From c26cfec26f1ff133e5260ed719df3032e1565251 Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei>
Date: Fri, 20 Jul 2018 16:32:39 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E4=BF=A1=E8=B4=B7=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/tenwa/comm/credit/CreditBodyGuardAction.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java
index b2add608e..03ae15046 100644
--- a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java
+++ b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java
@@ -88,10 +88,14 @@ public class CreditBodyGuardAction {
 								 //将查询到的结果放入一个List中
 								 List<BizObject> personList = new ArrayList<>();
 								 personList.add(borrowerResult);
-								 personList.add(coborrowerResult);
-								 for(BizObject biz : guarantorResultList){
-									 personList.add(biz);
+								 if(coborrowerResult != null){
+									 	 personList.add(coborrowerResult);
 								 }
+								 if(guarantorResultList.size()>0){
+									 	for(BizObject biz : guarantorResultList){
+										 personList.add(biz);
+									 	}
+								 }							 
 								 //遍历这个List并组装成字符串								
 								 for(int r = 0;r<personList.size();r++){
 									 if("".equals(personArr)){

From b894afa43700371e1ed5a89cb3a1b7b994c0a411 Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei>
Date: Fri, 20 Jul 2018 17:09:06 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E5=95=86=E7=94=A8=E8=BD=A6=E4=B8=8E?=
 =?UTF-8?q?=E4=B9=98=E7=94=A8=E8=BD=A6=E8=BD=A6=E5=9E=8B=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QueryCommercialVehicleModeListAction.java | 203 ++++++++++++++++++
 .../QueryPassengerVehicleModeListAction.java  |  85 ++++----
 2 files changed, 247 insertions(+), 41 deletions(-)
 create mode 100644 src_tenwa/com/tenwa/lease/app/quartzmession/QueryCommercialVehicleModeListAction.java

diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/QueryCommercialVehicleModeListAction.java b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryCommercialVehicleModeListAction.java
new file mode 100644
index 000000000..985bff54d
--- /dev/null
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryCommercialVehicleModeListAction.java
@@ -0,0 +1,203 @@
+package com.tenwa.lease.app.quartzmession;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jbo.app.tenwa.customer.LB_CARDATA_COMMERCIAL_BRAND;
+import jbo.app.tenwa.customer.LB_CARDATA_COMMERCIAL_MODEL;
+import jbo.app.tenwa.customer.LB_CARDATA_COMMERCIAL_SERIES;
+import jbo.app.tenwa.customer.LB_CARDATA_COMMERCIAL_VERSION;
+
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.amarsoft.app.awe.config.InitSecondHandCarConfig;
+import com.amarsoft.app.util.StringUtil;
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.tenwa.lease.util.VehicleAppraisementUtil;
+
+public class QueryCommercialVehicleModeListAction implements Job{
+
+			@Override
+			public void execute(JobExecutionContext arg0) throws JobExecutionException {
+				  	JBOTransaction tx = null;
+				  	try {
+						tx = JBOFactory.createJBOTransaction();
+				 		BizObjectManager bm1 = JBOFactory.getBizObjectManager(LB_CARDATA_COMMERCIAL_BRAND.CLASS_NAME, tx);
+				 		BizObjectManager bm2 = JBOFactory.getBizObjectManager(LB_CARDATA_COMMERCIAL_SERIES.CLASS_NAME, tx);
+				 		BizObjectManager bm3 = JBOFactory.getBizObjectManager(LB_CARDATA_COMMERCIAL_MODEL.CLASS_NAME, tx);
+				 		BizObjectManager bm4 = JBOFactory.getBizObjectManager(LB_CARDATA_COMMERCIAL_VERSION.CLASS_NAME, tx);
+				 		//接口url中的fromVersion参数
+				 		String fromVersion = null;
+				 		//开关，作用是若判断为第一次调用接口，保存版本信息到Version表，而不是第一次调用时则将这个值变为true，则更新版本表
+				 		boolean versionflag = true;
+				 		//查询二手车版本表,若为空则说明是第一次调用二手车车型库接口
+				 		BizObject versionResult = bm4.createQuery("select O.currentversion,O.initialversion from O").getSingleResult(false);
+				 		if(versionResult == null){
+				 				versionflag = false;
+				 				fromVersion = InitSecondHandCarConfig.COMVERSION;
+				 		}else{
+				 				fromVersion = versionResult.getAttribute("currentversion").toString();
+				 		}
+				 		String url = "http://"+InitSecondHandCarConfig.PREFIX+".che300.com/service/common/eval?fromVersion="
+				 							+fromVersion+"&oper=exportCommercialModel"+"&token="+InitSecondHandCarConfig.TOKEN+"";
+				 		String responseResult = VehicleAppraisementUtil.getResponseResult(url);
+				 		//使用fastjson解析接口返回的json数据
+				 		JSONObject object = JSONObject.parseObject(responseResult);
+				 		//
+				 		if("0".equals(object.get("status").toString())){
+				 			    	return;
+				 		}
+				 		JSONObject dataObject = (JSONObject) object.get("data");
+				 		@SuppressWarnings("rawtypes")
+						List<HashMap> brandList = JSON.parseArray(JSON.toJSONString(dataObject.get("brand")), HashMap.class);
+				 		System.out.println("品牌大小:"+brandList.size());
+				 		@SuppressWarnings("rawtypes")
+						List<HashMap> seriesList = JSON.parseArray(JSON.toJSONString(dataObject.get("series")), HashMap.class);
+				 		System.out.println("车系大小:"+seriesList.size());
+				 		@SuppressWarnings("rawtypes")
+						List<HashMap> modelList = JSON.parseArray(JSON.toJSONString(dataObject.get("model")), HashMap.class);
+				 		System.out.println("车型大小:"+modelList.size());
+
+				 		JSONObject versionListObject = (JSONObject) dataObject.get("version");
+				 //判断解析出的brandList是否为空,若不为空则执行
+				if(!brandList.isEmpty()){
+							for(int i=0;i<brandList.size();i++){
+								 if("新增".equals(brandList.get(i).get("operation_type"))){
+								 BizObject brandObject = bm1.newObject();
+					    	 	 brandObject.setAttributeValue("brand_name",brandList.get(i).get("brand_name"));
+					    	 	 brandObject.setAttributeValue("brand_id",brandList.get(i).get("brand_id"));
+					    	 	 brandObject.setAttributeValue("brand_initial",brandList.get(i).get("brand_initial"));
+					    	 	 brandObject.setAttributeValue("initialversion", versionListObject.get("from_version"));
+					    	 	 bm1.saveObject(brandObject);
+								 }else if("更新".equals(brandList.get(i).get("operation_type"))){
+									 //更新的操作
+						         bm1.createQuery("update O set brand_name=:BRANDNAME"
+						         		+ ",brand_initial=:BRANDINITIAL,initialversion=:INITIALVERSION"
+						         		+"  where  brand_id=:BRANDID") //此处Sql拼接要注意,一定要在where前后留空格,否则执行报错,下面同理
+								 .setParameter("BRANDNAME", StringUtil.nullToString(brandList.get(i).get("brand_name"),""))
+								 .setParameter("BRANDINITIAL", StringUtil.nullToString(brandList.get(i).get("brand_initial"),""))
+								 .setParameter("INITIALVERSION", StringUtil.nullToString(versionListObject.get("from_version"),""))
+								 .setParameter("BRANDID", StringUtil.nullToString(brandList.get(i).get("brand_id"),"")).executeUpdate();
+								 }else{
+									      continue;
+								 }
+							}
+				}
+				//同上理
+		 		if(!seriesList.isEmpty()){
+				 			for(int i=0;i<seriesList.size();i++){
+					 			 if("新增".equals(seriesList.get(i).get("operation_type"))){
+								 BizObject seriesObject = bm2.newObject();
+						    	 seriesObject.setAttributeValue("brand_id",seriesList.get(i).get("brand_id"));
+						    	 seriesObject.setAttributeValue("brand_name",seriesList.get(i).get("brand_name"));
+						    	 seriesObject.setAttributeValue("series_name",seriesList.get(i).get("series_name"));
+						    	 seriesObject.setAttributeValue("car_type", seriesList.get(i).get("car_type"));			    	
+						    	 seriesObject.setAttributeValue("initialversion", versionListObject.get("from_version"));
+						    	 bm2.saveObject(seriesObject);
+					 			 }else if("更新".equals(seriesList.get(i).get("operation_type"))){
+									 //更新的操作
+							 		 bm2.createQuery("update O set brand_name=:BRANDNAME"
+									 +",series_name=:SERIESNAME,car_type=:CARTYPE"
+									 +",initialversion=:INITIALVERSION,brand_id=:BRANDID"
+									 +"  where seriesid=:SERIESID")
+									 .setParameter("BRANDNAME", StringUtil.nullToString(seriesList.get(i).get("brand_name"),""))
+									 .setParameter("BRANDID", StringUtil.nullToString(seriesList.get(i).get("brand_id"),""))
+									 .setParameter("SERIESNAME", StringUtil.nullToString(seriesList.get(i).get("series_name"),""))
+									 .setParameter("CARTYPE",StringUtil.nullToString(seriesList.get(i).get("series_name"),""))
+									 .setParameter("INITIALVERSION",StringUtil.nullToString(versionListObject.get("from_version"),""))
+									 .setParameter("SERIESID", StringUtil.nullToString(seriesList.get(i).get("series_id"),"")).executeUpdate();
+								 }else{
+									      continue;
+								 }
+				 		}
+		 		}
+		 		//同上理
+		 		if(!modelList.isEmpty()){
+					 			for(int i=0;i<modelList.size();i++){
+				 					if("新增".equals(modelList.get(i).get("operation_type"))){
+				 						 BizObject modelObject = bm3.newObject();
+							 			 modelObject.setAttributeValue("model_id",modelList.get(i).get("model_id"));
+							 			 modelObject.setAttributeValue("model_name",modelList.get(i).get("model_name"));
+							 			 modelObject.setAttributeValue("series_id",modelList.get(i).get("series_id"));
+							 			 modelObject.setAttributeValue("series_name",modelList.get(i).get("series_name"));
+							 			 modelObject.setAttributeValue("brand_id", modelList.get(i).get("brand_id"));
+							 			 modelObject.setAttributeValue("brand_name",modelList.get(i).get("brand_name"));
+							 			 modelObject.setAttributeValue("price",modelList.get(i).get("price"));
+							 			 modelObject.setAttributeValue("liter",modelList.get(i).get("liter"));
+							 			 modelObject.setAttributeValue("vehicle_type",modelList.get(i).get("vehicle_type"));
+							 			 modelObject.setAttributeValue("level",modelList.get(i).get("level"));
+							 			 modelObject.setAttributeValue("initialversion", versionListObject.get("from_version"));
+							 			 bm3.saveObject(modelObject);
+				 					}else if("更新".equals(modelList.get(i).get("operation_type"))){
+										 bm3.createQuery("update O set "
+								         + "model_name=:MODELNAME,series_id=:SERIESID"
+				 						 + ",series_name=:SERIESNAME,brand_id=:BRANDID"
+				 						 +",brand_name=:BRANDNAME,price=:PRICE"
+				 						 +",liter=:LITER,vehicle_type=:VEHICLETYPE"
+				 						 + ",level=:LEVEL"
+				 						 +",initialversion=:INITIALVERSION"
+				 						 +" where  model_id=:MODELID")
+				 						 .setParameter("MODELNAME", StringUtil.nullToString(modelList.get(i).get("model_name"),""))
+				 						 .setParameter("SERIESID", StringUtil.nullToString(modelList.get(i).get("series_id"),""))
+				 						 .setParameter("SERIESNAME", StringUtil.nullToString(modelList.get(i).get("series_name"),""))
+				 						 .setParameter("BRANDID", StringUtil.nullToString(modelList.get(i).get("brand_id"),""))
+				 						 .setParameter("BRANDNAME", StringUtil.nullToString(modelList.get(i).get("brand_name"),""))
+				 						 .setParameter("PRICE", StringUtil.nullToString(modelList.get(i).get("price"),""))
+				 						 .setParameter("LITER", StringUtil.nullToString(modelList.get(i).get("liter"),""))
+				 						 .setParameter("VEHICLETYPE", StringUtil.nullToString(modelList.get(i).get("vehicle_type"),""))
+				 						 .setParameter("LEVEL", StringUtil.nullToString(modelList.get(i).get("level"),""))
+				 						 .setParameter("INITIALVERSION",StringUtil.nullToString(versionListObject.get("from_version"),""))
+				 						 .setParameter("MODELID", StringUtil.nullToString(modelList.get(i).get("model_id"),"")).executeUpdate();
+				 					}else{
+				 								continue;
+				 					}
+					 		}
+		 		  }
+		 		if(versionflag == false){
+		 				BizObject versionObject = bm4.newObject();
+		 				versionObject.setAttributeValue("currentversion",StringUtil.nullToString(versionListObject.get("current_version"),""));
+		 				versionObject.setAttributeValue("initialversion",StringUtil.nullToString(versionListObject.get("from_version"),""));
+		 				versionObject.setAttributeValue("series_version_time",StringUtil.nullToString(versionListObject.get("series_version_time"),""));
+		 				versionObject.setAttributeValue("brand_version_time",StringUtil.nullToString(versionListObject.get("brand_version_time"),""));
+		 				versionObject.setAttributeValue("model_version_time",StringUtil.nullToString(versionListObject.get("model_version_time"),""));
+		 				bm4.saveObject(versionObject);
+		 		}else{
+			 			bm4.createQuery("update O set currentversion=:CURRENTVERSION,"
+			 									 + "series_version_time=:SERIESVERSIONTIME,brand_version_time=:BRANDVERSIONTIME,"
+			 									 + "model_version_time=:MODELVERSIONTIME "
+			 									 + " where initialversion=:INITIALVERSION")
+				 		.setParameter("CURRENTVERSION",StringUtil.nullToString(versionListObject.get("current_version"),""))
+				 		.setParameter("SERIESVERSIONTIME",StringUtil.nullToString(versionListObject.get("series_version_time"),""))
+				 		.setParameter("BRANDVERSIONTIME",StringUtil.nullToString(versionListObject.get("brand_version_time"),""))
+				 		.setParameter("MODELVERSIONTIME",StringUtil.nullToString(versionListObject.get("model_version_time"),""))
+				 		.setParameter("INITIALVERSION",StringUtil.nullToString(versionListObject.get("from_version"),"")).executeUpdate();
+		 		}	
+			} catch (Exception e) {
+					try {
+						if(null != tx){
+							  tx.rollback();						
+						}
+					} catch (JBOException e1) {
+						e1.printStackTrace();
+					}
+					    e.printStackTrace();
+			} finally {
+					try {
+						if(null != tx){
+							  tx.commit();						
+						}
+					} catch (JBOException e) {
+						e.printStackTrace();
+					}
+			   }
+		  }
+}
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/QueryPassengerVehicleModeListAction.java b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryPassengerVehicleModeListAction.java
index cea10d603..40e0dcc54 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/QueryPassengerVehicleModeListAction.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryPassengerVehicleModeListAction.java
@@ -17,6 +17,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.amarsoft.app.awe.config.InitCollectConfig;
 import com.amarsoft.app.awe.config.InitSecondHandCarConfig;
+import com.amarsoft.app.util.StringUtil;
 import com.amarsoft.are.jbo.BizObject;
 import com.amarsoft.are.jbo.BizObjectManager;
 import com.amarsoft.are.jbo.JBOException;
@@ -91,12 +92,12 @@ public class QueryPassengerVehicleModeListAction implements Job{
 					         		+",brandtimestamp=:BRANDTIMESTAMP"
 					         		+",initialversion=:INITIALVERSION"
 					         		+"  where  brandid=:BRANDID") //此处Sql拼接要注意,一定要在where前后留空格,否则执行报错,下面同理
-							 .setParameter("BRANDNAME", brandList.get(i).get("brand_name").toString())
-							 .setParameter("BRANDINITIAL", brandList.get(i).get("brand_initial").toString())
-							 .setParameter("OPERTYPE", brandList.get(i).get("oper_type").toString())
-							 .setParameter("BRANDTIMESTAMP",map.get("BrandTimestamp").toString())
-							 .setParameter("INITIALVERSION",map.get("InitialVersion").toString())
-							 .setParameter("BRANDID", brandList.get(i).get("brand_id").toString()).executeUpdate();
+							 .setParameter("BRANDNAME", StringUtil.nullToString(brandList.get(i).get("brand_name"),""))
+							 .setParameter("BRANDINITIAL", StringUtil.nullToString(brandList.get(i).get("brand_initial"),""))
+							 .setParameter("OPERTYPE", StringUtil.nullToString(brandList.get(i).get("oper_type"),""))
+							 .setParameter("BRANDTIMESTAMP",StringUtil.nullToString(map.get("BrandTimestamp"),""))
+							 .setParameter("INITIALVERSION",StringUtil.nullToString(map.get("InitialVersion"),""))
+							 .setParameter("BRANDID", StringUtil.nullToString(brandList.get(i).get("brand_id"),"")).executeUpdate();
 							 }else{
 								      continue;
 							 }
@@ -126,16 +127,16 @@ public class QueryPassengerVehicleModeListAction implements Job{
 								 +",opertype=:OPERTYPE,seriestimestamp=:SERIESTIMESTAMP"
 								 +",initialversion=:INITIALVERSION"
 								 +"  where  seriesid=:SERIESID")
-								 .setParameter("BRANDNAME", seriesList.get(i).get("brand_name").toString())
-								 .setParameter("BRANDID", seriesList.get(i).get("brand_id").toString())
-								 .setParameter("SERIESNAME", seriesList.get(i).get("series_name").toString())
-								 .setParameter("SERIESGROUPNAME", seriesList.get(i).get("series_group_name").toString())
-								 .setParameter("LEVELNAME", seriesList.get(i).get("level_name").toString())
-								 .setParameter("MAKERTYPE", seriesList.get(i).get("maker_type").toString())
-								 .setParameter("OPERTYPE", seriesList.get(i).get("oper_type").toString())
-								 .setParameter("SERIESTIMESTAMP", map.get("SeriesTimestamp").toString())
-								 .setParameter("INITIALVERSION",map.get("InitialVersion").toString())
-								 .setParameter("SERIESID", seriesList.get(i).get("series_id").toString()).executeUpdate();
+								 .setParameter("BRANDNAME", StringUtil.nullToString(seriesList.get(i).get("brand_name"),""))
+								 .setParameter("BRANDID", StringUtil.nullToString(seriesList.get(i).get("brand_id"),""))
+								 .setParameter("SERIESNAME", StringUtil.nullToString(seriesList.get(i).get("series_name"),""))
+								 .setParameter("SERIESGROUPNAME", StringUtil.nullToString(seriesList.get(i).get("series_group_name"),""))
+								 .setParameter("LEVELNAME", StringUtil.nullToString(seriesList.get(i).get("level_name"),""))
+								 .setParameter("MAKERTYPE", StringUtil.nullToString(seriesList.get(i).get("maker_type"),""))
+								 .setParameter("OPERTYPE", StringUtil.nullToString(seriesList.get(i).get("oper_type"),""))
+								 .setParameter("SERIESTIMESTAMP", StringUtil.nullToString(map.get("SeriesTimestamp"),""))
+								 .setParameter("INITIALVERSION",StringUtil.nullToString(map.get("InitialVersion"),""))
+								 .setParameter("SERIESID", StringUtil.nullToString(seriesList.get(i).get("series_id"),"")).executeUpdate();
 							 }else{
 								      continue;
 							 }
@@ -177,25 +178,25 @@ public class QueryPassengerVehicleModeListAction implements Job{
 			 						 +",opertype=:OPERTYPE,modeltimestamp=:MODELTIMESTAMP"
 			 						 +",initialversion=:INITIALVERSION"
 			 						 +"  where  modelid=:MODELID")
-			 						 .setParameter("BRANDNAME", modelList.get(i).get("brand_name").toString())
-			 						 .setParameter("BRANDID", modelList.get(i).get("brand_id").toString())
-			 						 .setParameter("SERIESID", modelList.get(i).get("series_id").toString())
-			 						 .setParameter("SERIESNAME", modelList.get(i).get("series_name").toString())
-			 						 .setParameter("SERIESGROUPNAME", modelList.get(i).get("series_group_name").toString())
-			 						 .setParameter("MODELNAME", modelList.get(i).get("model_name").toString())
-			 						 .setParameter("PRICE", modelList.get(i).get("price").toString())
-			 						 .setParameter("LITER", modelList.get(i).get("liter").toString())
-			 						 .setParameter("GEARTYPE", modelList.get(i).get("gear_type").toString())
-			 						 .setParameter("MODELYEAR", modelList.get(i).get("model_year").toString())
-			 						 .setParameter("MAKERTYPE", modelList.get(i).get("maker_type").toString())
-			 						 .setParameter("DISCHARGESTANDARD", modelList.get(i).get("discharge_standard").toString())
-			 						 .setParameter("SEATNUMBER", modelList.get(i).get("seat_number").toString())
-			 						 .setParameter("MINREGYEAR", modelList.get(i).get("min_reg_year").toString())
-			 						 .setParameter("MAXREGYEAR", modelList.get(i).get("max_reg_year").toString())
-			 						 .setParameter("OPERTYPE", modelList.get(i).get("oper_type").toString())
-			 						 .setParameter("MODELTIMESTAMP", map.get("ModelTimestamp").toString())
-			 						 .setParameter("INITIALVERSION",map.get("InitialVersion").toString())
-			 						 .setParameter("MODELID", modelList.get(i).get("model_id").toString()).executeUpdate();
+			 						 .setParameter("BRANDNAME", StringUtil.nullToString(modelList.get(i).get("brand_name"),""))
+			 						 .setParameter("BRANDID", StringUtil.nullToString(modelList.get(i).get("brand_id"),""))
+			 						 .setParameter("SERIESID", StringUtil.nullToString(modelList.get(i).get("series_id"),""))
+			 						 .setParameter("SERIESNAME", StringUtil.nullToString(modelList.get(i).get("series_name"),""))
+			 						 .setParameter("SERIESGROUPNAME", StringUtil.nullToString(modelList.get(i).get("series_group_name"),""))
+			 						 .setParameter("MODELNAME", StringUtil.nullToString(modelList.get(i).get("model_name"),""))
+			 						 .setParameter("PRICE", StringUtil.nullToString(modelList.get(i).get("price"),""))
+			 						 .setParameter("LITER", StringUtil.nullToString(modelList.get(i).get("liter"),""))
+			 						 .setParameter("GEARTYPE", StringUtil.nullToString(modelList.get(i).get("gear_type"),""))
+			 						 .setParameter("MODELYEAR", StringUtil.nullToString(modelList.get(i).get("model_year"),""))
+			 						 .setParameter("MAKERTYPE", StringUtil.nullToString(modelList.get(i).get("maker_type"),""))
+			 						 .setParameter("DISCHARGESTANDARD", StringUtil.nullToString(modelList.get(i).get("discharge_standard"),""))
+			 						 .setParameter("SEATNUMBER", StringUtil.nullToString(modelList.get(i).get("seat_number"),""))
+			 						 .setParameter("MINREGYEAR", StringUtil.nullToString(modelList.get(i).get("min_reg_year"),""))
+			 						 .setParameter("MAXREGYEAR", StringUtil.nullToString(modelList.get(i).get("max_reg_year"),""))
+			 						 .setParameter("OPERTYPE", StringUtil.nullToString(modelList.get(i).get("oper_type"),""))
+			 						 .setParameter("MODELTIMESTAMP", StringUtil.nullToString(map.get("ModelTimestamp"),""))
+			 						 .setParameter("INITIALVERSION",StringUtil.nullToString(map.get("InitialVersion"),""))
+			 						 .setParameter("MODELID", StringUtil.nullToString(modelList.get(i).get("model_id"),"")).executeUpdate();
 			 					}else{
 			 								continue;
 			 					}
@@ -203,14 +204,16 @@ public class QueryPassengerVehicleModeListAction implements Job{
 	 		  }
 	 		if(versionflag == false){
 	 				BizObject versionObject = bm4.newObject();
-	 				versionObject.setAttributeValue("currentversion",map.get("CurrentVersion").toString());
-	 				versionObject.setAttributeValue("initialversion",map.get("InitialVersion").toString());
+	 				versionObject.setAttributeValue("currentversion",StringUtil.nullToString(map.get("CurrentVersion"),""));
+	 				versionObject.setAttributeValue("initialversion",StringUtil.nullToString(map.get("InitialVersion"),""));
 	 				bm4.saveObject(versionObject);
 	 		}else{
-		 			bm4.createQuery("update O set currentversion=:CURRENTVERSION,initialversion=:INITIALVERSION")
-			 		.setParameter("CURRENTVERSION",map.get("CurrentVersion").toString())
-			 		.setParameter("INITIALVERSION",map.get("InitialVersion").toString()).executeUpdate();
-	 		}	
+		 			bm4.createQuery("update O set currentversion=:CURRENTVERSION "
+		 					+ " where initialversion=:INITIALVERSION")
+			 		.setParameter("CURRENTVERSION",StringUtil.nullToString(map.get("CurrentVersion"),""))
+			 		.setParameter("INITIALVERSION",StringUtil.nullToString(map.get("InitialVersion"),"")).executeUpdate();
+	 		}
+	 		System.out.println("乘用车车型库更新完毕!");
 		} catch (Exception e) {
 				try {
 					if(null != tx){

From ca4047374401c28ccb2be2bcf9f2eb0b4dec9d20 Mon Sep 17 00:00:00 2001
From: zhouyahui <zhouyh@mail2.tenwa.com.cn>
Date: Fri, 20 Jul 2018 17:52:11 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AF=86=E7=A0=81al01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 calc/com/tenwa/flow/CopyInfoTempToFormal.java                  | 3 +++
 .../awe/config/orguser/dwhandler/ChannelUserInfoHandler.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/calc/com/tenwa/flow/CopyInfoTempToFormal.java b/calc/com/tenwa/flow/CopyInfoTempToFormal.java
index 0c1f2734a..6844587ca 100644
--- a/calc/com/tenwa/flow/CopyInfoTempToFormal.java
+++ b/calc/com/tenwa/flow/CopyInfoTempToFormal.java
@@ -35,6 +35,9 @@ public class CopyInfoTempToFormal extends BaseBussiness{
 		if("distributor_status08".equals(disStatus)){
 			disinfo.setAttributeValue("distributor_status", "distributor_status09");
 		}
+		if("distributor_status04".equals(disStatus)){
+			disinfo.setAttributeValue("distributor_status", "distributor_status04");
+		}
 		ditinfo.saveObject(disinfo);
 		String sMessage="true"; 
 		return sMessage;
diff --git a/src/com/amarsoft/app/awe/config/orguser/dwhandler/ChannelUserInfoHandler.java b/src/com/amarsoft/app/awe/config/orguser/dwhandler/ChannelUserInfoHandler.java
index db9be0035..d14689569 100644
--- a/src/com/amarsoft/app/awe/config/orguser/dwhandler/ChannelUserInfoHandler.java
+++ b/src/com/amarsoft/app/awe/config/orguser/dwhandler/ChannelUserInfoHandler.java
@@ -49,7 +49,7 @@ public class ChannelUserInfoHandler extends CommonHandler {
 	
 	protected void beforeInsert(JBOTransaction tx, BizObject bo) throws Exception {
 		//设置初始密码000000als
-		String sInitPwd = "APleasing001";
+		String sInitPwd = "al！";
 		String sPassword = MessageDigest.getDigestAsUpperHexString("MD5", sInitPwd);
 		bo.setAttributeValue("Password",sPassword); //如果是新增用户，设置初始密码
 		

From 57c0de488ee51737a708836366830416ba0144e3 Mon Sep 17 00:00:00 2001
From: zhouyahui <zhouyh@mail2.tenwa.com.cn>
Date: Fri, 20 Jul 2018 18:00:21 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=94=AF=E4=B8=80=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/group/CustomerGroupCompanyController.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java b/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java
index 389359262..1b99ec93f 100644
--- a/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java
+++ b/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java
@@ -3,6 +3,7 @@ package com.tenwa.customer.controller.group;
 import jbo.app.tenwa.customer.CUSTOMER_GROUP_COMPANY;
 import jbo.app.tenwa.customer.DISTRIBUTOR_GROUP_COMPANY;
 import jbo.app.tenwa.customer.DISTRIBUTOR_GROUP_RELATION;
+import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
 import jbo.app.tenwa.customer.DISTRIBUTOR_INFO_TEMP;
 import jbo.com.tenwa.entity.comm.own.COUNTRY_DISTRICT_INFO;
 
@@ -157,7 +158,7 @@ public class CustomerGroupCompanyController {
 	}
 	
 	public String distributor_basic(JBOTransaction tx) throws Exception{
-		BizObjectManager dgcm = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME);
+		BizObjectManager dgcm = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME);
 		BizObject dgc = dgcm.createQuery("DISTRIBUTOR_CODING=:DISTRIBUTOR_CODING").setParameter("DISTRIBUTOR_CODING", DISTRIBUTOR_CODING).getSingleResult(false);
 		if(dgc == null){
 			return "true";

From 6090a09406fe82fa7a79e0e501a8708e6ab3549c Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei>
Date: Fri, 20 Jul 2018 19:11:35 +0800
Subject: [PATCH 17/19] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../validate/IdentityVerification.java        | 35 +++++++++++-----
 .../flow/project/validate/SoapRequest.java    | 41 ++++++++++++++++++-
 2 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java b/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java
index 3dedef60e..e3874b5da 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java
@@ -65,14 +65,7 @@ public class IdentityVerification {
 							BizObject queryResult = bom4.createQuery("select result from O where flowunid=:FLOWUNID").setParameter("FLOWUNID",FlowUnid).getSingleResult(false);
 							if(queryResult!=null){
 									return "身份证校验已执行过,不可重复执行";
-							}else{
-								//查询借款人
-								 BizObject borrowerResult = bom1.createQuery("SELECT "+
-																	"fullname,"+
-																	"certid "+
-																	"FROM "+
-																	"O WHERE flowunid=:FLOWUNID "+
-																	"AND O.BALANCESHEET = '申请人' ").setParameter("FLOWUNID",FlowUnid).getSingleResult(false);
+							}else{						
 								 //查询共同借款人
 								 BizObject coborrowerResult = bom2.createQuery("SELECT "+ 
 															      "name,"+
@@ -87,11 +80,33 @@ public class IdentityVerification {
 											"FROM "+
 											"O WHERE flowunid=:FLOWUNID "
 											).setParameter("FLOWUNID",FlowUnid).getResultList(false);
+								//查询借款人
+								 BizObject borrowerResult = bom1.createQuery("SELECT "+
+																	"O.fullname,"+
+																	"O.certid,"+
+																	 "O.BalancesHEET,"+
+																	"ci.customertype "+
+																	" FROM "+
+																	"O left join customer_info "+ 
+																	"ON O.customerid = ci.customerid "+
+																	 " WHERE flowunid=:FLOWUNID "+
+																	"AND O.BALANCESHEET = '申请人' ").setParameter("FLOWUNID",FlowUnid).getSingleResult(false);
+								 //判断用户是自然人还是法人
+								//将申请人,共同申请人,担保人等信息传入该类构建xml入参参数
+								 String inConditions = "";
+								 if("03".equals(borrowerResult.getAttribute("customertype"))){
+									 		inConditions = SoapRequest.FirstXMLConfiguration(borrowerResult,coborrowerResult,guarantorResultList);
+								 }else if("01".equals(borrowerResult.getAttribute("customertype"))){
+									 		if(coborrowerResult == null && guarantorResultList.size()<=0 ){
+									 					return "共同申请人与担保人信息都为空!";
+									 		}else{
+									 			inConditions = SoapRequest.SecondXMLConfiguration(coborrowerResult,guarantorResultList);									 			
+									 		}
+								 }
+								 System.err.println(inConditions);
 								//读取授权文件
 								String license =ValidatePropertiesUtil.get("key");
 								String decode = new String(new BASE64Decoder().decodeBuffer(license));
-								//将申请人,共同申请人,担保人等信息传入该类构建xml入参参数
-								String  inConditions = SoapRequest.XMLConfiguration(borrowerResult,coborrowerResult,guarantorResultList);
 								String result  = NciicClient.executeClient("NciicServices",decode,inConditions);
 								Document document = DocumentHelper.parseText(result);
 								Element rootElement = document.getRootElement();
diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java b/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java
index b06de9bed..e96f3a21a 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java
@@ -5,7 +5,8 @@ import com.amarsoft.are.jbo.BizObject;
 
 public class SoapRequest {
 			
-			public static String XMLConfiguration(BizObject biz1,BizObject biz2,List<BizObject> bizList) throws Exception {
+			//自然人拼接请求XML方法
+			public static String FirstXMLConfiguration(BizObject biz1,BizObject biz2,List<BizObject> bizList) throws Exception {
 			        StringBuffer sb = new StringBuffer("");
 			        if(bizList.size()>0 && biz2 != null){
 			        	sb.append(BaseXMLConfiguration(biz1));
@@ -52,6 +53,44 @@ public class SoapRequest {
 			        System.out.println(xmldata);
 			        return xmldata;
 			}
+			//法人拼接请求XML方法
+			public static String SecondXMLConfiguration(BizObject biz2,List<BizObject> bizList) throws Exception {
+		        		StringBuffer sb = new StringBuffer("");
+		        		sb.append("<?xml version='1.0' encoding='UTF-8'?>");
+				        sb.append("<ROWS>");
+				        sb.append("<INFO>");
+				        sb.append("<SBM>安鹏国际融资租赁有限公司</SBM>");
+				        sb.append("</INFO>");
+				        sb.append("<ROW>");
+				        sb.append("<GMSFHM>公民身份号码</GMSFHM>");
+				        sb.append("<XM>姓名</XM>");
+				        sb.append("</ROW>");
+				        if(biz2 != null){
+				        	 	sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
+						        //入参共同申请人身份证号码
+						        sb.append("<GMSFHM>"+biz2.getAttribute("certid").getString()+"</GMSFHM>");
+						        //入参共同申请人姓名
+						        sb.append("<XM>"+biz2.getAttribute("name").getString()+"</XM>");	
+						        sb.append("</ROW>");
+				        }
+				        if(bizList != null){
+					        	for(int i=0;i<bizList.size();i++){
+						        	sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
+							        //入参共同申请人身份证号码
+							        sb.append("<GMSFHM>"+bizList.get(i).getAttribute("CERTID").getString()+"</GMSFHM>");
+							        //入参共同申请人姓名
+							        sb.append("<XM>"+bizList.get(i).getAttribute("FULLNAME").getString()+"</XM>");	
+							        sb.append("</ROW>");
+						         }
+				        }		        
+				        sb.append("</ROWS>");
+				        System.out.println("HttpClient 发送SOAP请求");
+				        String xmldata = sb.toString();
+				        System.out.println(xmldata);
+		        		return xmldata;
+			}
+			
+			//自然人公共方法
 			public static String BaseXMLConfiguration(BizObject biz1){
 					try {
 							StringBuffer sb = new StringBuffer("");

From e7376676f1a8487ea7f679f0ad6c0d263c21e803 Mon Sep 17 00:00:00 2001
From: jianghongdong <jianghd@tenwa.com.cn>
Date: Fri, 20 Jul 2018 19:14:09 +0800
Subject: [PATCH 18/19] =?UTF-8?q?1.=E8=AE=BE=E7=BD=AE=E5=95=86=E5=AE=9A?=
 =?UTF-8?q?=E7=BD=9A=E6=81=AF=E5=B8=A6=E5=87=BA=E9=80=BE=E6=9C=9F=E7=BD=9A?=
 =?UTF-8?q?=E6=81=AF=202.=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E4=BF=9D?=
 =?UTF-8?q?=E8=AF=81=E9=87=91=E4=BD=99=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LCContractTerminateInfo.jsp                   |  2 ++
 .../amarsoft/dict/als/manage/ColRelativeInfo.java | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp
index df835378e..8cbb13819 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp
@@ -128,6 +128,8 @@ String nodeNo=CurPage.getParameter("NodeNo");
 	
 	jQuery(function(){
 		setItemValue(0,0,"flowunid","<%=flowunid%>");
+		//设置商定罚息带出逾期罚息
+		setItemValue(0,0,"AGREED_PENALTY",getItemValue(0,0,'DUN_PENALTY'));
 		//判断其他应收和其他应退是否为空
 		var  otherIn = getItemValue(0,getRow(),"OTHER_IN"); 
 		var  otherOut = getItemValue(0,getRow(),"OTHER_OUT");
diff --git a/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java b/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java
index 4a0329356..7f1ea2ca3 100644
--- a/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java
+++ b/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java
@@ -263,4 +263,19 @@ public class ColRelativeInfo {
 		}
 		return provices;
 	}
+	//获取保证金余额 MARGIN_BALANCE
+	public static String getMarginBalance(String planID,String factMoney) throws JBOException{
+		BizObject bo = JBOFactory.createBizObjectQuery(LC_FUND_PLAN.CLASS_NAME, "ID=:PLANID")
+				.setParameter("PLANID", planID).getSingleResult(false);
+		String PlanMoney = bo != null?bo.getAttribute("plan_money").getString():"";
+		if(PlanMoney!=""&&factMoney!=""){
+			BigDecimal num = new BigDecimal(PlanMoney);
+			BigDecimal num1 = new BigDecimal(factMoney);
+			if(num.subtract(num1).doubleValue()>0){
+				return num.subtract(num1).doubleValue()+"";
+			}
+			return "0";
+		}
+		return "0";
+	}
 }

From 4cfbca71a7886f4c7f63c01ef2106ab1bf8ab610 Mon Sep 17 00:00:00 2001
From: liuz <liuz@DESKTOP-BF9USEF>
Date: Fri, 20 Jul 2018 19:23:12 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91=E6=94=B6?=
 =?UTF-8?q?=E5=8F=96=E5=AD=97=E6=AE=B5=E5=80=BC=E7=9A=84=E5=B8=A6=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
index 42f6e056e..7fa0e57f4 100644
--- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
+++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
@@ -28,7 +28,8 @@
 	if("ReadOnly".equals(rightType)){
 	dwTemp.ReadOnly = "1";//只读模式
 	}
-	
+	String acc_number = Sqlca.getString("select acc_number from OWN_ACCOUNT where acc_number='755915678910506'");
+	String acc_bank = Sqlca.getString("select acc_bank from OWN_ACCOUNT where acc_number='755915678910506'");
 	dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
 	dwTemp.getDataObject().setVisible("CAUTION_MONEY", true);
 	String sButtons[][] = {
@@ -37,7 +38,10 @@
 	};
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
-
+	window.onload=function(){
+		setItemValue(0,0,"LOCAL_ACCOUNT",'<%=acc_number%>');
+		setItemValue(0,0,"LOCAL_BANK",'<%=acc_bank%>');
+	}
 
 
 	var sFlowUnid = "<%=sFlowUnid%>";