From aa8d307c3e5cb3509a3c9703cefdffd966eae958 Mon Sep 17 00:00:00 2001
From: user <user@Lenovo-y50>
Date: Fri, 15 Jun 2018 15:41:33 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessApplication/BusinessProjectTempInfo.jsp        | 2 +-
 .../BusinessApproval/ProjectApprovalCreationInfo.jsp       | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
index 2b3525e4b..c1e568457 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
@@ -35,7 +35,7 @@
 	String userll=null;
 	userll="/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp?CompClientID=";
 	if("01".equals(custype)){
-	userll="/Tenwa/Customer/Lessee/Person/LegalPersonApplicationInfo.jsp?CompClientID=";
+	userll="/Tenwa/Customer/Lessee/Person/LPApplicationInfoTemp.jsp?CompClientID=";
 	}
 	
 	
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
index 74280d0f0..556b93507 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
@@ -228,7 +228,6 @@
 		<%/*~[Describe=选择产品;]~*/%>
 		 function selectBusinessType()
 		  { 
-			 
 			 var carAttributes = getItemValue(0,getRow(),"carAttributes");
 			 var leasehold = getItemValue(0,getRow(),"leasehold");
 			 
@@ -241,7 +240,7 @@
 											return;
 								}
 								sReturn = sReturn.split("@");
-// 								alert(sReturn);
+//  								alert(sReturn);
 								setItemValue(0,0,"productId",sReturn[0]);
 								setItemValue(0,0,"productName",sReturn[1]);
 								},"请选择产品",'');
@@ -254,12 +253,12 @@
 											return;
 								}
 								sReturn = sReturn.split("@");
-// 								alert(sReturn);
+//  								alert(sReturn);
 								setItemValue(0,0,"productId",sReturn[0]);
 								setItemValue(0,0,"productName",sReturn[1]);
 								},"请选择产品",'');
 			 }
-			  
+
 		 }
 		 
 		 <%/*~[Describe=选择客户;]~*/%>

From 55486165b348e4ea428fd2c8ff5aa84e4c8e857d Mon Sep 17 00:00:00 2001
From: user <user@Lenovo-y50>
Date: Fri, 15 Jun 2018 16:34:20 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E6=B3=95=E4=BA=BA=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Project/BusinessApplication/BusinessProjectTempInfo.jsp     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
index c1e568457..259ca279c 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
@@ -26,12 +26,14 @@
 	String certid =CurPage.getParameter("certid");
 	//String sTempletNo = "BusinessProjectTempInfo_temp";//--模板号--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	
 	//租赁形式set只读
 	if((null!=sPhaseNo&&sPhaseNo.equals("0010")) && ("BusinessApplyFlow".equals(FlowNo) ||"BusinessChangeFlow".equals(FlowNo))){
 		doTemp.setReadOnly("LEAS_FORM", true);
 		doTemp.setReadOnly("PROJECT_SOURCE", false);
 	
 	}
+	
 	String userll=null;
 	userll="/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp?CompClientID=";
 	if("01".equals(custype)){

From 629af5be3bcb1db7e9297e6b4ed92a566c425125 Mon Sep 17 00:00:00 2001
From: user <user@Lenovo-y50>
Date: Fri, 15 Jun 2018 16:37:57 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E6=B3=95=E4=BA=BA=E4=BF=A1=E6=81=AF=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Lessee/Person/LPApplicationInfoTemp.jsp   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 WebContent/Tenwa/Customer/Lessee/Person/LPApplicationInfoTemp.jsp

diff --git a/WebContent/Tenwa/Customer/Lessee/Person/LPApplicationInfoTemp.jsp b/WebContent/Tenwa/Customer/Lessee/Person/LPApplicationInfoTemp.jsp
new file mode 100644
index 000000000..2883a137f
--- /dev/null
+++ b/WebContent/Tenwa/Customer/Lessee/Person/LPApplicationInfoTemp.jsp
@@ -0,0 +1,31 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	/*
+        Author: undefined 2018-06-15
+        Content: 示例详情页面
+        History Log: 
+    */
+	String sPrevUrl = CurPage.getParameter("PrevUrl");
+	if(sPrevUrl == null) sPrevUrl = "";
+
+	String sTempletNo = "LPApplicationInfoTemp";//--模板号--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	doTemp.setColTips("", "");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	//dwTemp.ReadOnly = "-2";//只读模式
+	dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid"));
+	
+	String sButtons[][] = {
+		{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
+		{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
+	};
+	sButtonPosition = "south";
+	
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+	function returnList(){
+		 AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file

From 6a132c690f84568f6d9719ae1de9fdbf3f68ea03 Mon Sep 17 00:00:00 2001
From: user <user@Lenovo-y50>
Date: Fri, 15 Jun 2018 16:51:39 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=AE=8C=E6=95=B4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tenwa/Customer/Lessee/Person/LPApplicationInfoTemp.jsp      | 1 -
 .../Project/BusinessApplication/BusinessProjectTempInfo.jsp     | 2 --
 .../Project/BusinessApproval/ProjectApprovalCreationInfo.jsp    | 1 -
 .../project/projectapproval/BusinessApprovalStartAction.java    | 1 +
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/WebContent/Tenwa/Customer/Lessee/Person/LPApplicationInfoTemp.jsp b/WebContent/Tenwa/Customer/Lessee/Person/LPApplicationInfoTemp.jsp
index 2883a137f..c199f59f2 100644
--- a/WebContent/Tenwa/Customer/Lessee/Person/LPApplicationInfoTemp.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Person/LPApplicationInfoTemp.jsp
@@ -21,7 +21,6 @@
 		{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
 	};
 	sButtonPosition = "south";
-	
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	function returnList(){
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
index 259ca279c..bafa919d6 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
@@ -26,7 +26,6 @@
 	String certid =CurPage.getParameter("certid");
 	//String sTempletNo = "BusinessProjectTempInfo_temp";//--模板号--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
-	
 	//租赁形式set只读
 	if((null!=sPhaseNo&&sPhaseNo.equals("0010")) && ("BusinessApplyFlow".equals(FlowNo) ||"BusinessChangeFlow".equals(FlowNo))){
 		doTemp.setReadOnly("LEAS_FORM", true);
@@ -40,7 +39,6 @@
 	userll="/Tenwa/Customer/Lessee/Person/LPApplicationInfoTemp.jsp?CompClientID=";
 	}
 	
-	
 	ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
 	dwTemp.setGroupHidden("0020");
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
index 556b93507..32b34a0db 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
@@ -137,7 +137,6 @@
 			}
 		}
 		
-		
 		/*~[Describe=确认新增申请;InputParam=无;OutPutParam=无;]~*/
 		function doCreation()
 		{
diff --git a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
index 4d3e820af..c992cd311 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
@@ -61,6 +61,7 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{
 		this.FlowParam.put("carSeries", getCarSeries());
 	}
 	
+	
 	public String getProductModel() {
 		return productModel;
 	}

From 725eeb6f5f13e3f87f26d34632f916131379d5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A3=8A?= <寮犵@LAPTOP-O3DO03BA>
Date: Fri, 15 Jun 2018 20:40:01 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E4=BA=8C=E6=89=8B=E8=BD=A6=E8=BD=A6?=
 =?UTF-8?q?=E5=9E=8B=E5=BA=93=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/a3web.xml              |   4 +-
 .../awe/config/InitSecondHandCarConfig.java   |  31 ++
 .../awe/config/SecondHandCarProperties.java   |  42 +++
 .../QueryVehicleModeListAction.java           | 308 +++++++++---------
 .../lease/util/VehicleAppraisementUtil.java   |   6 +-
 5 files changed, 243 insertions(+), 148 deletions(-)
 create mode 100644 src/com/amarsoft/app/awe/config/InitSecondHandCarConfig.java
 create mode 100644 src/com/amarsoft/app/awe/config/SecondHandCarProperties.java

diff --git a/WebContent/WEB-INF/etc/a3web.xml b/WebContent/WEB-INF/etc/a3web.xml
index c44c01b79..9313faece 100644
--- a/WebContent/WEB-INF/etc/a3web.xml
+++ b/WebContent/WEB-INF/etc/a3web.xml
@@ -29,6 +29,8 @@
 	<!--为满足程序和文档分开的需要，下面指定的文档保存、下载路径一般都为绝对路径 -->
 	<!--FileSavePath Remark 文件保存路径 在FileSaveMode为Disk指定，如果指定目录不存在则保存在WEB-INF的Upload下 -->
 	<FileSavePath>d:/tmp/als/Upload</FileSavePath>
+	<!--接口代收文件送盘、回盘位置 -->
+	<InterfaceFileSavePath>d:/tmp/InterFace</InterfaceFileSavePath>
 	<!--文件模板位置 -->
 	<fileTemplatePath>fileTemplate</fileTemplatePath>
 	<!--WorkDocSavePath Remark 格式化文档保存路径，如果指定目录不存在则保存在WEB-INF的WorkDoc下 -->
@@ -89,7 +91,7 @@
 
 
 	<!-- =======车300接口===== -->
-	<CAR_TOKEN>ee450692cbd24e8bacb27b6f46b4d752</CAR_TOKEN>
+	<CAR_TOKEN>a6b83424b55410c36415178002f8415e</CAR_TOKEN>
 	<CAR_BRAND>http://api.che300.com/service/getCarBrandList</CAR_BRAND>
 	<CAR_BRAND_SERIES>http://api.che300.com/service/getCarSeriesList
 	</CAR_BRAND_SERIES>
diff --git a/src/com/amarsoft/app/awe/config/InitSecondHandCarConfig.java b/src/com/amarsoft/app/awe/config/InitSecondHandCarConfig.java
new file mode 100644
index 000000000..6950e4d3d
--- /dev/null
+++ b/src/com/amarsoft/app/awe/config/InitSecondHandCarConfig.java
@@ -0,0 +1,31 @@
+package com.amarsoft.app.awe.config;
+
+import javax.servlet.http.HttpServlet;
+import org.springframework.web.context.ContextLoader;
+import org.springframework.web.context.WebApplicationContext;
+
+/**
+ * @author 张磊
+ * @date 2018年6月14日
+ */
+public class InitSecondHandCarConfig extends HttpServlet {
+
+			private static final long serialVersionUID = 1L;
+			
+			public static final String PREFIX;
+			
+			public static final String TOKEN;
+			
+			public static final String OPER;
+			
+			public static final String VERSION;
+			
+			static {
+					 WebApplicationContext wac = ContextLoader.getCurrentWebApplicationContext();
+					 SecondHandCarProperties secondHandCarProperties = wac.getBean("secondHandCarConfig",SecondHandCarProperties.class);
+					 TOKEN = secondHandCarProperties.getToken();
+					 OPER = secondHandCarProperties.getOper();
+					 PREFIX = secondHandCarProperties.getPrefix();
+					 VERSION = secondHandCarProperties.getVersion();
+			}
+}
diff --git a/src/com/amarsoft/app/awe/config/SecondHandCarProperties.java b/src/com/amarsoft/app/awe/config/SecondHandCarProperties.java
new file mode 100644
index 000000000..3b42300a6
--- /dev/null
+++ b/src/com/amarsoft/app/awe/config/SecondHandCarProperties.java
@@ -0,0 +1,42 @@
+package com.amarsoft.app.awe.config;
+/**
+ * 二手车配置文件类
+ * @author 张磊
+ * @date 2018年6月14日
+ */
+public class SecondHandCarProperties {
+				
+				private String prefix;
+				
+				private String token;
+				
+				private String oper;
+				
+				private String version;
+				
+				public String getPrefix() {
+					return prefix;
+				}
+				public void setPrefix(String prefix) {
+					this.prefix = prefix;
+				}
+				public String getToken() {
+					return token;
+				}
+				public void setToken(String token) {
+					this.token = token;
+				}
+				public String getOper() {
+					return oper;
+				}
+				public void setOper(String oper) {
+					this.oper = oper;
+				}
+				public String getVersion() {
+					return version;
+				}
+				public void setVersion(String version) {
+					this.version = version;
+				}
+						
+}
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java
index 311543e47..18ab75f86 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java
@@ -3,19 +3,25 @@ package com.tenwa.lease.app.quartzmession;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import jbo.com.tenwa.lease.carbrand.LB_CARDATA_BRAND;
 import jbo.com.tenwa.lease.carbrand.LB_CARDATA_MODEL;
 import jbo.com.tenwa.lease.carbrand.LB_CARDATA_SERIES;
+import jbo.com.tenwa.lease.carbrand.LB_CARDATA_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.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 QueryVehicleModeListAction implements Job{
 
@@ -27,12 +33,25 @@ public class QueryVehicleModeListAction implements Job{
 			 		BizObjectManager bm1 = JBOFactory.getBizObjectManager(LB_CARDATA_BRAND.CLASS_NAME, tx);
 			 		BizObjectManager bm2 = JBOFactory.getBizObjectManager(LB_CARDATA_SERIES.CLASS_NAME, tx);
 			 		BizObjectManager bm3 = JBOFactory.getBizObjectManager(LB_CARDATA_MODEL.CLASS_NAME, tx);
-			 		//url未知
-			 		/*String url = "http://api.che300.com/service/getCarModelList?token=8192047c7ab1a654eda8fbce470062f0&seriesId=";
-			 		String responseResult = VehicleAppraisementUtil.getResponseResult(url);*/
-			 		String filePath = "D://che300yasuo.txt";
-			 		//String readFile = ReadJSON.ReadFile(filePath);
-			 		JSONObject object = JSONObject.parseObject("此处待接口通了之后再导入接口返回的JSON字符串");
+			 		BizObjectManager bm4 = JBOFactory.getBizObjectManager(LB_CARDATA_VERSION.CLASS_NAME, tx);
+			 		//接口url中的fromVersion参数
+			 		String fromVersion = null;
+			 		//开关，作用是若判断为第一次调用接口，保存版本信息到Version表，而不是第一次调用时则将这个值变为true，则更新版本表
+			 		boolean versionflag = false;
+			 		//查询二手车版本表,若为空则说明是第一次调用二手车车型库接口
+			 		BizObject versionResult = bm4.createQuery("select O.currentversion,O.initialversion from O").getSingleResult(false);
+			 		if(versionResult == null){
+			 				fromVersion = InitSecondHandCarConfig.VERSION;
+			 		}else{
+			 				fromVersion = versionResult.getAttribute("currentversion").toString();
+			 				versionflag = true;
+			 		}
+			 		String url = "http://"+InitSecondHandCarConfig.PREFIX+".che300.com/service/common/eval?fromVersion="
+			 							+fromVersion+"&token="+InitSecondHandCarConfig.TOKEN+"";
+			 		String responseResult = VehicleAppraisementUtil.getResponseResult(url);
+			 		
+			 		//使用fastjson解析接口返回的json数据
+			 		JSONObject object = JSONObject.parseObject(responseResult);
 			 		JSONObject dataObject = (JSONObject) object.get("data");
 			 		@SuppressWarnings("rawtypes")
 					List<HashMap> brandList = JSON.parseArray(JSON.toJSONString(dataObject.get("brand")), HashMap.class);
@@ -47,146 +66,145 @@ public class QueryVehicleModeListAction implements Job{
 					List<HashMap> versionList = JSON.parseArray(JSON.toJSONString(dataObject.get("version")), HashMap.class);
 			 		@SuppressWarnings("unchecked")
 					Map<String,Object> map = versionList.get(0);
-	 		for(int i=0;i<brandList.size();i++){
-	 						 if("新增".equals(brandList.get(i).get("oper_type"))){
-	 						 BizObject brandObject = bm1.newObject();
-	 			    	 	 brandObject.setAttributeValue("brandid",brandList.get(i).get("brand_id"));
-	 			    	 	 brandObject.setAttributeValue("brandname",brandList.get(i).get("brand_name"));
-	 			    	 	 brandObject.setAttributeValue("brandinitial",brandList.get(i).get("brand_initial"));
-	 			    	 	 brandObject.setAttributeValue("opertype",brandList.get(i).get("oper_type"));
-	 			    	 	 brandObject.setAttributeValue("modeltimestamp",map.get("ModelTimestamp"));
-	 			    	 	 brandObject.setAttributeValue("seriestimestamp", map.get("SeriesTimestamp"));
-	 			    	 	 brandObject.setAttributeValue("brandtimestamp", map.get("BrandTimestamp"));
-	 			    	 	 brandObject.setAttributeValue("currentversion", map.get("CurrentVersion"));
-	 			    	 	 brandObject.setAttributeValue("initialversion", map.get("InitialVersion"));
-	 			    	 	 bm1.saveObject(brandObject);
-	 						 }else if("更新".equals(brandList.get(i).get("oper_type"))){
-	 							 //更新的操作
-					         bm1.createQuery("update O set brandname=:BRANDNAME,brandinitial=:BRANDINITIAL"
-	 						 +",opertype=:OPERTYPE,modeltimestamp=:MODELTIMESTAMP"
-	 						 +",seriestimestamp=:SERIESTIMESTAMP,brandtimestamp=:BRANDTIMESTAMP"
-	 						 +",currentversion=:CURRENTVERSION,initialversion=:INITIALVERSION"
-	 						 +"where brandid=:BRANDID")
-	 						 .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("MODELTIMESTAMP", brandList.get(i).get("ModelTimestamp").toString())
-	 						 .setParameter("SERIESTIMESTAMP", brandList.get(i).get("SeriesTimestamp").toString())
-	 						 .setParameter("BRANDTIMESTAMP",brandList.get(i).get("BrandTimestamp").toString())
-	 						 .setParameter("CURRENTVERSION", brandList.get(i).get("CurrentVersion").toString())
-	 						 .setParameter("INITIALVERSION",brandList.get(i).get("InitialVersion").toString())
-	 						 .setParameter("BRANDID", brandList.get(i).get("brand_id").toString()).executeUpdate();
-	 						 }else{
-	 							      continue;
-	 						 }
+			 //判断解析出的brandList是否为空,若不为空则执行
+			if(!brandList.isEmpty()){
+						for(int i=0;i<brandList.size();i++){
+							 if("新增".equals(brandList.get(i).get("oper_type"))){
+							 BizObject brandObject = bm1.newObject();
+				    	 	 brandObject.setAttributeValue("brandid",brandList.get(i).get("brand_id"));
+				    	 	 brandObject.setAttributeValue("brandname",brandList.get(i).get("brand_name"));
+				    	 	 brandObject.setAttributeValue("brandinitial",brandList.get(i).get("brand_initial"));
+				    	 	 brandObject.setAttributeValue("opertype",brandList.get(i).get("oper_type"));
+				    	 	 brandObject.setAttributeValue("brandtimestamp", map.get("BrandTimestamp"));
+				    	 	 brandObject.setAttributeValue("initialversion", map.get("InitialVersion"));
+				    	 	 bm1.saveObject(brandObject);
+							 }else if("更新".equals(brandList.get(i).get("oper_type"))){
+								 //更新的操作
+					         bm1.createQuery("update O set brandname=:BRANDNAME"
+					         		+ ",brandinitial=:BRANDINITIAL"
+					         		+",opertype=:OPERTYPE"
+					         		+",brandtimestamp=:BRANDTIMESTAMP"
+					         		+",initialversion=:INITIALVERSION"
+					         		+"where brandid=:BRANDID")
+							 .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();
+							 }else{
+								      continue;
+							 }
+						}
+			}
+			//同上理
+	 		if(!seriesList.isEmpty()){
+			 			for(int i=0;i<seriesList.size();i++){
+				 			 if("新增".equals(seriesList.get(i).get("oper_type"))){
+							 BizObject seriesObject = bm2.newObject();
+					    	 seriesObject.setAttributeValue("brandid",seriesList.get(i).get("brand_id"));
+					    	 seriesObject.setAttributeValue("brandname",seriesList.get(i).get("brand_name"));
+					    	 seriesObject.setAttributeValue("seriesid",seriesList.get(i).get("series_id"));
+					    	 seriesObject.setAttributeValue("seriesname",seriesList.get(i).get("series_name"));
+					    	 seriesObject.setAttributeValue("seriesgroupname", seriesList.get(i).get("series_group_name"));
+					    	 seriesObject.setAttributeValue("levelname",seriesList.get(i).get("level_name"));
+					    	 seriesObject.setAttributeValue("makertype", seriesList.get(i).get("maker_type"));
+					    	 seriesObject.setAttributeValue("opertype",seriesList.get(i).get("oper_type"));		 			    	
+					    	 seriesObject.setAttributeValue("seriestimestamp", map.get("SeriesTimestamp"));	 			    	
+					    	 seriesObject.setAttributeValue("initialversion", map.get("InitialVersion"));
+					    	 bm2.saveObject(seriesObject);
+				 			 }else if("更新".equals(seriesList.get(i).get("oper_type"))){
+								 //更新的操作
+						 		 bm2.createQuery("update O set brandname=:BRANDNAME"
+								 +",brandid=:BRANDID,seriesname=:SERIESNAME,seriesgroupname=:SERIESGROUPNAME"
+								 +",levelname=:LEVELNAME,makertype=:MAKERTYPE"
+								 +",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();
+							 }else{
+								      continue;
+							 }
+			 		}
 	 		}
-	 		for(int i=0;i<seriesList.size();i++){
-	 			 			 if("新增".equals(seriesList.get(i).get("oper_type"))){
-	 						 BizObject seriesObject = bm2.newObject();
-		 			    	 seriesObject.setAttributeValue("brandid",seriesList.get(i).get("brand_id"));
-		 			    	 seriesObject.setAttributeValue("brandname",seriesList.get(i).get("brand_name"));
-		 			    	 seriesObject.setAttributeValue("seriesid",seriesList.get(i).get("series_id"));
-		 			    	 seriesObject.setAttributeValue("seriesname",seriesList.get(i).get("series_name"));
-		 			    	 seriesObject.setAttributeValue("seriesgroupname", seriesList.get(i).get("series_group_name"));
-		 			    	 seriesObject.setAttributeValue("levelname",seriesList.get(i).get("level_name"));
-		 			    	 seriesObject.setAttributeValue("makertype", seriesList.get(i).get("maker_type"));
-		 			    	 seriesObject.setAttributeValue("opertype",seriesList.get(i).get("oper_type"));
-		 			    	 seriesObject.setAttributeValue("modeltimestamp",map.get("ModelTimestamp"));
-		 			    	 seriesObject.setAttributeValue("seriestimestamp", map.get("SeriesTimestamp"));
-		 			    	 seriesObject.setAttributeValue("brandtimestamp", map.get("BrandTimestamp"));
-		 			    	 seriesObject.setAttributeValue("currentversion", map.get("CurrentVersion"));
-		 			    	 seriesObject.setAttributeValue("initialversion", map.get("InitialVersion"));
-		 			    	 bm2.saveObject(seriesObject);
-	 			 			 }else if("更新".equals(seriesList.get(i).get("oper_type"))){
-	 							 //更新的操作
-		 				 		 bm2.createQuery("update O set brandname=:BRANDNAME"
-		 						 +",brandid=:BRANDID,seriesname=:SERIESNAME,seriesgroupname=:SERIESGROUPNAME"
-		 						 +",levelname=:LEVELNAME,makertype=:MAKERTYPE"
-		 						 +",opertype=:OPERTYPE,modeltimestamp=:MODELTIMESTAMP"
-		 						 +",seriestimestamp=:SERIESTIMESTAMP,brandtimestamp=:BRANDTIMESTAMP"
-		 						 +",currentversion=:CURRENTVERSION,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("MODELTIMESTAMP", seriesList.get(i).get("ModelTimestamp").toString())
-		 						 .setParameter("SERIESTIMESTAMP", seriesList.get(i).get("SeriesTimestamp").toString())
-		 						 .setParameter("BRANDTIMESTAMP",seriesList.get(i).get("BrandTimestamp").toString())
-		 						 .setParameter("CURRENTVERSION", seriesList.get(i).get("CurrentVersion").toString())
-		 						 .setParameter("INITIALVERSION",seriesList.get(i).get("InitialVersion").toString())
-		 						 .setParameter("SERIESID", seriesList.get(i).get("series_id").toString()).executeUpdate();
-	 						 }else{
-	 							      continue;
-	 						 }
-	 	    }
-	 		for(int i=0;i<modelList.size();i++){
-	 					if("新增".equals(modelList.get(i).get("oper_type"))){
-	 						 BizObject modelObject = bm3.newObject();
-				 			 modelObject.setAttributeValue("brandid",modelList.get(i).get("brand_id"));
-				 			 modelObject.setAttributeValue("brandname",modelList.get(i).get("brand_name"));
-				 			 modelObject.setAttributeValue("seriesid",modelList.get(i).get("series_id"));
-				 			 modelObject.setAttributeValue("seriesname",modelList.get(i).get("series_name"));
-				 			 modelObject.setAttributeValue("seriesgroupname", modelList.get(i).get("series_group_name"));
-				 			 modelObject.setAttributeValue("modelid",modelList.get(i).get("model_id"));
-				 			 modelObject.setAttributeValue("modelname",modelList.get(i).get("model_name"));
-				 			 modelObject.setAttributeValue("price",modelList.get(i).get("price"));
-				 			 modelObject.setAttributeValue("liter",modelList.get(i).get("liter"));
-				 			 modelObject.setAttributeValue("geartype",modelList.get(i).get("gear_type"));
-				 			 modelObject.setAttributeValue("modelyear",modelList.get(i).get("model_year"));
-				 			 modelObject.setAttributeValue("makertype", modelList.get(i).get("maker_type"));
-				 			 modelObject.setAttributeValue("dischargestandard",modelList.get(i).get("discharge_standard"));
-				 			 modelObject.setAttributeValue("seatnumber",modelList.get(i).get("seat_number"));
-				 			 modelObject.setAttributeValue("minregyear",modelList.get(i).get("min_reg_year"));
-				 			 modelObject.setAttributeValue("maxregyear",modelList.get(i).get("max_reg_year"));
-				 			 modelObject.setAttributeValue("opertype",modelList.get(i).get("oper_type"));
-				 			 modelObject.setAttributeValue("modeltimestamp",map.get("ModelTimestamp"));
-				 			 modelObject.setAttributeValue("seriestimestamp", map.get("SeriesTimestamp"));
-				 			 modelObject.setAttributeValue("brandtimestamp", map.get("BrandTimestamp"));
-				 			 modelObject.setAttributeValue("currentversion", map.get("CurrentVersion"));
-				 			 modelObject.setAttributeValue("initialversion", map.get("InitialVersion"));
-				 			 bm3.saveObject(modelObject);
-	 					}else if("更新".equals(modelList.get(i).get("oper_type"))){
-							 bm3.createQuery("update O set brandname=:BRANDNAME"
-					         +",brandid=:BRANDID,seriesid=:SERIESID"
-	 						 + ",seriesname=:SERIESNAME,seriesgroupname=:SERIESGROUPNAME"
-	 						 +",modelname=:MODELNAME,price=:PRICE"
-	 						 +",liter=:LITER,geartype=:GEARTYPE,modelyear=:MODELYEAR"
-	 						 +",makertype=:MAKERTYPE,dischargestandard=:DISCHARGESTANDARD"
-	 						 +",seatnumber=:SEATNUMBER,minregyear=:MINREGYEAR,maxregyear=:MAXREGYEAR"
-	 						 +",opertype=:OPERTYPE,modeltimestamp=:MODELTIMESTAMP"
-	 						 +",seriestimestamp=:SERIESTIMESTAMP,brandtimestamp=:BRANDTIMESTAMP"
-	 						 +",currentversion=:CURRENTVERSION,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", modelList.get(i).get("ModelTimestamp").toString())
-	 						 .setParameter("SERIESTIMESTAMP", modelList.get(i).get("SeriesTimestamp").toString())
-	 						 .setParameter("BRANDTIMESTAMP",modelList.get(i).get("BrandTimestamp").toString())
-	 						 .setParameter("CURRENTVERSION", modelList.get(i).get("CurrentVersion").toString())
-	 						 .setParameter("INITIALVERSION",modelList.get(i).get("InitialVersion").toString())
-	 						 .setParameter("MODELID", modelList.get(i).get("model_id").toString()).executeUpdate();
-	 					}else{
-	 								continue;
-	 					}
-	 		 }
+	 		//同上理
+	 		if(!modelList.isEmpty()){
+				 			for(int i=0;i<modelList.size();i++){
+			 					if("新增".equals(modelList.get(i).get("oper_type"))){
+			 						 BizObject modelObject = bm3.newObject();
+						 			 modelObject.setAttributeValue("brandid",modelList.get(i).get("brand_id"));
+						 			 modelObject.setAttributeValue("brandname",modelList.get(i).get("brand_name"));
+						 			 modelObject.setAttributeValue("seriesid",modelList.get(i).get("series_id"));
+						 			 modelObject.setAttributeValue("seriesname",modelList.get(i).get("series_name"));
+						 			 modelObject.setAttributeValue("seriesgroupname", modelList.get(i).get("series_group_name"));
+						 			 modelObject.setAttributeValue("modelid",modelList.get(i).get("model_id"));
+						 			 modelObject.setAttributeValue("modelname",modelList.get(i).get("model_name"));
+						 			 modelObject.setAttributeValue("price",modelList.get(i).get("price"));
+						 			 modelObject.setAttributeValue("liter",modelList.get(i).get("liter"));
+						 			 modelObject.setAttributeValue("geartype",modelList.get(i).get("gear_type"));
+						 			 modelObject.setAttributeValue("modelyear",modelList.get(i).get("model_year"));
+						 			 modelObject.setAttributeValue("makertype", modelList.get(i).get("maker_type"));
+						 			 modelObject.setAttributeValue("dischargestandard",modelList.get(i).get("discharge_standard"));
+						 			 modelObject.setAttributeValue("seatnumber",modelList.get(i).get("seat_number"));
+						 			 modelObject.setAttributeValue("minregyear",modelList.get(i).get("min_reg_year"));
+						 			 modelObject.setAttributeValue("maxregyear",modelList.get(i).get("max_reg_year"));
+						 			 modelObject.setAttributeValue("opertype",modelList.get(i).get("oper_type"));
+						 			 modelObject.setAttributeValue("modeltimestamp",map.get("ModelTimestamp"));
+						 			 modelObject.setAttributeValue("initialversion", map.get("InitialVersion"));
+						 			 bm3.saveObject(modelObject);
+			 					}else if("更新".equals(modelList.get(i).get("oper_type"))){
+									 bm3.createQuery("update O set brandname=:BRANDNAME"
+							         +",brandid=:BRANDID,seriesid=:SERIESID"
+			 						 + ",seriesname=:SERIESNAME,seriesgroupname=:SERIESGROUPNAME"
+			 						 +",modelname=:MODELNAME,price=:PRICE"
+			 						 +",liter=:LITER,geartype=:GEARTYPE,modelyear=:MODELYEAR"
+			 						 +",makertype=:MAKERTYPE,dischargestandard=:DISCHARGESTANDARD"
+			 						 +",seatnumber=:SEATNUMBER,minregyear=:MINREGYEAR,maxregyear=:MAXREGYEAR"
+			 						 +",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();
+			 					}else{
+			 								continue;
+			 					}
+				 		}
+	 		  }
+	 		if(versionflag == false){
+	 				BizObject versionObject = bm4.newObject();
+	 				versionObject.setAttributeValue("currentversion",map.get("CurrentVersion").toString());
+	 				versionObject.setAttributeValue("initialversion",map.get("InitialVersion").toString());
+	 				bm4.saveObject(versionObject);
+	 		  }
+	 		bm4.createQuery("update O set currentversion=:CURRENTVERSION,initialversion=:INITIALVERSION")
+	 		.setParameter("CURRENTVERSION",map.get("CurrentVersion").toString())
+	 		.setParameter("INITIALVERSION",map.get("InitialVersion").toString()).executeUpdate();
 		} catch (Exception e) {
 				try {
 					if(null != tx){
diff --git a/src_tenwa/com/tenwa/lease/util/VehicleAppraisementUtil.java b/src_tenwa/com/tenwa/lease/util/VehicleAppraisementUtil.java
index c6d1980a7..6e81c5868 100644
--- a/src_tenwa/com/tenwa/lease/util/VehicleAppraisementUtil.java
+++ b/src_tenwa/com/tenwa/lease/util/VehicleAppraisementUtil.java
@@ -5,11 +5,13 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
+import com.amarsoft.app.awe.config.InitSecondHandCarConfig;
+
 public class VehicleAppraisementUtil {
 				
 			public static String getVehicleAppraisementResponse(String modelId,String zone,String regDate,String mile){
-							String urlStr = "https://api.che300.com/service/getUsedCarPrice?"
-									+"token=ee450692cbd24e8bacb27b6f46b4d752&modelId="+modelId
+							String urlStr = "http://"+InitSecondHandCarConfig.PREFIX+".che300.com/service/getUsedCarPrice?"
+									+"token="+InitSecondHandCarConfig.TOKEN+"&modelId="+modelId
 									+"&regDate="+regDate+"&mile="+mile+"&zone="+zone+"";
 							String result = VehicleAppraisementUtil.getResponseResult(urlStr);
 							return result;

From 7db37a0097ba1b91cb851b0d6d3daf46e0e08ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A3=8A?= <寮犵@LAPTOP-O3DO03BA>
Date: Sat, 16 Jun 2018 10:19:27 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BA=8C=E6=89=8B=E8=BD=A6properties?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/second_handCar.properties | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 config/second_handCar.properties

diff --git a/config/second_handCar.properties b/config/second_handCar.properties
new file mode 100644
index 000000000..cdd337910
--- /dev/null
+++ b/config/second_handCar.properties
@@ -0,0 +1,14 @@
+#che300 prefix
+com.tenwa.zhanglei.prefix=testapi
+
+#che300 token
+#test environment
+com.tenwa.zhanglei.token=a6b83424b55410c36415178002f8415e
+#formal environment
+#com.tenwa.zhanglei.token=0685c8275534d8d391cdaa5a5cf48c73
+
+#che300 operationType
+com.tenwa.zhanglei.oper=exportModel
+
+#che300 initiallversion
+com.tenwa.zhanglei.version=3.4.548
\ No newline at end of file

From 816cfad21f2ba2c54eb72535e5c898b6e8928737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A3=8A?= <寮犵@LAPTOP-O3DO03BA>
Date: Sat, 16 Jun 2018 10:49:05 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E4=BA=8C=E6=89=8B=E8=BD=A6=E8=BD=A6?=
 =?UTF-8?q?=E5=9E=8B=E5=BA=93=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quartzmession/QueryVehicleModeListAction.java   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java
index 18ab75f86..bc99a5ff1 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java
@@ -37,14 +37,14 @@ public class QueryVehicleModeListAction implements Job{
 			 		//接口url中的fromVersion参数
 			 		String fromVersion = null;
 			 		//开关，作用是若判断为第一次调用接口，保存版本信息到Version表，而不是第一次调用时则将这个值变为true，则更新版本表
-			 		boolean versionflag = false;
+			 		boolean versionflag = true;
 			 		//查询二手车版本表,若为空则说明是第一次调用二手车车型库接口
 			 		BizObject versionResult = bm4.createQuery("select O.currentversion,O.initialversion from O").getSingleResult(false);
 			 		if(versionResult == null){
+			 				versionflag = false;
 			 				fromVersion = InitSecondHandCarConfig.VERSION;
 			 		}else{
 			 				fromVersion = versionResult.getAttribute("currentversion").toString();
-			 				versionflag = true;
 			 		}
 			 		String url = "http://"+InitSecondHandCarConfig.PREFIX+".che300.com/service/common/eval?fromVersion="
 			 							+fromVersion+"&token="+InitSecondHandCarConfig.TOKEN+"";
@@ -201,10 +201,11 @@ public class QueryVehicleModeListAction implements Job{
 	 				versionObject.setAttributeValue("currentversion",map.get("CurrentVersion").toString());
 	 				versionObject.setAttributeValue("initialversion",map.get("InitialVersion").toString());
 	 				bm4.saveObject(versionObject);
-	 		  }
-	 		bm4.createQuery("update O set currentversion=:CURRENTVERSION,initialversion=:INITIALVERSION")
-	 		.setParameter("CURRENTVERSION",map.get("CurrentVersion").toString())
-	 		.setParameter("INITIALVERSION",map.get("InitialVersion").toString()).executeUpdate();
+	 		}else{
+	 			bm4.createQuery("update O set currentversion=:CURRENTVERSION,initialversion=:INITIALVERSION")
+		 		.setParameter("CURRENTVERSION",map.get("CurrentVersion").toString())
+		 		.setParameter("INITIALVERSION",map.get("InitialVersion").toString()).executeUpdate();
+	 		}	
 		} catch (Exception e) {
 				try {
 					if(null != tx){

From fb06ecc2730c48a968dc29d16ea4219288fec9d0 Mon Sep 17 00:00:00 2001
From: amarsoft <amarsoft@DESKTOP-3QRILR7>
Date: Sat, 16 Jun 2018 11:48:07 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LmDistributorToproductList.jsp            | 14 +++---
 .../LmProductDistributorCar.jsp               | 38 ++++++++--------
 .../LmProductDistributorList.jsp              | 43 +++++++++++++------
 .../apzl/saveunioncar/saveUnionCarUtil.java   | 24 +++++------
 4 files changed, 68 insertions(+), 51 deletions(-)

diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp
index 673b40444..98127eee0 100644
--- a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp
+++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp
@@ -7,11 +7,11 @@
     */
 	ASObjectModel doTemp = new ASObjectModel("LM_DISTRIBUTOR_TO_PRODUCT");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
- 	String distributorId = CurPage.getParameter("DISTRIBUTOR_ID"); 
+ 	String typeno = CurPage.getParameter("TYPENO"); 
 	dwTemp.Style="1";      	     //--设置为Grid风格--
 	dwTemp.ReadOnly = "1";	 //只读模式
 	dwTemp.setPageSize(10);
-	dwTemp.genHTMLObjectWindow(distributorId);
+	dwTemp.genHTMLObjectWindow(typeno);
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 	String sButtons[][] = {
 		{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
@@ -20,17 +20,15 @@
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
-	function newRecord(){
-		var Return = "<%=CurUser.getUserID()%>@~<%=CurUser.getOrgID()%>@~<%=StringFunction.getTodayNow()%>@~<%=distributorId%>@~";
-		AsDialog.OpenSelector("DistributeProductList","distributorid,<%=distributorId%>","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+	 function newRecord(){
+		var Return = "<%=CurUser.getUserID()%>@~<%=CurUser.getOrgID()%>@~<%=StringFunction.getTodayNow()%>@~<%=typeno%>@~";
+		AsDialog.OpenSelector("DistributeProductList","typeno,<%=typeno%>","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
 			if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){
 				//alert(getHtmlMessage('1'));//请选择一条信息！
 	    			return;
 		  	   }
-				//alert(sReturn);
 			    Return =Return+sReturn;
  				sParams = "CarBrandId="+Return;
- 				//alert(sParams);
  				/*
 					CarBrandId=admin@~
 					8009002@~
@@ -44,7 +42,7 @@
  				}
  				reloadSelf();
 		},"请选择产品");
-	}
+	} 
 	function viewAndEdit(){
 		 var sUrl = "";
 		 var sPara = getItemValue(0,getRow(0),'SerialNo');
diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorCar.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorCar.jsp
index 7c8c55f43..fc6c3a1da 100644
--- a/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorCar.jsp
+++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorCar.jsp
@@ -1,20 +1,20 @@
-<%@ page contentType="text/html; charset=GBK"%><%@
- include file="/IncludeBegin.jsp"%><%
-/*
-	页面说明: 示例上下联动框架页面
- */
-  	String distributorId = CurPage.getParameter("distributorId");  
-%><%@include file="/Resources/CodeParts/Frame02.jsp"%>
-<script type="text/javascript">
-	mytoptd.height=150;
-	OpenList();
-	OpenInfo();
-	function OpenList(){
-		AsControl.OpenView("/Tenwa/Apzl/PortalToCarType/LmDistributorInfo.jsp","distributorId=<%=distributorId%>","rightup");
-	}
-	
-	function OpenInfo(){
-		AsControl.OpenView("/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp", "DISTRIBUTOR_ID=<%=distributorId%>", "rightdown");
-	}
-</script>
+<%@ page contentType="text/html; charset=GBK"%><%@
+ include file="/IncludeBegin.jsp"%><%
+/*
+	页面说明: 示例上下联动框架页面
+ */
+ String TYPENO = CurPage.getParameter("TYPENO");
+%><%@include file="/Resources/CodeParts/Frame02.jsp"%>
+<script type="text/javascript">
+	mytoptd.height=300;
+	OpenList();
+	OpenInfo();
+	function OpenList(){
+		AsControl.OpenView("/Tenwa/Apzl/productCar/LmProductCarInfo.jsp","","rightup");
+	}
+	
+	function OpenInfo(){
+		AsControl.OpenView("/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp","TYPENO=<%=TYPENO%>", "rightdown");
+	}
+</script>
 <%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp
index 30d045714..d156f3d2e 100644
--- a/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp
+++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp
@@ -5,36 +5,55 @@
         Content: 
         History Log: 
     */
-	ASObjectModel doTemp = new ASObjectModel("LM_DISTRIBUTOR_LIST");
-	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); 
+    String PG_TITLE ="汽车产品列表";
+	String TYPENO= CurPage.getParameter("TYPENO");
+	ASObjectModel doTemp = new ASObjectModel("LmProductCarList");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	dwTemp.Style="1";      	     //--设置为Grid风格--
 	dwTemp.ReadOnly = "1";	 //只读模式
 	dwTemp.setPageSize(10);
-	dwTemp.genHTMLObjectWindow("");
+	dwTemp.genHTMLObjectWindow(TYPENO);
 
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 	String sButtons[][] = {
-		{"false","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
-		{"false","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
-		{"false","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+		//{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+		//{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+		//{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
 	function newRecord(){
-		 var sUrl = "";
+		 var sUrl = "/Tenwa/Apzl/productCar/LmProductCarInfo.jsp";
 		 AsControl.OpenView(sUrl,'','_self','');
 	}
+	function viewAndEdit(){
+		var sUrl = "/Tenwa/Apzl/productCar/LmProductUpAndDown.jsp";
+		 var sPara = getItemValue(0,getRow(0),'TYPENO');
+		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
+			alert("参数不能为空！");
+			return ;
+		 }
+		AsControl.OpenView(sUrl,'TYPENO=' +sPara ,'_self','');
+	}
 	function afterSearch(){
 		for(var i=0;i<getRowCount(0);i++){
-			if(getObj(0,i,"EDIT")!=null){
-				getObj(0,i,"EDIT").innerHTML='<a class="box" style="text-align:center;" onclick="showCar(\''+getItemValue(0,i,"ID")+'\')" style={color:#000;text-decoration:underline;}><font color="blue">&nbsp&nbsp&nbsp&nbsp&nbsp编辑</font></ a>';
+			if(getObj(0,i,"action")!=null){
+				getObj(0,i,"action").innerHTML='<a class="box" style="text-align:center;" onclick="showCar(\''+getItemValue(0,i,"TYPENO")+'\')" style={color:#000;text-decoration:underline;}><font color="blue">&nbsp&nbsp&nbsp&nbsp&nbsp编辑</font></ a>';
 			}
 		};
 	}	
-	function showCar(id){
+	function showCar(TYPENO){
 		var sUrl="/Tenwa/Apzl/PortalToCarType/LmProductDistributorCar.jsp";
-		var param="distributorId="+id;
-		AsDialog.PopView(sUrl,param,"dialogWidth=800px;dialogHeight=480px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){reloadSelf();},"配置产品");
+		var sPara = "TYPENO="+TYPENO;
+		AsDialog.PopView(sUrl,sPara,"dialogWidth=1200px;dialogHeight=800px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){reloadSelf();},"配置车辆");
 	}
+	/*
+	function mySelectRow(){
+		 var TYPENO = getItemValue(0,getRow(0),"TYPENO");
+		 parent.OpenInfo(TYPENO);
+		 //list 页面同步info页面的联动传至单击事件
+	}
+		*/
+
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java b/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java
index 1fe991c84..f1f0bc286 100644
--- a/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java
+++ b/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java
@@ -132,25 +132,25 @@ public String getCarBrandId() {
 		String updateUserID = params[0];
 		String updateOrgId = params[1];
 		String updateTime = params[2];
-		String distributorId = params[3];
-		String productid=params[4];
+		String typeno = params[3];
+		//String productid=params[4];
 		int lle=0;
-		BizObjectManager Lmcheck =  JBOFactory.getBizObjectManager(LM_DISTRIBUTOR_TO_PRODUCT.CLASS_NAME,tx);
-		BizObject obcheck=Lmcheck.createQuery("DISTRIBUTOR_ID=:DISTRIBUTOR_ID and PRODUCT_ID=:PRODUCT_ID")
-		.setParameter("DISTRIBUTOR_ID", distributorId).setParameter("PRODUCT_ID",productid).getSingleResult(false);
-	   if(obcheck!=null){
-		   return "error";
-	   }
 		int i;
 	    try{
-			for(i=4;i<params.length;i++){
+	    	BizObjectManager Lmcheck =  JBOFactory.getBizObjectManager(LM_DISTRIBUTOR_TO_PRODUCT.CLASS_NAME,tx);
+			for(i=3;i<params.length;i++){
+				String brandid = params[i];
+				BizObject obcheck=Lmcheck.createQuery("DISTRIBUTOR_ID=:DISTRIBUTOR_ID and PRODUCT_ID=:PRODUCT_ID")
+						.setParameter("DISTRIBUTOR_ID", brandid).setParameter("PRODUCT_ID",typeno).getSingleResult(false);
+				if(obcheck!=null){
+					return "error";
+				}
 				String PortalToCarId=UUID.randomUUID().toString().replaceAll("-", "");
-		    	String brandid = params[i];
 				BizObjectManager Lmpc =  JBOFactory.getBizObjectManager(LM_DISTRIBUTOR_TO_PRODUCT.CLASS_NAME,tx);
 				BizObject NewLmpc = Lmpc.newObject();
 				NewLmpc.setAttributeValue("id", PortalToCarId);
-				NewLmpc.setAttributeValue("product_id", brandid);
-				NewLmpc.setAttributeValue("distributor_id", distributorId);
+				NewLmpc.setAttributeValue("product_id", typeno);
+				NewLmpc.setAttributeValue("distributor_id", brandid);
 				NewLmpc.setAttributeValue("inputUserID", updateUserID);
 				NewLmpc.setAttributeValue("inputOrgId", updateOrgId);
 				NewLmpc.setAttributeValue("inputTime", updateTime);

From b862bd9452d4d061dc6ecd3bb185164d34eb34ea Mon Sep 17 00:00:00 2001
From: user <user@Lenovo-y50>
Date: Sat, 16 Jun 2018 11:57:20 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=AE=A2=E6=88=B7=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectApprovalCreationInfo.jsp           | 19 ++++++++++++++++++-
 .../BusinessApprovalStartAction.java          |  1 +
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
index 32b34a0db..6de107e15 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
@@ -39,6 +39,7 @@
 	<%	
 		String sTempletNo = "BusnessApprovalApplyCreationInfo";//--模板号--
 		ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+		doTemp.setHtmlEvent("Customer_type", "onchange", "setCertType");
 		ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 		dwTemp.Style = "2";//freeform
 		dwTemp.genHTMLObjectWindow(""); 
@@ -274,9 +275,25 @@
 // 							alert(sReturn[1]);
 		 					setItemValue(0,0,"CUSTOMERID",sReturn[0]);
 		 					setItemValue(0,0,"customername",sReturn[1]);
+		 					setCertType();
 							},"请选择客户",'');
 			}
-		 
+			
+			function setCertType(){
+				debugger;
+				 var customerType = getItemValue(0,0,"Customer_type");
+				 if("01" == customerType){
+// 					 if(carType == "stock_car"){
+// 						 AsDebug.showMessage("提示","法人不允许做存量车业务","","",true);
+// 						 setItemValue(0,0,"CUSTOMERTYPE","");
+// 						 setItemValue(0,0,"CERTTYPE","");
+// 						 return;
+// 					 }
+					 setItemValue(0,0,"certtype","Ent01");
+				 }else if("03" == customerType){
+					 setItemValue(0,0,"certtype","Ind01");
+				 }
+			 }
 	 </script>
 <%/*~END~*/%>
 	
diff --git a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
index c992cd311..edfc7c769 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
@@ -17,6 +17,7 @@ import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE;
 import com.amarsoft.app.util.ProductParamUtil;
 import com.amarsoft.are.jbo.BizObject;
 import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.BizObjectQuery;
 import com.amarsoft.are.jbo.JBOException;
 import com.amarsoft.are.jbo.JBOFactory;
 import com.amarsoft.are.jbo.JBOTransaction;

From b24ec986f8fcba89e487631c4ca9ded24636c42f Mon Sep 17 00:00:00 2001
From: zhouyahui <zhouyh@mail2.tenwa.com.cn>
Date: Sat, 16 Jun 2018 14:56:08 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=97=A5=E5=8E=86=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/AppMain/MyCalendar.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebContent/AppMain/MyCalendar.jsp b/WebContent/AppMain/MyCalendar.jsp
index a412994e3..f01eb4ef8 100644
--- a/WebContent/AppMain/MyCalendar.jsp
+++ b/WebContent/AppMain/MyCalendar.jsp
@@ -260,7 +260,7 @@ function fDrawCal(iYear, iMonth, iCellWidth, iCellHeight, sDateTextSize, sDateTe
 	for (var w = 1; w < 7; w++) {
 		sReturn += ("<tr>");
 		for (var d = 0; d < 7; d++) {
-			    tdClickEvent = " onClick=newTask("+myMonth[w][d][0]+","+myMonth[w][d][1]+","+myMonth[w][d][2]+") ";
+// 			    tdClickEvent = " onClick=newTask("+myMonth[w][d][0]+","+myMonth[w][d][1]+","+myMonth[w][d][2]+") ";
 			    if(myMonth[w][d][0] == iYear&&myMonth[w][d][1] == iMonth){
 				      gstype = 'CURSOR:Hand;FONT-FAMILY:Arial;COLOR:#000000;FONT-SIZE:" + sDateTextSize + ";FONT-WEIGHT:" + sDateTextWeight + "';
 				    }else{

From 3dc44cf2cd44831bb06d27dad760159bfee0cc0d Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Sat, 16 Jun 2018 17:41:04 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E7=A7=9F=E9=87=91=E6=B5=8B=E7=AE=97?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A7=A3=E5=86=B3=EF=BC=88=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=89=80=E9=9C=80=E5=AD=97=E6=AE=B5=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/app/component/component-config.xml | 8 ++++----
 .../etc/app/component/component-parameter-config.xml      | 2 +-
 WebContent/WEB-INF/etc/jbo/jbo_calc.xml                   | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index 57277da66..7850d8e84 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -302,7 +302,7 @@
 		</Rules>
 	</Component>
 
-	<Component FORMAT="1" ID="RPT-09" NAME="尾款等额还款" STATUS="2" TYPE="PRD0301">
+	<Component FORMAT="1" ID="RPT-09" NAME="尾款等额还款" STATUS="1" TYPE="PRD0315">
 		<Parameters>
 			<Parameter ARIGHTTYPE="Required" DISPLAYNAME="还款周期" OPTIONALVALUE="1,2,6" OPTIONALVALUENAME="按月,按季,指定周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="还款周期" PRIGHTTYPE="Required" SORTNO="" VALUE="1" VALUENAME="按月"/>
 			<Parameter ARIGHTTYPE="All" DISPLAYNAME="指定周期单位" PARAMETERID="PayFrequencyUnit" PARAMETERNAME="指定周期单位" PRIGHTTYPE="All" SORTNO="" VALUE="M"/>
@@ -1080,7 +1080,7 @@
 	<Component FORMAT="1" ID="EQUIP_AMT" 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"/></Parameters></Component>
 	<Component FORMAT="1" ID="FIRST_PAYMENT" NAME="首付款" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/></Parameters></Component>
 	<Component FORMAT="1" ID="HANDLING_CHARGE_MONEY" NAME="手续费" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方式" PARAMETERID="PoundageStyle" PARAMETERNAME="手续费计算方式" PRIGHTTYPE="Required"/></Parameters></Component>
-	<Component FORMAT="1" ID="CAUTION_MONEY" NAME="承租人风险抵押金" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Hide"/></Parameters></Component>
+	<Component FORMAT="1" ID="CAUTION_MONEY" NAME="承租人风险抵押金" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="保证金计算方式" PARAMETERID="DepositStyle" PARAMETERNAME="保证金计算方式" PRIGHTTYPE="Required"/></Parameters></Component>
 	<Component FORMAT="1" ID="MANAGEMENT_MONEY" NAME="咨询顾问费" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="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_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>
@@ -1095,10 +1095,10 @@
 	<Component FORMAT="1" ID="FIRST_PLAN_DATE" NAME="第一期租金支付日" STATUS="1" TYPE="PRD0311"/><Component FORMAT="1" ID="SECOND_PLAN_DATE" NAME="第二期租金支付日" STATUS="1" TYPE="PRD0311"/><Component FORMAT="1" ID="EQUIP_END_VALUE" NAME="期末余值" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE=""/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE=""/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="INSURE_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="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><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="INSURE_EXPENSE" 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="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><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="NOMINAL_PRICE" NAME="名义货价" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="BEFORE_INTEREST" 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="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="PeriodBeginPayMoney" NAME="期初付款总计" STATUS="1" TYPE="PRD0330"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="公式参数" PARAMETERID="FormulaParam" PARAMETERNAME="公式参数" PRIGHTTYPE="All" SORTNO=""/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式" PARAMETERID="Formula" PARAMETERNAME="计算公式" PRIGHTTYPE="ReadOnly" SORTNO=""/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式中文" PARAMETERID="FormulaCN" PARAMETERNAME="计算公式中文" PRIGHTTYPE="ReadOnly" SORTNO=""/><Parameter ARIGHTTYPE="ReadOnly" DISPLAYNAME="加上期初第一期租金" PARAMETERID="FirstRent" PARAMETERNAME="加上期初第一期租金" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="CleanCreditMoney" NAME="净融资额" STATUS="1" TYPE="PRD0330"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="公式参数" PARAMETERID="FormulaParam" PARAMETERNAME="公式参数" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式" PARAMETERID="Formula" PARAMETERNAME="计算公式" PRIGHTTYPE="ReadOnly"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式中文" PARAMETERID="FormulaCN" PARAMETERNAME="计算公式中文" PRIGHTTYPE="ReadOnly"/></Parameters></Component><Component FORMAT="1" ID="GrossProfit" NAME="项目粗利" STATUS="1" TYPE="PRD0330"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="公式参数" PARAMETERID="FormulaParam" PARAMETERNAME="公式参数" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式" PARAMETERID="Formula" PARAMETERNAME="计算公式" PRIGHTTYPE="ReadOnly"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="计算公式中文" PARAMETERID="FormulaCN" PARAMETERNAME="计算公式中文" PRIGHTTYPE="ReadOnly"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="加上财务利息" PARAMETERID="FinanceInterest" PARAMETERNAME="加上财务利息" PRIGHTTYPE="ReadOnly"/></Parameters></Component>
 	
 	
-	<Component FORMAT="1" ID="DISCOUNT" NAME="贴息" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="PURCHASE_TAX" NAME="购置税" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="VEHICLE_TAX" NAME="车船税" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="GPS_FEE" NAME="GPS费用" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="TABLEWARE_FEE" NAME="装具费" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="MAINTAIN_FEE" NAME="保养费" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="INSURANCE_FEE" NAME="保险费" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component>
+	<Component FORMAT="1" ID="DISCOUNT" NAME="贴息" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="PURCHASE_TAX" NAME="购置税" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="VEHICLE_TAX" NAME="车船税" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="GPS_FEE" NAME="GPS费用" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="TABLEWARE_FEE" NAME="装具费" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="MAINTAIN_FEE" NAME="保养费" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="INSURANCE_FEE" NAME="保险费" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否需要选择融资" PARAMETERID="FINAN" PARAMETERNAME="是否需要选择融资" PRIGHTTYPE="Required"/></Parameters></Component>
 	
 	<Component FORMAT="1" ID="telephone_home_visit" NAME="电核家访" STATUS="1" TYPE="PRD0382"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="电核家访" PARAMETERID="TelephoneHomeVisit" PARAMETERNAME="电核家访" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="investment_rate" NAME="光大出资比例" STATUS="1" TYPE="PRD0384"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="光大出资比例" PARAMETERID="InvestmentRate" PARAMETERNAME="光大出资比例" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="Interest_days" NAME="计息基础" STATUS="1" TYPE="PRD0383"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="计息基础" PARAMETERID="InterestDays" PARAMETERNAME="计息基础" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="Invoice_processing" NAME="开票处理" STATUS="2" TYPE="PRD0381"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="税率" PARAMETERID="TaxRate" PARAMETERNAME="税率" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="开票时点" PARAMETERID="BillingPoint" PARAMETERNAME="开票时点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否足期开票" PARAMETERID="PeriodInvoice" PARAMETERNAME="是否足期开票" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="提前开票天数" PARAMETERID="AdvanceInvoicing" PARAMETERNAME="提前开票天数" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="Residual_value_limit" NAME="残值限定" STATUS="2" TYPE="PRD0380"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="读写方式" PARAMETERID="ReadWriteMode" PARAMETERNAME="读写方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="默认值" PARAMETERID="DefaultValue" PARAMETERNAME="默认值" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="残值比例限定" PARAMETERID="EndValueRatio" PARAMETERNAME="残值比例限定" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="残值输入方式" PARAMETERID="InputType" PARAMETERNAME="残值输入方式" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="Residual_method" NAME="残值处理方式" STATUS="1" TYPE="PRD0380"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="残值处理方式" PARAMETERID="ResidualMethod" PARAMETERNAME="残值处理方式" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="PayDisparity" NAME="是否差额放款" STATUS="1" TYPE="PRD0385"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否差额放款" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ChannelGuarantee" NAME="渠道方担保" STATUS="1" TYPE="PRD0386"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="担保人名称" PARAMETERID="GuaranteeName" PARAMETERNAME="担保人名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="担保人电话" PARAMETERID="GuaranteePhone" PARAMETERNAME="担保人电话" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="担保人地址" PARAMETERID="GuaranteeAddress" PARAMETERNAME="担保人地址" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="担保人证件号" PARAMETERID="GuaranteeNumber" PARAMETERNAME="担保人证件号" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="法定代表人" PARAMETERID="GuaranteeLegalName" PARAMETERNAME="法定代表人" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="担保类型" PARAMETERID="GuaranteeType" PARAMETERNAME="担保类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="关系" PARAMETERID="Relationship" PARAMETERNAME="关系" PRIGHTTYPE="Required"/></Parameters></Component>
 	<Component FORMAT="1" ID="CHANNEL_CAUTION_MONEY" NAME="渠道风险抵押金" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Hide"/></Parameters></Component> 
 	<Component FORMAT="1" ID="SigningAddress" NAME="签约地点" STATUS="1" TYPE="PRD0386"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="签约地点" PARAMETERID="SigningAddress" PARAMETERNAME="签约地点" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="MoneyLimits" NAME="融资额上下限" STATUS="1" TYPE="PRD0350"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="融资额下限" PARAMETERID="MoneyLowLimits" PARAMETERNAME="融资额下限" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="融资额上限" PARAMETERID="EquipUplimpits" PARAMETERNAME="融资额上限" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="贷款比例上限" PARAMETERID="MoneyUpLimits" PARAMETERNAME="贷款比例上限" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="GuarantorPeople" NAME="保证人" STATUS="1" TYPE="PRD0386"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="保证人名称" PARAMETERID="GuarantorName" PARAMETERNAME="保证人名称" PRIGHTTYPE="Required"/></Parameters></Component>
 	<Component FORMAT="1" ID="CleanMoneyRound" NAME="租赁本金圆整" STATUS="2" TYPE="PRD0323"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="租赁本金圆整" PARAMETERID="CleanMoney" PARAMETERNAME="租赁本金圆整" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="租赁本金圆整方式" PARAMETERID="CleanMoneyType" PARAMETERNAME="租赁本金圆整方式" PRIGHTTYPE="Required"/></Parameters></Component> 
-<Component FORMAT="1" ID="even_corpus_day" NAME="等额本金按日计息" STATUS="1" 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"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="宽限期计算方式" PARAMETERID="PostponeFlag" PARAMETERNAME="宽限期计算方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否启用节假日顺延" PARAMETERID="HolidayFlag" PARAMETERNAME="是否启用节假日顺延" PRIGHTTYPE="Hide"/></Parameters></Component><Component FORMAT="1" ID="car_even_interest" NAME="车辆均息法" STATUS="1" TYPE="PRD0301"><Parameters><Parameter DISPLAYNAME="默认还款日" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日"/><Parameter DISPLAYNAME="默认还款周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="默认还款周期"/></Parameters></Component><Component FORMAT="1" ID="even_corpus_period" NAME="等额本金按期计息" STATUS="1" 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"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="宽限期计算方式" PARAMETERID="PostponeFlag" PARAMETERNAME="宽限期计算方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否启用节假日顺延" PARAMETERID="HolidayFlag" PARAMETERNAME="是否启用节假日顺延" PRIGHTTYPE="Hide"/></Parameters></Component><Component FORMAT="1" ID="deposit" NAME="保证金" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="计算方式" PARAMETERID="DepositStyle" PARAMETERNAME="保证金计算方式" PRIGHTTYPE="Required"/></Parameters></Component></Components>
\ No newline at end of file
+<Component FORMAT="1" ID="even_corpus_day" NAME="等额本金按日计息" STATUS="1" 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"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="宽限期计算方式" PARAMETERID="PostponeFlag" PARAMETERNAME="宽限期计算方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否启用节假日顺延" PARAMETERID="HolidayFlag" PARAMETERNAME="是否启用节假日顺延" PRIGHTTYPE="Hide"/></Parameters></Component><Component FORMAT="1" ID="car_even_interest" NAME="车辆均息法" STATUS="1" TYPE="PRD0301"><Parameters><Parameter DISPLAYNAME="默认还款日" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日"/><Parameter DISPLAYNAME="默认还款周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="默认还款周期"/></Parameters></Component><Component FORMAT="1" ID="even_corpus_period" NAME="等额本金按期计息" STATUS="1" 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"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="宽限期计算方式" PARAMETERID="PostponeFlag" PARAMETERNAME="宽限期计算方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否启用节假日顺延" PARAMETERID="HolidayFlag" PARAMETERNAME="是否启用节假日顺延" PRIGHTTYPE="Hide"/></Parameters></Component><Component FORMAT="1" ID="Other" NAME="其他费用" STATUS="1" TYPE="PRD0315"/></Components>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
index 8b5f8aecc..7f92a0718 100644
--- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
@@ -178,7 +178,7 @@
 	<Parameter CODESCRIPT="AssureRelation" CODESOURCE="Code" COMPONENTTYPE="PRD0386" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="Relationship" PARAMETERNAME="关系" SELECTTYPE="04" STATUS="1"/>
 	<Parameter COMPONENTTYPE="PRD0386" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="SigningAddress" PARAMETERNAME="签约地点" STATUS="1"/>
 	<Parameter CODESCRIPT="InputType" CODESOURCE="Code" COMPONENTTYPE="PRD0315,PRD0380" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="InputType" PARAMETERNAME="残值输入方式" SELECTTYPE="04" STATUS="1"/>
-	<Parameter COMPONENTTYPE="PRD0350" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="MINIMUMVALUE" PARAMETERID="IRR" PARAMETERNAME="IRR" STATUS="1"/>
+	<Parameter COMPONENTTYPE="PRD0350" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="MINIMUMVALUE,VALUE" PARAMETERID="IRR" PARAMETERNAME="IRR" STATUS="1"/>
 	<Parameter COMPONENTTYPE="PRD0350" DATATYPE="2" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="MoneyUpLimits" PARAMETERNAME="贷款比例上限" STATUS="1"/>
 	<Parameter COMPONENTTYPE="PRD0350" DATATYPE="2" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="MoneyLowLimits" PARAMETERNAME="融资额下限" STATUS="1"/>
 	<Parameter COMPONENTTYPE="PRD0350" DATATYPE="2" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="EquipUplimpits" PARAMETERNAME="融资额上限" STATUS="1"/>
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index 02caedf42..8477f6edd 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -437,6 +437,8 @@
 				<attribute name="FACTORY_ACCESSORIES_FINA" label="鍘熷巶閰嶄欢璐规槸鍚﹀弬涓庤瀺璧�" type="STRING" length="32"/>
 				<attribute name="CORPUS" label="鏈熼檺鍐呮湰閲�" type="DOUBLE" length="22" scale="2"/>
 				<attribute name="CORPUS_RATIO" label="鏈熼檺鍐呮湰閲戞瘮渚�" type="DOUBLE" length="22" scale="6"/>
+				<attribute name="DISCOUNT" label="璐存伅" type="DOUBLE" length="22" scale="6"/>
+				<attribute name="deposit" label="鎵跨浜洪闄╂姷鎶奸噾" type="DOUBLE" length="22" scale="6"/>
 			</attributes>
 			<manager>
 				<managerProperties>