Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhouyh2

2018-07-20 02:02:54 +08:00 · 2018-07-20 02:02:54 +08:00 · 448912062d
commit 448912062d
parent b47304289e 543a3d34b7
26 changed files with 1612 additions and 1513 deletions
--- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
+++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
@ -10,7 +10,17 @@
 	
 	String rightType = CurPage.getParameter("rightType");
 	
+	String rightTypeS = CurPage.getParameter("distributor_id");
+	
 	String sTempletNo = "DMarginChargeInfo_Temp";//--模板号--
+	
+	String disno="";
+	List<BizObject> nolist=JBOFactory.getBizObjectManager("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT").createQuery("select di.distributor_no from O ,jbo.app.tenwa.customer.DISTRIBUTOR_INFO di where di.id=O.flow_key and flow_unid=:flowunid")
+			.setParameter("flowunid",sFlowUnid).getResultList(false);
+	if(nolist.size()>0){
+		disno=nolist.get(0).getAttribute("distributor_no").getString();
+	}
+	
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
@ -22,7 +32,7 @@
 	dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
 	dwTemp.getDataObject().setVisible("CAUTION_MONEY", true);
 	String sButtons[][] = {
-		{"true","All","Button","±£´æ","±£´æËùÓÐÐÞ¸Ä","save()","","","",""},
+		{"true","All","Button","±£´æ","±£´æËùÓÐÐÞ¸Ä","save(0)","","","",""},
 		{"true","All","Button","返回","返回列表","returnList()","","","",""}
 	};
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
@ -36,12 +46,6 @@
 	if(payer==null||payer==""||payer=="undefined"){
 	setItemValue(0,0,"PAYER","<%=CurPage.getParameter("ProjectName")%>");
 	}
-<%-- 	setItemValue(0,0,"InputUserID","<%=CurUser.getUserName()%>");
-	setItemValue(0,0,"InputOrgID","<%=CurUser.getOrgName()%>");
-	setItemValue(0,0,"InputTime","<%=StringFunction.getTodayNow()%>");
-	setItemValue(0,0,"UpdateUserID","<%=CurUser.getUserName()%>");
-	setItemValue(0,0,"UpdateOrgID","<%=CurUser.getOrgName()%>");
-	setItemValue(0,0,"UpdateTime","<%=StringFunction.getTodayNow()%>"); --%>
 	function save(){
 		var sFlowUnid = "<%=sFlowUnid%>";
 		setItemValue(0,getRow(),"FlowUnid",sFlowUnid);//初始化流程编号
@ -52,7 +56,9 @@
 		 AsControl.OpenView("/DealerDeposit/DMarginChargeInfo_TempList.jsp", "FlowUnid="+sFlowUnid+"&ProjectName=<%=CurPage.getParameter("ProjectName")%>","_self","");
 	}
 	function selectaccount(){
-		AsDialog.OpenSelector("SelectAccountS","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+// 		var disno = getItemValue(0, 0, "disno");
+// 		alert(id);
+		AsDialog.OpenSelector("SelectAccountS","distributorid,"+"<%=disno%>","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
 	    	if(!sReturn||sReturn=="_CANCEL_"){
 				alert(getHtmlMessage('1'));//请选择一条信息！
 				return;
--- a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
+++ b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
@ -46,6 +46,10 @@
    docParam.put("proj_id", flow.getAttribute("proj_id").getString());
    docParam.put("contract_id", flow.getAttribute("contract_id").getString());
    docParam.put("flow_unid", flowunid);
+    docParam.put("inputtime", StringFunction.getTodayNow());
+    docParam.put("inputuserid", CurPage.getUserId());
+    docParam.put("inputorgid", CurPage.getUser().getOrgID());
+    
 	//判断是否存在，不存在就从配置表倒到临时表
 	DocListInitAction.initDocList(docParam,other,docClassItemno,CurConfig);
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
--- a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp
+++ b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp
@ -24,10 +24,11 @@
 	if(type==""){
 		BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);//流程对象
 		otherWhere=DocListInitAction.getFlowWhere(flow,"","O");
+		//otherWhere=" and O.proj_id='"+proj_id+"' order by O.INPUTTIME DESC";
 	}else if("proj".equals(type)){
-		otherWhere=" and O.proj_id='"+proj_id+"'";
+		otherWhere=" and O.proj_id='"+proj_id+"' order by O.INPUTTIME DESC";
 	}else if("contract".equals(type)){
-		otherWhere=" and (O.contract_id='"+contract_id+"' OR O.proj_id='"+proj_id+"')";
+		otherWhere=" and (O.contract_id='"+contract_id+"' OR O.proj_id='"+proj_id+"') order by O.INPUTTIME DESC";
 	}
 	
 	
--- a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf
+++ b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf
@ -81,7 +81,7 @@ FlowFunction.doSubmit=function(sObjectType,sObjectNo,sTaskNo,sFlowName,sFlowNo,s
 	 	        }
 	 	        return;
 	     }}
-	   	autoRiskScan(sFlowName,"TaskNo="+sTaskNo+"&ObjectType="+sObjectType+"&ObjectNo="+sObjectNo+"&FlowNo="+sFlowNo+"&PhaseNo="+sPhaseNo+"&isAutoCommit=true",sPhaseNo,function(riskMessage){
+	   	autoRiskScan(sFlowName,"TaskNo="+sTaskNo+"&ObjectType="+sObjectType+"&ObjectNo="+sObjectNo+"&FlowNo="+sFlowNo+"&PhaseNo="+sPhaseNo+"&isAutoCommit=false",sPhaseNo,function(riskMessage){
 	 		if(riskMessage != true){
 	 			return;
 	 		}
--- a/WebContent/Tenwa/Customer/Group/Subcompany/DistributorCustomerGroupRelation.jsp
+++ b/WebContent/Tenwa/Customer/Group/Subcompany/DistributorCustomerGroupRelation.jsp
@ -39,7 +39,7 @@ function selectCustomerName(){
 	}
 	sReturn = sReturn.split("@");
 	setItemValue(0,0,"distributor_id",sReturn[0]);
-	setItemValue(0,0,"DISTRIBUTOR_NO",sReturn[1]);
+	setItemValue(0,0,"DISTRIBUTOR_CODING",sReturn[1]);
    setItemValue(0,0,"DISTRIBUTOR_NAME",sReturn[2]);
    setItemValue(0,0,"group_id",'<%=id%>');
  	},"请选择集团客户成员",'');
--- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp
+++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp
@ -21,8 +21,8 @@
 	doTemp.setDefaultValue("DISTRIBUTOR_ID", DISTRIBUTOR_NO);
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	dwTemp.Style="2";      	     //--ÉèÖÃÎªGrid·ç¸ñ--
-	 /* if("ReadOnly".equals(righttrpe)){
-		//dwTemp.ReadOnly = "1";	 //Ö»¶ÁÄ£Ê½
+	/*   if("ReadOnly".equals(rightType)){
+		dwTemp.ReadOnly = "1";	 //Ö»¶ÁÄ£Ê½
 	} */
 	 
 	dwTemp.genHTMLObjectWindow(id);
@ -47,6 +47,15 @@
 	}
 	as_save(0,"returnList()");
 }
+   
+   window.onload=function(){
+	   var result = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.AccountInfoManage","Checkbasicinfo","flowunid=<%=sflowunid%>");
+	   setItemValue(0,0,"ACCOUNT",result);
+   }
+   
+   
+   
+   
 	function returnList(){
 		<%--  var sUrl = "/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp";
 		 AsControl.OpenView(sUrl,"FlowUnid=<%=flowunid%>",'_self',''); --%>
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBChange/LBChangeInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBChange/LBChangeInfo.jsp
@ -32,6 +32,7 @@


 	String sFlowUnid = CurPage.getParameter("FlowUnid");//Á÷³Ì±àºÅ
+	String PhaseNo = CurPage.getParameter("PhaseNo");
 	if(sFlowUnid == null) sFlowUnid = "";
 	String ishistory=CurPage.getParameter("IsHistory");
 	String nodeNo=CurPage.getParameter("NodeNo");
@ -53,7 +54,7 @@
 	CurPage.getCurComp().setAttribute("RightType", null);
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
-	if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
+	if((null!=RightType&&RightType.equals("ReadOnly")&&(!PhaseNo.equals("0010")))||(null!=ishistory&&ishistory.equals("true"))){
 		dwTemp.ReadOnly = "-2";//Ö»¶ÁÄ£Ê½
 		isShowButton=false;
 	}else{
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp
@ -41,13 +41,14 @@
 	if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
 		RightType="ReadOnly";
 		sButtons=new String[][] {
-			{"false","","Button","ÏêÇé","ÏêÇé","viewAndEdit()","","","","btn_icon_detail",""}
+			{"false","","Button","ÏêÇé","ÏêÇé","viewAndEdit()","","","","btn_icon_detail",""},
+			{"true","","Button","É¾³ý","É¾³ý","deletecontract()","","","","btn_icon_delete",""},
 		};
 	}else{
 		sButtons=new String[][]{
 			{"false","","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
 			{"false","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit",""},
-			{"true","","Button","É¾³ý","É¾³ý","deletecontract()","","","","btn_icon_delete",""},
+			{"false","","Button","É¾³ý","É¾³ý","deletecontract()","","","","btn_icon_delete",""},
 			//{"true","","Button","生成合同","删除","createContractByTemplate()","","","","btn_icon_up",""},
 			//{"true","","Button","上传","新增文档信息","uploadContract()","","","","btn_icon_up",""}
 		};
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
@ -86,10 +86,10 @@
      $(document).ready(function(){
    	  var RightType="<%=RightType%>";
    	  var phaseno="<%=phaseno%>"
-		  if(RightType=="ReadOnly"){
+		 /*  if(RightType=="ReadOnly"){
 			  $('#A_Group_0010').css('display','none');
 			  $('#A_Group_0020').css('display','none');
-		  }
+		  } */
    	  if(phaseno=="0015"){
    		  $('#ButtonTR').css('display','block');
    		  $('#A_Group_0010').css('display','none');
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditRiskShow.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditRiskShow.jsp
@ -1,21 +1,26 @@
 <%@ page contentType="text/html; charset=GBK"%>
 <%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
 	/*
-        Author: undefined 2018-07-02
+        Author: undefined 2018-07-18
        Content: 
        History Log: 
    */
    String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号
-    String retainfield = CurPage.getParameter("CertId");//查询条件编号
-    System.err.println(retainfield);
+    String CertId = CurPage.getParameter("CertId");//查询条件编号
 	ASObjectModel doTemp = new ASObjectModel("LbCarCreditRiskShow");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	dwTemp.Style="1";      	     //--设置为Grid风格--
 	dwTemp.ReadOnly = "1";	 //只读模式
 	dwTemp.setPageSize(10);
-	dwTemp.genHTMLObjectWindow(sFlowUnid+","+retainfield);
+	String num = "";
+	if(CertId == null){
+			num = sFlowUnid;
+	}else{
+			num = sFlowUnid+","+CertId;
+	}
+	dwTemp.genHTMLObjectWindow(num);

-	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格  
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 	String sButtons[][] = {
 			{"true","","Button","返回","返回","goBack()","","","","btn_icon_back",""}
 	};
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditTempList.jsp
@ -1,10 +1,11 @@
 <%@ page contentType="text/html; charset=GBK"%>
 <%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
 	/*
-        Author: undefined 2018-06-28
+        Author: undefined 2018-07-18
        Content: 
        History Log: 
    */
+    String PhaseNo = CurPage.getParameter("PhaseNo");
    String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号
 	ASObjectModel doTemp = new ASObjectModel("LbCarCreditTempList");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
@ -15,15 +16,17 @@

 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 	String sButtons[][] = {
-		{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
-		{"true","","Button","信贷校验","信贷校验","creditVerification()","","","","btn_icon_detail",""}
+			{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+			{"true","","Button","信贷校验","信贷校验","creditVerification()","","","","btn_icon_detail",""}
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
 	function creditVerification(){
 		 var sFlowUnid = "<%=sFlowUnid%>";
-		 alert(sFlowUnid);
-		 var result = RunJavaMethodTrans("com.tenwa.comm.credit.CreditBodyGuardAction","doCreditVerification","flowunid="+sFlowUnid);
+		 var PhaseNo = "<%=PhaseNo%>"
+		 alert(sFlowUnid+"@"+PhaseNo);
+		 var result = 
+		 RunJavaMethodTrans("com.tenwa.comm.credit.CreditBodyGuardAction","doCreditVerification","flowunid="+sFlowUnid+",phaseno="+PhaseNo);
 		 if(result == 'ERROR'){
 			 alert("调用数据失败");
 		 }else if(result == 'SUCCESS'){
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp
@ -10,7 +10,6 @@
 				//alert(getHtmlMessage('1'));//ÇëÑ¡ÔñÒ»ÌõÐÅÏ¢£¡
 	    	return;
 		    }
-			debugger;
 			sReturn = sReturn.split("@");
 			var contract_id=sReturn[0];
 			var project_id=sReturn[1];
@ -18,8 +17,10 @@
 			var contract_number = sReturn[3];
 			var project_name = sReturn[4];
 			var project_no = sReturn[4].split("-")[0];
+			var customertype = sReturn[6];
+			var leasform = sReturn[7];
 			var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
-			sParams =sParams+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ProjectNo="+project_no+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>";
+			sParams =sParams+",leasform="+leasform+",customertype="+customertype+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ProjectNo="+project_no+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>";
 			var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
 			if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
 				var sReturnInfos=sReturnInfo.split("@");
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
@ -38,7 +38,7 @@
 	}else{
 		sButtons = new String[][]{
 				{"true","","Button","发起付款申请","保存","cmb_tp_pay()","","","","btn_icon_save",""},
-				{"true","","Button","마운써벎꿴璂","마운써벎꿴璂","cmb_tp_callback()","","","","btn_icon_delete",""}
+				{"true","","Button","付款结果回盘","付款结果回盘","cmb_tp_callback()","","","","btn_icon_delete",""}
 			};
 	}
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
@ -200,6 +200,9 @@
 // 			//$("#FULLNAME").attr("style","color:red;");
 // 			$("#FULLNAME").css("color","red");
 // 		}
+
+		if("0020"=="<%=sPhaseNo%>" || "0030"=="<%=sPhaseNo%>" || "0040"=="<%=sPhaseNo%>"){//经销商阶段看不见标红,初审、复审、信审可以标红
+			
 		var certResult = checkCertId();
 		if(certResult=="4"){
 			//$("#FULLNAME").attr("style","color:red;");
@ -221,6 +224,9 @@
 			$("#REMARK").css("color","red");
 		}
 		
+		}
+		
+		
 		//第二阶段隐藏身份校验按钮
 		if("0020"!="<%=sPhaseNo%>"){
 			$("#ButtonTR").attr("style","display:none;");
--- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
@ -0,0 +1,27 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	/*
+        Author: undefined 2017-06-17
+        Content: 示例详情页面
+        History Log: 
+    */
+    String ishistory = CurPage.getParameter("IsHistory");
+	String flowunid = CurPage.getParameter("FlowUnid");
+	String productid = Sqlca.getString("select PRODUCT_ID from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'");
+	String sTempletNo = "LB_CONTRACT_INFO_PAY";//--模板号--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	/* if(null!=ishistory&&ishistory.equals("true")){
+		 doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据
+	} */
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";
+//	dwTemp.ReadOnly = "0";
+	dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid"));
+	
+	String sButtons[][] = {
+	};
+	sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@ -2444,33 +2444,34 @@
 				</managerProperties>
 			</manager>
 		</class>
-		<class name="LB_CAR_CREDIT_RISKITEM_TEMP" label="" keyAttributes="ID">
-			<attributes>
-				<attribute name="ID" label="标识编号" type="STRING" length="32"/>
-				<attribute name="flowunid" label="流程编号" type="STRING" length="100"/>
-				<attribute name="entryid" label="进件id" type="STRING" length="100"/>
-				<attribute name="rule_id" label="规则编号" type="STRING" length="100"/>
-				<attribute name="score" label="风险分数" type="STRING" length="100"/>
-				<attribute name="decision" label="决策结果" type="STRING" length="100"/>
-				<attribute name="risk_name" label="风险名称" type="STRING" length="100"/>
-				<attribute name="risk_detail" label="风险详情" type="STRING" length="5000"/>
-				<attribute name="retainfield1" label="保留字段1" type="STRING" length="100"/>
-				<attribute name="retainfield2" label="保留字段2" type="STRING" length="100"/>
-				<attribute name="retainfield3" label="保留字段3" type="STRING" length="100"/>
-				<attribute name="inputuserid" label="登记人" type="STRING" length="100"/>
-				<attribute name="inputorgid" label="登记部门" type="STRING" length="100"/>
-				<attribute name="inputtime" label="登记时间" type="STRING" length="100"/>
-				<attribute name="updateuserid" label="更新人" type="STRING" length="100"/>
-				<attribute name="updateorgid" label="更新部门" type="STRING" length="100"/>
-				<attribute name="updatetime" label="更新时间" type="STRING" length="100"/>
-			</attributes>
-			<manager>
-				<managerProperties>
-					<property name="table" value="lb_car_credit_riskitem_temp" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager>
-		</class>
+		
+		<class name="LB_CAR_CREDIT_RISKITEM_TEMP" label="个人风险详情表" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="标识编号" type="STRING" length="32"/>
+				<attribute name="flowunid" label="流程编号" type="STRING" length="100"/>
+				<attribute name="entryid" label="进件id" type="STRING" length="100"/>
+				<attribute name="score" label="风险分数" type="STRING" length="100"/>
+				<attribute name="risk_name" label="风险名称" type="STRING" length="100"/>
+				<attribute name="risk_detail" label="风险详情" type="STRING" length="5000"/>
+				<attribute name="certid" label="身份证号码" type="STRING" length="100"/>
+				<attribute name="retainfield1" label="保留字段1" type="STRING" length="100"/>
+				<attribute name="retainfield2" label="保留字段2" type="STRING" length="100"/>
+				<attribute name="retainfield3" label="保留字段3" type="STRING" length="100"/>
+				<attribute name="inputuserid" label="登记人" type="STRING" length="100"/>
+				<attribute name="inputorgid" label="登记部门" type="STRING" length="100"/>
+				<attribute name="inputtime" label="登记时间" type="STRING" length="100"/>
+				<attribute name="updateuserid" label="更新人" type="STRING" length="100"/>
+				<attribute name="updateorgid" label="更新部门" type="STRING" length="100"/>
+				<attribute name="updatetime" label="更新时间" type="STRING" length="100"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_car_credit_riskitem_temp" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+		
 		<class name="CUSTOMER_FAMILY" label="" keyAttributes="id">
 			<attributes>
 				<attribute name="id" label="标识" type="STRING" length="32"/>
@ -2643,6 +2644,38 @@
 					<property name="table" value="vi_lb_identity_check" />
 				</managerProperties>
 			</manager>
-		</class>
+		</class>
+		
+		<class name="LB_CAR_CREDIT_PERSONAL_INFO_TEMP" label="个人风险信息表" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="标识编号" type="STRING" length="32"/>
+				<attribute name="ENTRYID" label="进件ID" type="STRING" length="100"/>
+				<attribute name="FLOWUNID" label="流程编号" type="STRING" length="100"/>
+				<attribute name="FULLNAME" label="姓名" type="STRING" length="100"/>
+				<attribute name="MOBILE" label="手机号" type="STRING" length="100"/>
+				<attribute name="CERTID" label="身份证号码" type="STRING" length="100"/>
+				<attribute name="RELATION" label="身份" type="STRING" length="100"/>
+				<attribute name="FINAL_SCORE" label="最终分数" type="STRING" length="100"/>
+				<attribute name="FINAL_DECISION" label="最终决策结果" type="STRING" length="100"/>
+				<attribute name="PHONELOCATION" label="手机号归属地" type="STRING" length="100"/>
+				<attribute name="CERTLOCATION" label="身份证归属地" type="STRING" length="100"/>
+				<attribute name="retainfield1" label="保留字段1" type="STRING" length="100"/>
+				<attribute name="retainfield2" label="保留字段2" type="STRING" length="100"/>
+				<attribute name="retainfield3" label="保留字段3" type="STRING" length="100"/>
+				<attribute name="inputuserid" label="登记人" type="STRING" length="100"/>
+				<attribute name="inputorgid" label="登记部门" type="STRING" length="100"/>
+				<attribute name="inputtime" label="登记时间" type="STRING" length="100"/>
+				<attribute name="updateuserid" label="更新人" type="STRING" length="100"/>
+				<attribute name="updateorgid" label="更新部门" type="STRING" length="100"/>
+				<attribute name="updatetime" label="更新时间" type="STRING" length="100"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_car_credit_personal_info_temp" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+		
 	</package>
 </jbo>
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@ -3953,6 +3953,30 @@
 				</managerProperties>
 			</manager>
 		</class>
+		<class name="CONFIGURATE" label="" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="标识" type="STRING" length="64"/>
+				<attribute name="ATTR_ID" label="属性ID" type="STRING" length="64"/>
+				<attribute name="ATTR_VALUE" label="属性值" type="STRING" length="64"/>
+				<attribute name="FIELD1" label="属性1" type="STRING" length="64"/>
+				<attribute name="FIELD2" label="属性2" type="STRING" length="64"/>
+				<attribute name="FIELD3" label="属性3" type="STRING" length="64"/>
+				<attribute name="FIELD4" label="属性4" type="STRING" length="64"/>
+				<attribute name="FIELD5" label="属性5" type="STRING" length="64"/>
+				<attribute name="INPUTUSERID" label="创建人" type="STRING" length="64"/>
+				<attribute name="INPUTORGID" label="创建所属部门" type="STRING" length="64"/>
+				<attribute name="INPUTTIME" label="创建时间" type="STRING" length="64"/>
+				<attribute name="UPDATEUSERID" label="修改人" type="STRING" length="64"/>
+				<attribute name="UPDATEORGID" label="修改人所属部门" type="STRING" length="64"/>
+				<attribute name="UPDATETIME" label="修改时间" type="STRING" length="64"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="configurate" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 	</package>
 	<package name="jbo.com.tenwa.lease.carbrand" >
 	<class name="LB_CLAIMS_BOOK_DETAIL" label="索赔申请书详情表" keyAttributes="ID">
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
--- a/WebContent/WEB-INF/web_app.xml
+++ b/WebContent/WEB-INF/web_app.xml
@ -474,6 +474,8 @@
 				
 				<!-- 流程附件一览 -->
 					apx.com.amarsoft.als.business.attachment.controller,
+				<!-- 附件清单-->
+					apx.com.amarsoft.als.doc.attribute.controller,
 				
 				<!-- 流程动作 -->
 					apx.com.amarsoft.als.business.action.ready.controller,
--- a/WebContent/com/tenwa/apzl/configurate/ConfigurateInfo.jsp
+++ b/WebContent/com/tenwa/apzl/configurate/ConfigurateInfo.jsp
@ -0,0 +1,30 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	/*
+        Author: undefined 2018-07-19
+        Content: 示例详情页面
+        History Log: 
+    */
+	String sPrevUrl = CurPage.getParameter("PrevUrl");
+	if(sPrevUrl == null) sPrevUrl = "/com/tenwa/apzl/configurate/ConfigurateList.jsp";
+
+	String sTempletNo = "ConfigurateInfo";//--模板号--
+	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("ID"));
+	
+	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"%>
--- a/WebContent/com/tenwa/apzl/configurate/ConfigurateList.jsp
+++ b/WebContent/com/tenwa/apzl/configurate/ConfigurateList.jsp
@ -0,0 +1,37 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2018-07-19
+        Content: 
+        History Log: 
+    */
+	ASObjectModel doTemp = new ASObjectModel("ConfigurateList");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow("");
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+		{"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 = "/com/tenwa/apzl/configurate/ConfigurateInfo.jsp";
+		 AsControl.OpenView(sUrl,'','_self','');
+	}
+	function viewAndEdit(){
+		 var sUrl = "/com/tenwa/apzl/configurate/ConfigurateInfo.jsp";
+		 var sPara = getItemValue(0,getRow(0),'ID');
+		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
+			alert("参数不能为空！");
+			return ;
+		 }
+		AsControl.OpenView(sUrl,'ID=' +sPara ,'_self','');
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
--- a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
+++ b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
@ -108,12 +108,12 @@ public class FileTemplateUtil {
 		if("01".equals(leasform)){
 			/*return "[{'fileTemplate':\""+"[{'text':'融资租赁合同-C端直租','value':'24aba365e2794a018814ae81341486bf'},"
 					+ "{'text':'直租个人授权协议书','value':'3334eed6051248b88cd4f2a22e93ac96'},]"+"\"}]";*/
-			return "[{'fileTemplate':\""+"[{'text':'ÈÚ×Ê×âÁÞºÏÍ¬','value':'24aba365e2794a018814ae81341486bf'}]"+"\"}]";
+			return "[{'fileTemplate':\""+"[{'text':'ºÏÍ¬£¨Ö±×â£©','value':'24aba365e2794a018814ae81341486bf'}]"+"\"}]";
 		}else{
 			/*return "[{'fileTemplate':\""+"[{'text':'融资租赁合同-C端回租','value':'641c55a1168f4a488a5028ee68870156'},"
 			+ "{'text':'回租个人授权协议书','value':'e980635a77124d5598be1717c062b877'},"
 			+ "{'text':'抵押合同','value':'ec90c114914d4725b57729107888511c'}]"+"\"}]";*/
-			return "[{'fileTemplate':\""+"[{'text':'ÈÚ×Ê×âÁÞºÏÍ¬£¨ÊÛºó»Ø×â£©','value':'641c55a1168f4a488a5028ee68870156'}]"+"\"}]";
+			return "[{'fileTemplate':\""+"[{'text':'ºÏÍ¬£¨ÊÛºó»Ø×â£©','value':'641c55a1168f4a488a5028ee68870156'}]"+"\"}]";
 		}
 	}
 	
--- a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java
+++ b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java
--- a/src_tenwa/com/tenwa/apzl/carreclaim/BackReclaim.java
+++ b/src_tenwa/com/tenwa/apzl/carreclaim/BackReclaim.java
@ -0,0 +1,37 @@
+package com.tenwa.apzl.carreclaim;
+
+
+import jbo.com.tenwa.lease.comm.CAR_RECLAIM_TEMP;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+
+public class BackReclaim  extends BaseBussiness {
+
+	@Override
+	public Object run(Transaction Sqlca) throws Exception {
+		this.initBussinessParam(Sqlca);
+		String flowUnid=this.getAttribute("ObjectNo").toString();
+		String ContractId = this.getAttribute("ContractId").toString();
+		
+		BizObjectManager lecbom = JBOFactory.getBizObjectManager(CAR_RECLAIM_TEMP.CLASS_NAME, Sqlca);
+		BizObject condition = lecbom.createQuery("FlowUnid=:flowunid").setParameter("flowunid",flowUnid).getSingleResult(false);
+		String sMessage="";
+		String reclaimType = "";
+		if(null!=condition){
+			reclaimType=condition.getAttribute("reclaim_type").toString();
+		}
+		if(reclaimType!=null&&reclaimType.equals("back_reclaim")){//×ßµÚËÄ¸ö½Úµã
+			sMessage="true";
+		}else {
+			sMessage="false";
+		}
+		
+		
+		 
+		return sMessage;
+	}
+}	
--- a/src_tenwa/com/tenwa/apzl/carreclaim/OutDateReclaim.java
+++ b/src_tenwa/com/tenwa/apzl/carreclaim/OutDateReclaim.java
@ -0,0 +1,37 @@
+package com.tenwa.apzl.carreclaim;
+
+
+import jbo.com.tenwa.lease.comm.CAR_RECLAIM_TEMP;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+
+public class OutDateReclaim  extends BaseBussiness {
+
+	@Override
+	public Object run(Transaction Sqlca) throws Exception {
+		this.initBussinessParam(Sqlca);
+		String flowUnid=this.getAttribute("ObjectNo").toString();
+		String ContractId = this.getAttribute("ContractId").toString();
+		
+		BizObjectManager lecbom = JBOFactory.getBizObjectManager(CAR_RECLAIM_TEMP.CLASS_NAME, Sqlca);
+		BizObject condition = lecbom.createQuery("FlowUnid=:flowunid").setParameter("flowunid",flowUnid).getSingleResult(false);
+		String sMessage="";
+		String reclaimType = "";
+		if(null!=condition){
+			reclaimType=condition.getAttribute("reclaim_type").toString();
+		}
+		if(reclaimType!=null&&reclaimType.equals("over_reclaim")){//×ßµÚËÄ¸ö½Úµã
+			sMessage="true";
+		}else {
+			sMessage="false";
+		}
+		
+		
+		 
+		return sMessage;
+	}
+}	
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/QueryPassengerVehicleModeListAction.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryPassengerVehicleModeListAction.java
@ -0,0 +1,233 @@
+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.InitCollectConfig;
+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 QueryPassengerVehicleModeListAction implements Job{
+
+	@Override
+	public void execute(JobExecutionContext arg0) throws JobExecutionException {
+							JBOTransaction tx = null;
+		 		try {
+					tx = JBOFactory.createJBOTransaction();
+			 		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);
+			 		BizObjectManager bm4 = JBOFactory.getBizObjectManager(LB_CARDATA_VERSION.CLASS_NAME, tx);
+			 		//接口url中的fromVersion参数
+			 		String fromVersion = null;
+			 		//开关，作用是若判断为第一次调用接口，保存版本信息到Version表，而不是第一次调用时则将这个值变为true，则更新版本表
+			 		boolean versionflag = true;
+			 		//查询二手车版本表,若为空则说明是第一次调用二手车车型库接口
+			 		BizObject versionResult = bm4.createQuery("select O.currentversion,O.initialversion from O").getSingleResult(false);
+			 		if(versionResult == null){
+			 				versionflag = false;
+			 				fromVersion = InitSecondHandCarConfig.VERSION;
+			 		}else{
+			 				fromVersion = versionResult.getAttribute("currentversion").toString();
+			 		}
+			 		String url = "http://"+InitSecondHandCarConfig.PREFIX+".che300.com/service/common/eval?fromVersion="
+			 							+fromVersion+"&oper="+InitSecondHandCarConfig.OPER+"&token="+InitSecondHandCarConfig.TOKEN+"";
+			 		String responseResult = VehicleAppraisementUtil.getResponseResult(url);
+			 		
+			 		//使用fastjson解析接口返回的json数据
+			 		JSONObject object = JSONObject.parseObject(responseResult);
+			 		//
+			 		if("0".equals(object.get("status").toString())){
+			 			    	return;
+			 		}
+			 		JSONObject dataObject = (JSONObject) object.get("data");
+			 		@SuppressWarnings("rawtypes")
+					List<HashMap> brandList = JSON.parseArray(JSON.toJSONString(dataObject.get("brand")), HashMap.class);
+			 		System.out.println("品牌大小:"+brandList.size());
+			 		@SuppressWarnings("rawtypes")
+					List<HashMap> seriesList = JSON.parseArray(JSON.toJSONString(dataObject.get("series")), HashMap.class);
+			 		System.out.println("车系大小:"+seriesList.size());
+			 		@SuppressWarnings("rawtypes")
+					List<HashMap> modelList = JSON.parseArray(JSON.toJSONString(dataObject.get("model")), HashMap.class);
+			 		System.out.println("车型大小:"+modelList.size());
+			 		@SuppressWarnings("rawtypes")
+					List<HashMap> versionList = JSON.parseArray(JSON.toJSONString(dataObject.get("version")), HashMap.class);
+			 		@SuppressWarnings("unchecked")
+					Map<String,Object> map = versionList.get(0);
+			 //判断解析出的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") //此处Sql拼接要注意,一定要在where前后留空格,否则执行报错,下面同理
+							 .setParameter("BRANDNAME", brandList.get(i).get("brand_name").toString())
+							 .setParameter("BRANDINITIAL", brandList.get(i).get("brand_initial").toString())
+							 .setParameter("OPERTYPE", brandList.get(i).get("oper_type").toString())
+							 .setParameter("BRANDTIMESTAMP",map.get("BrandTimestamp").toString())
+							 .setParameter("INITIALVERSION",map.get("InitialVersion").toString())
+							 .setParameter("BRANDID", brandList.get(i).get("brand_id").toString()).executeUpdate();
+							 }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;
+							 }
+			 		}
+	 		}
+	 		//同上理
+	 		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);
+	 		}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){
+						  tx.rollback();						
+					}
+				} catch (JBOException e1) {
+					e1.printStackTrace();
+				}
+				    e.printStackTrace();
+		} finally {
+				try {
+					if(null != tx){
+						  tx.commit();						
+					}
+				} catch (JBOException e) {
+					e.printStackTrace();
+				}
+		   }
+	 }		 	
+}