diff --git a/WebContent/Tenwa/Apzl/BussinessCancel/LbBusinessOverdateInfo.jsp b/WebContent/Tenwa/Apzl/BussinessCancel/LbBusinessOverdateInfo.jsp
new file mode 100644
index 000000000..0a0cff359
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/BussinessCancel/LbBusinessOverdateInfo.jsp
@@ -0,0 +1,31 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	/*
+        Author: undefined 2018-07-18
+        Content: 示例详情页面
+        History Log: 
+    */
+// 	String sPrevUrl = CurPage.getParameter("PrevUrl");
+// 	if(sPrevUrl == null) sPrevUrl = "";
+
+	String sTempletNo = "LbBusinessOverdateInfo";//--模板号--
+	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("SerialNo"));
+	
+	String sButtons[][] = {
+		{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
+// 		{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
+		{"true","All","Button","返回","返回列表","returnList()","","","",""}
+	};
+	sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+	function returnList(){
+		 AsControl.OpenView("/Tenwa/Apzl/BussinessCancel/LbBusinessOverdateList.jsp", "","_self","");
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/BussinessCancel/LbBusinessOverdateList.jsp b/WebContent/Tenwa/Apzl/BussinessCancel/LbBusinessOverdateList.jsp
new file mode 100644
index 000000000..983495413
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/BussinessCancel/LbBusinessOverdateList.jsp
@@ -0,0 +1,37 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2018-07-18
+        Content: 
+        History Log: 
+    */
+	ASObjectModel doTemp = new ASObjectModel("LbBusinessOverdateList");
+	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 = "/Tenwa/Apzl/BussinessCancel/LbBusinessOverdateInfo.jsp";
+		 AsControl.OpenView(sUrl,'','_self','');
+	}
+	function viewAndEdit(){
+		 var sUrl = "/Tenwa/Apzl/BussinessCancel/LbBusinessOverdateInfo.jsp";
+		 var sPara = getItemValue(0,getRow(0),'ID');
+		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
+			alert("参数不能为空！");
+			return ;
+		 }
+		AsControl.OpenView(sUrl,'SerialNo=' +sPara ,'_self','');
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp
index 9712ce962..30590d44b 100644
--- a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp
+++ b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp
@@ -36,16 +36,6 @@
 <script type="text/javascript">
 
 function teaming(){
-	var id = getItemValue(0,getRow(0),'ID');
-	//debugger;
-	
-	//alert(id);
-	var result = AsControl.RunJavaMethodTrans("com.tenwa.customer.distributor.DeleteDistributor","SelectGroup","id="+id);
-	//var distributor_type=sReturn[3];
-	if(result=="false"){
-		alert("集团外的经销商需收取保证金后再进行激活！");
-		return;
-	}
 	var id = getItemValue(0,getRow(0),'ID');
 		var distributor_status = getItemValue(0,getRow(0),'distributor_status');
 		if(typeof(id)=="undefined" || id.length==0 ){
@@ -73,6 +63,16 @@ function teaming(){
 			alert("更改状态成功");
 			reloadSelf();
 		}
+		var id = getItemValue(0,getRow(0),'ID');
+		//debugger;
+		
+		//alert(id);
+		var result = AsControl.RunJavaMethodTrans("com.tenwa.customer.distributor.DeleteDistributor","SelectGroup","id="+id);
+		//var distributor_type=sReturn[3];
+		if(result=="false"){
+			alert("集团外的经销商需收取保证金后再进行激活！");
+			return;
+		}
 }
 
 function teamingSuspend(){
diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp
index cc15088f7..baf0392cb 100644
--- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp
+++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp
@@ -76,7 +76,7 @@
 		 }
  	AsDialog.PopView(sUrl,"id="+sPara,"dialogWidth=800px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
  		reloadSelf();
-		 },"详情");
+		 },"修改");
  	
 	}
 </script>
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp
index 090a0ae3e..4f7c91591 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp
@@ -15,6 +15,7 @@
 	String taskno=CurPage.getParameter("TaskNo");
 	String ishistory=CurPage.getParameter("IsHistory");
 	String nodeNo=CurPage.getParameter("NodeNo");
+	String ProjectId=CurPage.getParameter("ProjectId");
 
 		
 	String sContractId = "";//合同表的主键
@@ -95,8 +96,9 @@
 		if(confirm('确实要删除吗?')){
 			var files = getItemValueArray(0,"fileid");
 			var falg;
+			var ProjectId ="<%=ProjectId%>";
 			for(var i=0;i<files.length;i++){
-				falg = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","updateDocContractStatus","file_id="+files[0]);
+				falg = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","updateDocContractStatus","file_id="+files[0]+",ProjectId="+ProjectId);
 			}
 			if("success" == falg){
 				as_delete(0);
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
index 4c2a1c8d2..add71dd60 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
@@ -13,6 +13,7 @@
     String proj_id=CurPage.getParameter("proj_id");
     String taskno=CurPage.getParameter("TaskNo");
 	String nodeNo=CurPage.getParameter("NodeNo");
+	String contractNo=CurPage.getParameter("ContractNo");
 	String RightType= CurPage.getParameter("RightType");
     String phaseno =  CheckFLowPhaseNo.run(flowunid, taskno);
 	String sFileSaveMode = CurConfig.getConfigure("FileSaveMode");
@@ -219,6 +220,7 @@
 		tempParam["FLOW_UNID"]="<%=flowunid%>";
 		tempParam["CONTRACT_ID"]="<%=sContractId%>";
 		tempParam["PROJ_ID"]="<%=sProjId%>";
+		tempParam["contractNo"]="<%=contractNo%>";
 		
 		tempParam["fileSavePath"]="<%=CurConfig.getConfigure("FileSavePath")%>";
 		
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
index 315abaab8..ea2e6f311 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
@@ -11,6 +11,7 @@
     String RightType=CurPage.getParameter("RightType");
     String ishistory=CurPage.getParameter("IsHistory");
     String FlowUnid=CurPage.getParameter("FlowUnid");
+    String CustomerType=CurPage.getParameter("CustomerType");
     String ApplyType=CurPage.getParameter("ApplyType");
     String PhaseNo=CurPage.getParameter("PhaseNo");
    /*  System.out.print("\n\n\n\t--FlowUnid  "+FlowUnid+"\t\n\n\n"); */
@@ -18,6 +19,7 @@
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	//doTemp.setColTips("", "测试");
 	doTemp.setHtmlEvent("acc_number", "onchange", "getNameOfBank");
+	//doTemp.setHtmlEvent("MOBILE", "onchange", "checkMobile");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
     if(PhaseNo.equals("0020")||PhaseNo.equals("0030")||PhaseNo.equals("0040")||PhaseNo.equals("0050")){
@@ -45,6 +47,28 @@
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	
+	function checkMobile(){
+		if("<%=CustomerType%>"=="03"){//校验自然人扣款卡信息手机号是否是申请人或共同申请人
+			var customerType = "03";
+			var mobile = getItemValue(0,getRow(),"MOBILE");
+			var sParams = "mobile="+mobile+",customerType="+customerType+",flowunid="+"<%=FlowUnid%>";
+			var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","checkDebitCardMobile",sParams);
+			if(sReturnInfo=="10"){
+				alert("预留手机号不是申请人手机号或共同申请人手机号!");
+			}
+			return sReturnInfo;
+		}else if("<%=CustomerType%>"=="01"){//校验法人扣款卡信息手机号是否是担保人或共同申请人
+			var customerType = "01";
+			var mobile = getItemValue(0,getRow(),"MOBILE");
+			var sParams = "mobile="+mobile+",customerType="+customerType+",flowunid="+"<%=FlowUnid%>";
+			var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","checkDebitCardMobile",sParams);
+			if(sReturnInfo=="10"){
+				alert("预留手机号不是担保人手机号或共同申请人手机号!");
+			}
+			return sReturnInfo;
+		}
+	}
+	
 	function checkTel(){//校验预留手机号格式
 		var mobile = getItemValue(0,getRow(0),"MOBILE");
 		if(mobile==""){
@@ -62,8 +86,14 @@
 	}
 	
 	function save(){
-		var mobileRes=checkTel();
-		if(mobileRes==false){
+		var TelRes=checkTel();
+		if(TelRes==false){
+			return;
+		}
+		
+		var MobileRes = checkMobile();
+		if(MobileRes=="10"){//手机号不属于申请人、共同人、担保人
+			setItemValue(0,0,"MOBILE","");//清空预留手机号
 			return;
 		}
 		
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp
index 42c64033c..4f093d119 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp
@@ -126,10 +126,10 @@
 		if(TelResult==false){
 			return;
 		}
-		var WorkTelResult = checkWorkTel();
-		if(WorkTelResult==false){
-			return;
-		}
+// 		var WorkTelResult = checkWorkTel();
+// 		if(WorkTelResult==false){
+// 			return;
+// 		}
 		as_save(0,"goBack()");
 	}
 	
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
index de02ec92f..8ea763f41 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
@@ -90,6 +90,7 @@
 		dwTemp.getDataObject().setRequired("thirdopinion", false);
 		dwTemp.getDataObject().setReadOnly("thirdchoice", false);
 		dwTemp.getDataObject().setReadOnly("thirdopinion", false);
+		dwTemp.getDataObject().setReadOnly("InterOpinion1", true);
 		dwTemp.setGroupHidden("0030,0040,0050");
 	}
 	dwTemp.genHTMLObjectWindow(flowunid);
@@ -113,13 +114,19 @@
 			_user_validator[0]['rules']['FIRSTOPINION']['required0'] = true;
 			_user_validator[0]['messages']['FIRSTOPINION']['required0'] = "请输入审批意见";
 			break;
-		case '0030':
+		case '0030'://复审
 			//$("#A_div_1210").attr("style","display:none;");
 			//$("#A_div_1220").attr("style","display:none;");
 			//$("#A_div_1230").attr("style","display:none;");
 			//$("#A_div_1240").attr("style","display:none;");
 			$("#A_div_1250").attr("style","display:none;");
 			$("#A_div_1260").attr("style","display:none;");
+			
+			$("#FIRSTCHOICE").attr("disabled","disabled");//初审意见
+			$("#FIRSTOPINION").attr("disabled","disabled");//审批意见
+			$("#INTEROPINION1").attr("disabled","disabled");//初审内部意见
+			$("#DISTRIOPINION1").attr("disabled","disabled");//初审经销商意见
+			
 			_user_validator[0]['rules']['SECONDCHOICE']['required0'] = true;
 			_user_validator[0]['messages']['SECONDCHOICE']['required0'] = '请输入复审意见';
 			_user_validator[0]['rules']['SECONDOPINION']['required0'] = true;
@@ -132,6 +139,16 @@
 			//$("#A_div_1240").attr("style","display:none;");
 			//$("#A_div_1250").attr("style","display:none;");
 			//$("#A_div_1260").attr("style","display:none;");
+			
+			$("#FIRSTCHOICE").attr("disabled","disabled");//初审意见
+			$("#FIRSTOPINION").attr("disabled","disabled");//审批意见
+			$("#INTEROPINION1").attr("disabled","disabled");//初审内部意见
+			$("#DISTRIOPINION1").attr("disabled","disabled");//初审经销商意见
+			$("#SECONDCHOICE").attr("disabled","disabled");//复审意见
+			$("#SECONDOPINION").attr("disabled","disabled");//审批意见
+			$("#INTEROPINION2").attr("disabled","disabled");//复审内部意见
+			$("#DISTRIOPINION2").attr("disabled","disabled");//复审经销商意见
+			
 			_user_validator[0]['rules']['THIRDCHOICE']['required0'] = true;
 			_user_validator[0]['messages']['THIRDCHOICE']['required0'] = '请输入部门负责人意见';
 			_user_validator[0]['rules']['THIRDOPINION']['required0'] = true;
@@ -144,6 +161,16 @@
 			$("#A_div_1240").attr("style","display:none;");
 			$("#A_div_1250").attr("style","display:none;");
 			$("#A_div_1260").attr("style","display:none;");
+			
+			$("#FIRSTCHOICE").attr("disabled","disabled");//初审意见
+			$("#FIRSTOPINION").attr("disabled","disabled");//审批意见
+			$("#INTEROPINION1").attr("disabled","disabled");//初审内部意见
+			$("#DISTRIOPINION1").attr("disabled","disabled");//初审经销商意见
+			$("#SECONDCHOICE").attr("disabled","disabled");//复审意见
+			$("#SECONDOPINION").attr("disabled","disabled");//审批意见
+			$("#INTEROPINION2").attr("disabled","disabled");//复审内部意见
+			$("#DISTRIOPINION2").attr("disabled","disabled");//复审经销商意见
+			
 			_user_validator[0]['rules']['FOURCHOICE']['required0'] = true;
 			_user_validator[0]['messages']['FOURCHOICE']['required0'] = '请输入总经理意见';
 			_user_validator[0]['rules']['FOUROPINION']['required0'] = true;
@@ -159,13 +186,13 @@
 		if(firstchoice==""){
 			setItemRequired(0,"InterOpinion1",false);
 			setItemRequired(0,"DistriOpinion1",false);
-			$("#FIRSTOPINION").removeAttr("disabled");
+			$("#FIRSTOPINION").attr("disabled","");
 		}
 		if(firstchoice=="0010"){
 			setItemRequired(0,"A_div_1220",true);
 			setItemRequired(0,"InterOpinion1",false);
 			setItemRequired(0,"DistriOpinion1",true);
-			$("#FIRSTOPINION").removeAttr("disabled");
+			$("#FIRSTOPINION").attr("disabled","");
 			var obj=document.getElementById('FIRSTOPINION'); 
 			for(var i=0;i<7;i++){
 				obj.options[i].style.display = "block"; 
@@ -175,7 +202,7 @@
 		if(firstchoice=="0020"){
 			setItemRequired(0,"InterOpinion1",true);
 			setItemRequired(0,"DistriOpinion1",false);
-			$("#FIRSTOPINION").removeAttr("disabled");
+			$("#FIRSTOPINION").attr("disabled","");
 			var obj=document.getElementById('FIRSTOPINION');
 			for(var i=0;i<7;i++){
 				obj.options[i].style.display = "none"; 
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
index c68d5159a..500ed390b 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
@@ -241,7 +241,7 @@
 			checkDriver();
 			//ValidityCheck();
 		}
-		frame_list.window.onload = function(){
+		frame_list.window.onload = function(){//当页面加载完后调用子页面方法，不能去掉
 			changeChildrensNumber();
 		}
 	})
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
index ad2bce222..790151371 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
@@ -94,25 +94,24 @@
 		{
 
 			//从页面上获取客户编号，产品编号
-			var carAttributes = getItemValue(0,getRow(),"carAttributes");
-			var leasehold = getItemValue(0,getRow(),"leasehold");
-			var productModel =getItemValue(0,getRow(),"productModel");
-			var carSeries = getItemValue(0,getRow(),"carSeries");
-			var carSystem = getItemValue(0,getRow(),"carSystem");
-			var productId = getItemValue(0,getRow(),"productId");
-			var productname = getItemValue(0,getRow(),"productName");
-			var custid = getItemValue(0,getRow(),"CustomerID");
-			var custname = getItemValue(0,getRow(),"CustomerName");
-			var customerType = getItemValue(0,getRow(),"Customer_type");
-			var certtype = getItemValue(0,getRow(),"certtype");
-			var certid = getItemValue(0,getRow(),"certid");
-			var versionid = getItemValue(0,getRow(),"versionid");
-			var modelid = getItemValue(0,getRow(),"modelid");
-			var certid = getItemValue(0,getRow(),"certid");
-			var businessType = "1";
-			var price = getItemValue(0,getRow(),"price");
-			var liter = getItemValue(0,getRow(),"liter");
-			var geartype = getItemValue(0,getRow(),"geartype");
+			var carAttributes = getItemValue(0,getRow(),"carAttributes");//车辆属性
+			var leasehold = getItemValue(0,getRow(),"leasehold");//租赁方式
+			var productModel =getItemValue(0,getRow(),"productModel");//品牌
+			var carSeries = getItemValue(0,getRow(),"carSeries");//车系
+			var carSystem = getItemValue(0,getRow(),"carSystem");//车型
+			var productId = getItemValue(0,getRow(),"productId");//产品ID
+			var productname = getItemValue(0,getRow(),"productName");//产品名称
+			var custid = getItemValue(0,getRow(),"CustomerID");//客户ID
+			var custname = getItemValue(0,getRow(),"CustomerName");//客户名称
+			var customerType = getItemValue(0,getRow(),"Customer_type");//客户类型
+			var certtype = getItemValue(0,getRow(),"certtype");//证件类型
+			var certid = getItemValue(0,getRow(),"certid");//证件号
+			var versionid = getItemValue(0,getRow(),"versionid");//版本ID
+			var modelid = getItemValue(0,getRow(),"modelid");//车型ID
+			var businessType = "1";//业务类型，1是汽车业务，2是传统业务，3是汽车传统业务
+			var price = getItemValue(0,getRow(),"price");//车辆指导价
+			var liter = getItemValue(0,getRow(),"liter");//排量
+			var geartype = getItemValue(0,getRow(),"geartype");//档位
 			
 			if(carAttributes==""){
 				alert("请选择车辆属性");
@@ -154,7 +153,7 @@
 			
 			var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
 		 	sParams =sParams+",ProductId="+productId+",ProductName="+productname+",CustomerType="+customerType+",carAttributes="+carAttributes+",leasehold="+leasehold+",carSystem="+carSystem+",custname="+custname+",certtype="+certtype+",certid="+certid+",productModel="+productModel+",carSeries="+carSeries+",versionid="+versionid+",modelid="+modelid+",businessType="+businessType+",price="+price+",liter="+liter+",geartype="+geartype;
-		 	var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction","initFLow",sParams);
+		 	var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction","initFLow",sParams);//定义流程中需要的参数
 		   if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_" )
 			{
 				doCancel();	
diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp
index e84dbb8ba..da3617b53 100644
--- a/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp
@@ -63,8 +63,8 @@
 			var tempParam={};
 			var sparam="";
 			//模板号
-			debugger;
-			param["templateNo"]="ceaa18f72b0e4bbaa6e66dcfd7e32c87";
+// 			param["templateNo"]="ceaa18f72b0e4bbaa6e66dcfd7e32c87";
+			param["templateNo"]="2ef0d0fa5dfb4fe2bf3ff6d4487dc22a";
 			
 			//生成文件关联关系
 			tempParam["OBJECTTYPE"]="租金通知书";
@@ -124,7 +124,8 @@
 			for(var i=0;i<PAYMENT_NUMBERS.length;i++){
 				var plan_number=PAYMENT_NUMBERS[i];//投放编号
 				var plan_list=PLAN_LISTS[i];//期次
-				var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","claimSignA","PAYMENT_NUMBER="+plan_number+",PLAN_LIST="+plan_list);
+				var contractID = getItemValue(0,getRow(0),"contract_id");
+				var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","claimSignA","PAYMENT_NUMBER="+plan_number+",PLAN_LIST="+plan_list+",contract_id="+contractID);
 				if("success"==result){
 					alert("盖章成功！！！");
 					location.reload();
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index 95b842cc5..3b4f3c6b1 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -2094,108 +2094,6 @@
 				</managerProperties>
 			</manager>
 		</class>
-		<class name="LB_CAR_CREDIT_TEMP" label="" keyAttributes="ID">
-			<attributes>
-				<attribute name="ID" label="鏍囪瘑缂栧彿" type="STRING" length="32"/>
-				<attribute name="biz_code" label="宸ヤ綔娴佺紪鍙�" type="STRING" length="100"/>
-				<attribute name="flowunid" label="娴佺▼缂栧彿" type="STRING" length="100"/>
-				<attribute name="entryid" label="杩涗欢ID" type="STRING" length="100"/>
-				<attribute name="diploma" label="瀛﹀巻" type="STRING" length="100"/>
-				<attribute name="industry" label="鎵�灞炶涓�" type="STRING" length="100"/>
-				<attribute name="career" label="鑱屼笟" type="STRING" length="100"/>
-				<attribute name="occupation" label="鑱屼綅" type="STRING" length="100"/>
-				<attribute name="marriage" label="濠氬Щ鎯呭喌" type="STRING" length="100"/>
-				<attribute name="work_time" label="宸ヤ綔鏃堕棿" type="STRING" length="100"/>
-				<attribute name="monthly_income" label="鏈堝潎鏀跺叆" type="STRING" length="100"/>
-				<attribute name="annual_income" label="骞存敹鍏�" type="STRING" length="100"/>
-				<attribute name="registered_address" label="鎴风睄鍦板潃" type="STRING" length="100"/>
-				<attribute name="home_address" label="瀹跺涵鍦板潃" type="STRING" length="100"/>
-				<attribute name="contact_address" label="閫氳鍦板潃" type="STRING" length="100"/>
-				<attribute name="company_address" label="鍗曚綅鍦板潃" type="STRING" length="100"/>
-				<attribute name="house_type" label="鎴夸骇绫诲瀷" type="STRING" length="100"/>
-				<attribute name="house_property" label="鎴夸骇鎯呭喌" type="STRING" length="100"/>
-				<attribute name="applyer_type" label="浜哄憳绫诲埆" type="STRING" length="100"/>
-				<attribute name="company_type" label="鍏徃鎬ц川" type="STRING" length="100"/>
-				<attribute name="work_phone" label="鍗曚綅搴ф満" type="STRING" length="100"/>
-				<attribute name="organization_address" label="宸ヤ綔鍗曚綅鍦板潃" type="STRING" length="100"/>
-				<attribute name="device_id" label="璁惧ID" type="STRING" length="100"/>
-				<attribute name="mobile_name_consistence" label="鎵嬫満鍙峰鍚嶆牳楠岀粨鏋�" type="STRING" length="100"/>
-				<attribute name="is_cross_loan" label="鏄惁鏇捐法骞冲彴鍊熸" type="STRING" length="100"/>
-				<attribute name="event_occur_time" label="浜嬩欢鏃堕棿" type="STRING" length="100"/>
-				<attribute name="loan_date" label="璐锋鏃ユ湡" type="STRING" length="100"/>
-				<attribute name="resp_detail_type" label="褰掑睘鍦拌鎯呯被鍨�" type="STRING" length="100"/>
-				<attribute name="loan_term" label="璐锋鏈熼檺" type="STRING" length="100"/>
-				<attribute name="loan_amount" label="璐锋閲戦" type="STRING" length="100"/>
-				<attribute name="loan_term_unit" label="璐锋鏈熼檺鍗曚綅" type="STRING" length="100"/>
-				<attribute name="customer_channel" label="鑾峰娓犻亾" type="STRING" length="100"/>
-				<attribute name="apply_channel" label="杩涗欢娓犻亾" type="STRING" length="100"/>
-				<attribute name="apply_province" label="杩涗欢鐪佷唤" type="STRING" length="100"/>
-				<attribute name="contact5_mobile" label="绗簲鑱旂郴浜烘墜鏈哄彿" type="STRING" length="100"/>
-				<attribute name="contact5_id_number" label="绗簲鑱旂郴浜鸿韩浠借瘉" type="STRING" length="100"/>
-				<attribute name="contact5_name" label="绗簲鑱旂郴浜哄鍚�" type="STRING" length="100"/>
-				<attribute name="contact5_relation" label="绗簲鑱旂郴浜虹ぞ浼氬叧绯�" type="STRING" length="100"/>
-				<attribute name="contact4_mobile" label="绗洓鑱旂郴浜烘墜鏈哄彿" type="STRING" length="100"/>
-				<attribute name="contact4_id_number" label="绗洓鑱旂郴浜鸿韩浠借瘉" type="STRING" length="100"/>
-				<attribute name="contact4_name" label="绗洓鑱旂郴浜哄鍚�" type="STRING" length="100"/>
-				<attribute name="contact4_relation" label="绗洓鑱旂郴浜虹ぞ浼氬叧绯�" type="STRING" length="100"/>
-				<attribute name="contact3_mobile" label="绗笁鑱旂郴浜烘墜鏈哄彿" type="STRING" length="100"/>
-				<attribute name="contact3_id_number" label="绗笁鑱旂郴浜鸿韩浠借瘉" type="STRING" length="100"/>
-				<attribute name="contact3_name" label="绗笁鑱旂郴浜哄鍚�" type="STRING" length="100"/>
-				<attribute name="contact3_relation" label="绗笁鑱旂郴浜虹ぞ浼氬叧绯�" type="STRING" length="100"/>
-				<attribute name="contact2_mobile" label="绗簩鑱旂郴浜烘墜鏈哄彿" type="STRING" length="100"/>
-				<attribute name="contact2_id_number" label="绗簩鑱旂郴浜鸿韩浠借瘉" type="STRING" length="100"/>
-				<attribute name="contact2_name" label="绗簩鑱旂郴浜哄鍚�" type="STRING" length="100"/>
-				<attribute name="contact2_relation" label="绗簩鑱旂郴浜虹ぞ浼氬叧绯�" type="STRING" length="100"/>
-				<attribute name="contact1_mobile" label="绗竴鑱旂郴浜烘墜鏈哄彿" type="STRING" length="100"/>
-				<attribute name="contact1_id_number" label="绗竴鑱旂郴浜鸿韩浠借瘉" type="STRING" length="100"/>
-				<attribute name="contact1_name" label="绗竴鑱旂郴浜哄鍚�" type="STRING" length="100"/>
-				<attribute name="contact1_relation" label="绗竴鑱旂郴浜虹ぞ浼氬叧绯�" type="STRING" length="100"/>
-				<attribute name="account_name" label="鍊熸浜哄鍚�" type="STRING" length="100"/>
-				<attribute name="id_number" label="鍊熸浜鸿韩浠借瘉" type="STRING" length="100"/>
-				<attribute name="account_mobile" label="鍊熸浜烘墜鏈�" type="STRING" length="100"/>
-				<attribute name="account_phone" label="鍊熸浜哄骇鏈�" type="STRING" length="100"/>
-				<attribute name="card_number" label="鍊熸浜哄崱鍙�" type="STRING" length="100"/>
-				<attribute name="qq_number" label="鍊熸浜篞Q" type="STRING" length="100"/>
-				<attribute name="account_email" label="鍊熸浜洪偖绠�" type="STRING" length="100"/>
-				<attribute name="lend_company" label="鍊熸鍏徃鍚嶇О" type="STRING" length="100"/>
-				<attribute name="account_phone_work" label="鍊熸浜哄崟浣嶇數璇�" type="STRING" length="100"/>
-				<attribute name="organization" label="鍊熸浜哄伐浣滃崟浣�" type="STRING" length="100"/>
-				<attribute name="account_address_work" label="鍊熸浜哄崟浣嶅湴鍧�" type="STRING" length="100"/>
-				<attribute name="loan_purpose" label="鍊熸鐢ㄩ��" type="STRING" length="100"/>
-				<attribute name="coborrower_name" label="鍏卞悓鍊熸浜哄鍚�" type="STRING" length="100"/>
-				<attribute name="coborrower_id_number" label="鍏卞悓鍊熸浜鸿韩浠借瘉" type="STRING" length="100"/>
-				<attribute name="coborrower_mobile" label="鍏卞悓鍊熸浜烘墜鏈�" type="STRING" length="100"/>
-				<attribute name="coborrower_phone" label="鍏卞悓鍊熸浜哄骇鏈�" type="STRING" length="100"/>
-				<attribute name="coborrower_company_address" label="鍏卞悓鍊熸浜哄叕鍙稿湴鍧�" type="STRING" length="100"/>
-				<attribute name="coborrower_company" label="鍏卞悓鍊熸浜哄伐浣滃崟浣�" type="STRING" length="100"/>
-				<attribute name="coborrower_home_address" label="鍏卞悓鍊熸浜哄搴湴鍧�" type="STRING" length="100"/>
-				<attribute name="coborrower_relation" label="鍏卞悓鍊熸浜虹ぞ浼氬叧绯�" type="STRING" length="100"/>
-				<attribute name="surety_name" label="鎷呬繚浜哄鍚�" type="STRING" length="100"/>
-				<attribute name="surety_id_number" label="鎷呬繚浜鸿韩浠借瘉" type="STRING" length="100"/>
-				<attribute name="surety_mobile" label="鎷呬繚浜烘墜鏈�" type="STRING" length="100"/>
-				<attribute name="surety_phone" label="鎷呬繚浜哄骇鏈�" type="STRING" length="100"/>
-				<attribute name="surety_company_address" label="鎷呬繚浜哄叕鍙稿湴鍧�" type="STRING" length="100"/>
-				<attribute name="surety_home_address" label="鎷呬繚浜哄搴湴鍧�" type="STRING" length="100"/>
-				<attribute name="black_box" label="black_box" type="STRING" length="100"/>
-				<attribute name="token_id" label="TokenId" type="STRING" length="100"/>
-				<attribute name="ip_address" label="IP" 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_temp" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager>
-		</class>
 		<class name="CUSTOMER_COMPANY" label="娉曚汉鍩烘湰淇℃伅" keyAttributes="id">
 			<attributes>
 				<attribute name="id" label="鏍囪瘑" type="STRING" length="32"/>
@@ -2546,30 +2444,6 @@
 				</managerProperties>
 			</manager>
 		</class>
-		<class name="LB_CAR_CREDIT_CALLRESULT_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="杩涗欢缂栧彿" type="STRING" length="100"/>
-				<attribute name="final_score" label="椋庨櫓鍒嗘暟" type="STRING" length="100"/>
-				<attribute name="final_decision" 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_callresult_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"/>
@@ -2738,25 +2612,6 @@
 			</manager>
 		</class>
 		
-		<class name="LB_CAR_CREDIT_PETITIONER_HOMEANALYSIS" label="鐢宠浜轰俊鎭綊灞炲湴瑙ｆ瀽琛�" keyAttributes="ID">
-			<attributes>
-				<attribute name="ID" label="鏍囪瘑缂栧彿" type="STRING" length="32"/>
-				<attribute name="flowunid" label="娴佺▼缂栧彿" type="STRING" length="100"/>
-				<attribute name="name" label="鐢宠浜哄鍚�" type="STRING" length="100"/>
-				<attribute name="certid" label="鐢宠浜鸿韩浠借瘉鍙风爜" type="STRING" length="100"/>
-				<attribute name="phonenumber" label="鐢宠浜烘墜鏈哄彿鐮�" type="STRING" length="100"/>
-				<attribute name="certidqzone" label="鐢宠浜鸿韩浠借瘉鍙风爜褰掑睘鍦�" type="STRING" length="500"/>
-				<attribute name="phonenumberqzone" label="鐢宠浜烘墜鏈哄彿鐮佸綊灞炲湴" type="STRING" length="500"/>
-			</attributes>
-			<manager>
-				<managerProperties>
-					<property name="table" value="lb_car_credit_petitioner_homeanalysis" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager>
-		</class>
-		
-		
 		<class name="LB_TEST" label="瀹氭椂浠诲姟澶勭悊鍣�" keyAttributes="id">
 			<attributes>
 				<attribute name="id" label="鏍囪瘑id" type="STRING" length="100"/>
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 3fb035a3c..a4c99ca3c 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -3930,6 +3930,29 @@
 				</managerProperties>
 			</manager>
 		</class>
+		
+		<class name="LB_BUSINESS_OVERDATE" label="" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="ID" type="STRING" length="40"/>
+				<attribute name="OVER_DATE" label="OVER_DATE" type="STRING" length="10"/>
+				<attribute name="param1" label="param1" type="STRING" length="50"/>
+				<attribute name="param2" label="param2" type="STRING" length="50"/>
+				<attribute name="param3" label="param3" type="STRING" length="50"/>
+				<attribute name="param4" label="param4" type="STRING" length="50"/>
+				<attribute name="INPUTUSERID" label="鐧昏浜�" type="STRING" length="32"/>
+				<attribute name="INPUTORGID" label="鐧昏閮ㄩ棬" type="STRING" length="32"/>
+				<attribute name="INPUTTIME" label="鐧昏鏃堕棿" type="STRING" length="32"/>
+				<attribute name="UPDATEUSERID" label="鏇存柊浜�" type="STRING" length="32"/>
+				<attribute name="UPDATEORGID" label="鏇存柊閮ㄩ棬" type="STRING" length="32"/>
+				<attribute name="UPDATETIME" label="鏇存柊鏃堕棿" type="STRING" length="32"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_business_overdate" />
+					<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">
diff --git a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
index 747a7567b..3772c9435 100644
--- a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
+++ b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java
@@ -32,7 +32,7 @@ public class FundFundPlanExecutor {
 	  public void run(ConditionBean cb , TabCalBean tcb,FundRentPlanBean rentPlan,JBOTransaction tx) throws Exception{
 		  cb.setDocId(tcb.getDocId());
 		  List<FundPlanBean> fundPlanBeans=new ArrayList<FundPlanBean>();
-		  if(Double.parseDouble(cb.getCautionMoney()) > 0 ){
+		  if(Double.parseDouble(cb.getCautionDeductionMoney()) > 0 ){
 			  fundPlanBeans = splitFundFundPlan(rentPlan, cb, "", "feetype17","feetype16");
 		  }else{
 			  cb.setDeductionLastPlanDate(cb.getLastPlanDate());//不生成保证金抵扣及退还计划
@@ -99,7 +99,7 @@ public class FundFundPlanExecutor {
 	  				ffcp.setSettleMethod("payfund6");
 	  				ffcp.setPayType(StringUtil.nullToString(param.get("CostType01")).length()>0?param.get("CostType01"):"pay_type_in");
 	  				if("NOMINAL_PRICE".equals(entry.getKey())){
-	  					param.put("CostType02", "PaymentTime7");
+	  					param.put("CostType02", "PaymentTime4");
 	  				}
 	  				if("feetype5".equals(item.getItemNo()) && "".equals(StringUtil.nullToString(param.get("CostType02")))) {
 	  					continue;
@@ -110,11 +110,10 @@ public class FundFundPlanExecutor {
 	  				if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){
 		  				ffcp.setPayCust(custid);
 	  				}
-	  				fundPlanBeans.add(ffcp);
-	  				if(StringUtil.nullToString(param.get("FINA")).equals("Y")){//需要判断是否融资
-	  					if(con.getAttribute(entry.getKey()).getString().equals("N"))
+	  				if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//需要判断是否融资
+	  					if(con.getAttribute(entry.getKey() + "_FINA").getString().equals("finatype01"))
 	  					{
-		  					FundPlanBean ffcp2 = new FundPlanBean();
+		  					/*FundPlanBean ffcp2 = new FundPlanBean();
 			  				ffcp2.setFeeType(item.getItemNo());//费用类型
 			  				ffcp2.setPlanList("1");
 			  				ffcp2.setSettleMethod("payfund6");
@@ -124,8 +123,11 @@ public class FundFundPlanExecutor {
 			  				if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){
 				  				ffcp2.setPayCust(custid);
 			  				}
-			  				fundPlanBeans.add(ffcp2);
+			  				fundPlanBeans.add(ffcp2);*/
+	  						fundPlanBeans.add(ffcp);
 	  					}
+	  				} else {
+	  					fundPlanBeans.add(ffcp);
 	  				}
 	  			}
 			}
@@ -209,6 +211,13 @@ public class FundFundPlanExecutor {
       private static List<FundPlanBean> splitFundFundPlan(FundRentPlanBean planBean,ConditionBean cb,String custID,String remainType,String reduceType) throws Exception{
   		List<String> planDates = planBean.getPlanDateList();
   		List<String> rentPlans = planBean.getRentList();
+  		//安鹏逻辑，只抵最后一期租金
+  		BigDecimal lastRent = new BigDecimal(rentPlans.get(rentPlans.size() - 1));
+  		BigDecimal cautionMoneyDeduction = new BigDecimal(cb.getCautionDeductionMoney());
+  		if(lastRent.compareTo(cautionMoneyDeduction) < 0) {
+  			cb.setCautionMoneyRemain(cautionMoneyDeduction.subtract(lastRent).toString());
+  			cb.setCautionDeductionMoney(lastRent.toString());
+  		}
   		List<FundPlanBean> newFundPlans = new ArrayList<FundPlanBean>();
   		if(Double.parseDouble(cb.getCautionMoneyRemain()) > 0){//退还保证金
   			FundPlanBean newFundPlan=new FundPlanBean();
@@ -223,7 +232,16 @@ public class FundFundPlanExecutor {
   		}
   		if(Double.parseDouble(cb.getCautionDeductionMoney()) > 0){//抵扣保证金
   			BigDecimal planMoney=new BigDecimal(cb.getCautionDeductionMoney());
-  			int planList=0;
+  			FundPlanBean newFundPlan=new FundPlanBean();
+  			newFundPlan.setFeeType(reduceType);
+  			newFundPlan.setPlanList("1");
+  			newFundPlan.setSettleMethod("payfund6");
+  			newFundPlan.setPayType("pay_type_out");
+  			newFundPlan.setPlanMoney(planMoney.toString());
+  			newFundPlan.setPlanDate(planDates.get(planDates.size() - 1));
+  			newFundPlan.setPayCust(custID);
+  			newFundPlans.add(newFundPlan);
+  			/*int planList=0;
   			for(int i = planDates.size()-1 ; i >= 0 ; i--){
   				planList++;
   				BigDecimal rent=new BigDecimal(rentPlans.get(i));
@@ -258,7 +276,7 @@ public class FundFundPlanExecutor {
   		  			cb.setDeductionLastPlanDate(planDates.get(i));
   		  			break;
   				}
-  			}
+  			}*/
   		}else{
   			cb.setDeductionLastPlanDate(cb.getLastPlanDate());
   		}
diff --git a/calc/com/tenwa/reckon/help/ConditionHelper.java b/calc/com/tenwa/reckon/help/ConditionHelper.java
index 890c0e44e..eaceefc20 100644
--- a/calc/com/tenwa/reckon/help/ConditionHelper.java
+++ b/calc/com/tenwa/reckon/help/ConditionHelper.java
@@ -81,6 +81,10 @@ public class ConditionHelper {
 		params.put("income_number", cb.getIncomeNumber() + "");
 		params.put("lease_term", cb.getLeaseTerm()+"");
 		params.put("FIRST_PAYMENT_TOTAL",cb.getFirstPaymentTotal());
+		
+		//更新保证金抵扣
+		params.put("CAUTION_DEDUCTION_MONEY",cb.getCautionDeductionMoney());
+		params.put("CAUTION_MONEY_REMAIN",cb.getCautionMoneyRemain());
 		this.updateCondition(bean, params);
 		return params;
 	}
diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java
index 47ce91d90..eb8c29851 100644
--- a/src/com/tenwa/channelportal/action/ContractSignAction.java
+++ b/src/com/tenwa/channelportal/action/ContractSignAction.java
@@ -15,6 +15,7 @@ import java.util.Map;
 import org.apache.log4j.Logger;
 
 import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP;
+import jbo.app.tenwa.customer.CUSTOMER_PERSON;
 import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP;
 import jbo.app.tenwa.doc.LB_DOCATTRIBUTE;
 import jbo.app.tenwa.doc.LB_DOCLIBRARY;
@@ -26,6 +27,7 @@ import jbo.com.tenwa.lease.carbrand.LB_CONTRACT_SIGN_LOG;
 import jbo.com.tenwa.lease.comm.LB_CONTRACT_TEMPLATE;
 import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP;
 import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
+import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE;
 import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP;
 import jbo.sys.CODE_LIBRARY;
 import jbo.sys.USER_INFO;
@@ -1784,8 +1786,18 @@ public String claimSign(JBOTransaction tx) throws Exception {
 		BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME, tx);
 		ContractSignInfo con = null;
 		BizObject bo = null;
-		String contract_id="";
+//		String contract_id="";
+		String info="";
 		try{
+			//获取承租人的姓名和电话号
+			BizObjectManager lulManager = JBOFactory.getBizObjectManager(LB_UNION_LESSEE.CLASS_NAME, tx);
+			String customerid = lulManager.createQuery("CONTRACT_ID=:contractId").setParameter("contractId", contract_id).getSingleResult(false).getAttribute("CUSTOMER_ID").toString();
+			BizObjectManager crManage = JBOFactory.getBizObjectManager(CUSTOMER_PERSON.CLASS_NAME, tx);
+			BizObject cr = crManage.createQuery("CUSTOMERID=:customerid").setParameter("customerid", customerid).getSingleResult(false);
+			if(cr != null){
+				info = cr.getAttribute("FULLNAME").toString() + "@" + cr.getAttribute("mobile").toString();
+			}
+			//获取需要盖章的文件信息
 			Map<String,ContractSignInfo> map=new HashMap<String,ContractSignInfo>();
 			bo = contBom.createQuery("library_id=:libraryid").setParameter("libraryid", libraryid).getSingleResult(true);
 			if(bo != null){
@@ -1799,7 +1811,7 @@ public String claimSign(JBOTransaction tx) throws Exception {
 					throw new RuntimeException("要读取的文件不存在");
 				}
 				con.setInputfile(BASE64.encodeImgageToBase64(file));
-				map.put(id, con);
+				map.put(info, con);
 				Map<String, String> resultMap = null;
 				//调代理的接口
 //				doc_name = bo.getAttribute("doc_name").toString();
diff --git a/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java b/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java
new file mode 100644
index 000000000..7e2ee2ebd
--- /dev/null
+++ b/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java
@@ -0,0 +1,102 @@
+package com.tenwa.comm.message.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import jbo.com.tenwa.entity.comm.message.BT_BUSSINESS_MESSAGE_CONFIG;
+import jbo.com.tenwa.lease.comm.LB_BUSINESS_OVERDATE;
+import jbo.com.tenwa.lease.comm.LB_CANCLE_INFO;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
+
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+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.amarsoft.are.util.StringFunction;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+/**
+ * 对业务审批结束后超过指定时间未合同制作的业务合同进行
+ * 业务撤销操作
+ * @author jianghd
+ *
+ */
+public class BusinessCancelJob  implements Job {
+	
+	private String overDate;
+	@Override
+	public void execute(JobExecutionContext arg0) throws JobExecutionException {
+		JBOTransaction tx=null;
+		try {
+			tx= JBOFactory.createJBOTransaction();
+			this.executeMessage(tx);
+			tx.commit();
+		} catch (Exception e) {
+			try {
+				if(tx!=null){
+					tx.rollback();
+				}
+			} catch (JBOException e1) {
+				e1.printStackTrace();
+			}
+			e.printStackTrace();
+		}
+	} 
+	/**
+	 * 获取符合合同撤销条件的项目基本信息
+	 * @param tx
+	 * @return
+	 * @throws Exception
+	 */
+	public List<Map<String, String>> loadMessageNo(JBOTransaction tx ) throws Exception{
+		//1.获取配置的超时天数
+		String sql1 = "SELECT max(INPUTTIME) inputtime,over_date FROM lb_business_overdate where inputtime is not null and over_date>0 group by INPUTTIME";
+		List<Map<String, String>> ds =  DataOperatorUtil.getDataBySql(tx, sql1, null);
+		overDate = "";
+		if(ds.size()>0){
+			overDate = ds.get(0).get("over_date");
+		}
+		if(overDate ==""||Integer.parseInt(overDate)==0){
+			return null;
+		}
+		//2.获取超时的未制作合同的业务记录
+		String sql="select ID from lb_project_info O where O.project_status='13'"+
+				" and not EXISTS (select 1 from flow_bussiness_object fbo where fbo.proj_id=O.id and fbo.flow_name='合同制作流程')"+
+				" and not EXISTS (select 1 from lb_contract_info_temp lci where lci.project_id=O.id)"+
+				" and TO_DAYS(SYSDATE())-TO_DAYS(O.end_date)>"+overDate;
+		 ds =  DataOperatorUtil.getDataBySql(tx, sql, null);
+		if(ds.size()>0){
+			return ds;
+		}
+		return null;
+	}
+	public void executeMessage( JBOTransaction tx ) throws Exception{
+		List<Map<String,String>> ds=this.loadMessageNo(tx);
+		BizObjectManager lpibom = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx);
+		BizObjectManager lcibom = JBOFactory.getBizObjectManager(LB_CANCLE_INFO.CLASS_NAME, tx);
+		if(ds!=null){
+			for (Map<String, String> map : ds) {
+				//1.更新项目表状态为104
+				lpibom.createQuery("update O set project_status='104' where id=:id").setParameter("ID", map.get("ID")).executeUpdate();
+				//2.新增项目对应撤销详情
+				BizObject lcibo = lcibom.newObject();
+				lcibo.setAttributeValue(LB_CANCLE_INFO.CANCLE_DATE, StringFunction.getTodayNow());
+				lcibo.setAttributeValue(LB_CANCLE_INFO.CANCLE_RESON,"系统检测到该业务超过合同制作等待发起时间:"+overDate+"天，故自动撤销该业务。");
+				lcibo.setAttributeValue(LB_CANCLE_INFO.INPUTTIME,StringFunction.getTodayNow());
+				lcibo.setAttributeValue(LB_CANCLE_INFO.INPUTUSERID,"system");
+				lcibo.setAttributeValue(LB_CANCLE_INFO.INPUTORGID,"system");
+				lcibo.setAttributeValue(LB_CANCLE_INFO.PROJECT_ID,map.get("ID"));
+//				lcibo.setAttributeValue(LB_CANCLE_INFO.CANCLE_TYPE,"");
+				lcibom.saveObject(lcibo);
+			}
+		}
+	}
+
+}
diff --git a/src_core/com/tenwa/util/SerialNumberUtil.java b/src_core/com/tenwa/util/SerialNumberUtil.java
index 06a8c6852..3166a6545 100644
--- a/src_core/com/tenwa/util/SerialNumberUtil.java
+++ b/src_core/com/tenwa/util/SerialNumberUtil.java
@@ -120,11 +120,19 @@ public class SerialNumberUtil {
 	}
 	
 	public static synchronized String  getProjectSerialNumber1(String orgId,JBOTransaction tx) throws Exception{
-		return   SerialNumberUtil.getSerialNumber("A{year}{maxOrderNumber}",7,null, "项目编号"+orgId, null, tx);
+		String currentDateTime = DateAssistant.getToday();
+		String currentYear = currentDateTime.substring(0,4);
+		String currentMonth =  currentDateTime.substring(5,7); 
+		String currentDay =  currentDateTime.substring(8,10);
+		return   SerialNumberUtil.getSerialNumber("A"+currentYear+currentMonth+currentDay+"{maxOrderNumber}",4,null, "项目编号"+orgId, null, tx);
 	}
 	
-	public static synchronized String  getProjectSerialNumber2(JBOTransaction tx) throws Exception{
-		return   SerialNumberUtil.getSerialNumber("P{year}{maxOrderNumber}",7,null, "项目编号", null, tx);
+	public static synchronized String  getProjectSerialNumber2(String orgId,JBOTransaction tx) throws Exception{
+		String currentDateTime = DateAssistant.getToday();
+		String currentYear = currentDateTime.substring(0,4);
+		String currentMonth =  currentDateTime.substring(5,7); 
+		String currentDay =  currentDateTime.substring(8,10);
+		return   SerialNumberUtil.getSerialNumber("T"+currentYear+currentMonth+currentDay+"{maxOrderNumber}",4,null, "项目编号"+orgId, null, tx);
 	}
 	
 	public static String getContractSerialNaumber(String dept,String area_code,JBOTransaction tx) throws Exception {
diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java
index 1bbace3d0..37b0d277a 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoCheck.java
@@ -26,7 +26,7 @@ public class CustomerInfoCheck {
 	private String repeatResult;
 	private String flowunid;
 	
-	public String checkName(JBOTransaction tx) throws JBOException{
+	public String checkName(JBOTransaction tx) throws JBOException{//校验姓名是否存在
 		if(customerType.equals("03")){//自然人
 			BizObject fullname = JBOFactory.createBizObjectQuery(CUSTOMER_PERSON.CLASS_NAME,"FULLNAME=:CustomerName").setParameter("CustomerName", this.CustomerName).getSingleResult(false);
 			if(fullname==null){
@@ -45,7 +45,7 @@ public class CustomerInfoCheck {
 		return nameResult;
 	}
 
-	public String checkCertId(JBOTransaction tx) throws JBOException{
+	public String checkCertId(JBOTransaction tx) throws JBOException{//校验证件是否存在
 		if(customerType.equals("03")){//自然人
 			BizObject cert=JBOFactory.createBizObjectQuery(CUSTOMER_PERSON.CLASS_NAME,"CERTID=:certid").setParameter("certid", this.certId).getSingleResult(false);
 			if(cert==null){
@@ -64,7 +64,7 @@ public class CustomerInfoCheck {
 		return certResult;
 	}
 
-	public String checkMobile(JBOTransaction tx) throws JBOException{
+	public String checkMobile(JBOTransaction tx) throws JBOException{//校验手机是否存在
 		if(customerType.equals("03")){//自然人
 			BizObject mobile=JBOFactory.createBizObjectQuery(CUSTOMER_PERSON.CLASS_NAME,"mobile=:mobile").setParameter("mobile", this.mobile).getSingleResult(false);
 			if(mobile==null){
@@ -76,7 +76,7 @@ public class CustomerInfoCheck {
 		return mobileResult;
 	}
 	
-	public String checkMobileRepeat(JBOTransaction tx) throws JBOException{
+	public String checkMobileRepeat(JBOTransaction tx) throws JBOException{//校验手机号是否重复
 		if(customerType.equals("03")){//自然人
 			//BizObject mobileP=JBOFactory.createBizObjectQuery(CUSTOMER_PERSON.CLASS_NAME,"mobile=:mobile").setParameter("mobile", this.mobile).getSingleResult(false);
 			BizObject mobilePT=JBOFactory.createBizObjectQuery(CUSTOMER_PERSON_TEMP.CLASS_NAME,"FLOWUNID=:flowunid and mobile=:mobile").setParameter("flowunid", this.flowunid).setParameter("mobile", this.mobile).getSingleResult(false);
@@ -94,6 +94,27 @@ public class CustomerInfoCheck {
 		return repeatResult;
 	}
 	
+	public String checkDebitCardMobile(JBOTransaction tx) throws JBOException{//校验扣款卡手机号
+		if(customerType.equals("03")){//自然人校验共同人和担保人
+			BizObject mobilePT=JBOFactory.createBizObjectQuery(CUSTOMER_PERSON_TEMP.CLASS_NAME,"FLOWUNID=:flowunid and mobile=:mobile").setParameter("flowunid", this.flowunid).setParameter("mobile", this.mobile).getSingleResult(false);
+			BizObject mobileFT=JBOFactory.createBizObjectQuery(CUSTOMER_FAMILY_TEMP.CLASS_NAME,"flowunid=:flowunid and tel=:mobile and Partner_='Y'").setParameter("flowunid", this.flowunid).setParameter("mobile", this.mobile).getSingleResult(false);
+			if(mobilePT!=null || mobileFT!=null){
+				this.mobileResult = "9";
+			}else{
+				this.mobileResult = "10";
+			}
+		}else if(customerType.equals("01")){//法人校验共同人和担保人
+			BizObject mobileFT=JBOFactory.createBizObjectQuery(CUSTOMER_FAMILY_TEMP.CLASS_NAME,"flowunid=:flowunid and tel=:mobile and Partner_='Y'").setParameter("flowunid", this.flowunid).setParameter("mobile", this.mobile).getSingleResult(false);
+			BizObject mobileLUT=JBOFactory.createBizObjectQuery(LB_GUARANTEE_UNIT_TEMP.CLASS_NAME,"FLOWUNID=:flowunid and MOBILE=:mobile").setParameter("flowunid", this.flowunid).setParameter("mobile", this.mobile).getSingleResult(false);
+			if(mobileLUT!=null || mobileFT!=null){
+				this.mobileResult = "9";
+			}else{
+				this.mobileResult = "10";
+			}
+		}
+		return mobileResult;
+	}
+	
 	public String getFlowunid() {
 		return flowunid;
 	}
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 e7e7b2393..bc497950d 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
@@ -54,29 +54,35 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{
 	@Override
 	public void customOperation(JBOTransaction tx,BizObject flowBussiness) throws Exception {
 		String uuid = UUID.randomUUID().toString();
-		this.FlowParam.put("ProjectId", UUID.randomUUID().toString().replaceAll("-", ""));
-		String projectNO=SerialNumberUtil.getProjectSerialNumber1(this.getAsUser().getOrgID(), tx);
+		this.FlowParam.put("ProjectId",uuid.replaceAll("-", ""));//项目ID
+		String projectNO = "";
+		//根据业务类型，生成不同的项目编号
+		if(businessType.equals("1")){//1是汽车业务
+			projectNO=SerialNumberUtil.getProjectSerialNumber1(this.getAsUser().getOrgID(), tx);//生成A开头编号			
+		}else if(businessType.equals("2")){//2是传统业务
+			projectNO=SerialNumberUtil.getProjectSerialNumber2(this.getAsUser().getOrgID(), tx);//生成T开头编号
+		}
 		//String projectName=projectNO+"_"+this.FlowParam.get("CustName")+this.FlowParam.get("ProductName")+"项目";
-		this.FlowParam.put("ProjectNo", projectNO);
-		this.FlowParam.put("FlowKey", projectNO);  
-		this.FlowParam.put("ProjectName", projectNO);
-		this.FlowParam.put("CustomerType", this.getCustomerType());
-		this.FlowParam.put("carAttributes", this.getCarAttributes());
-		this.FlowParam.put("leasehold", this.getLeasehold());
-		this.FlowParam.put("carSystem", this.getCarSystem());
-		this.FlowParam.put("custname", this.getCustname());
-		this.FlowParam.put("certtype", this.getCerttype());
-		this.FlowParam.put("certid", this.getCertid());
-		this.FlowParam.put("productModel", this.getProductModel());
-		this.FlowParam.put("carSeries", this.getCarSeries());
-		this.FlowParam.put("versionid", this.getVersionid());
-		this.FlowParam.put("modelid", this.getModelid());
-		this.FlowParam.put("businessType", this.getBusinessType());
-		this.FlowParam.put("price", this.getPrice());
-		this.FlowParam.put("liter", this.getLiter());
-		this.FlowParam.put("geartype", this.getGeartype());
-		this.FlowParam.put("ProductName", this.getProductName());
-		this.FlowParam.put("ProductId", this.getProductId());
+		this.FlowParam.put("ProjectNo", projectNO);//项目编号
+		this.FlowParam.put("FlowKey", projectNO);//流程互斥  
+		this.FlowParam.put("ProjectName", projectNO);//项目名称
+		this.FlowParam.put("carAttributes", this.getCarAttributes());//车辆属性
+		this.FlowParam.put("leasehold", this.getLeasehold());//租赁方式
+		this.FlowParam.put("productModel", this.getProductModel());//品牌
+		this.FlowParam.put("carSeries", this.getCarSeries());//车系
+		this.FlowParam.put("carSystem", this.getCarSystem());//车型
+		this.FlowParam.put("CustomerType", this.getCustomerType());//客户类型
+		this.FlowParam.put("custname", this.getCustname());//客户名称
+		this.FlowParam.put("certtype", this.getCerttype());//证件类型
+		this.FlowParam.put("certid", this.getCertid());//证件号
+		this.FlowParam.put("versionid", this.getVersionid());//版本ID
+		this.FlowParam.put("modelid", this.getModelid());//车型ID
+		this.FlowParam.put("businessType", this.getBusinessType());//业务类型，1汽车业务，2传统业务，3汽车传统业务
+		this.FlowParam.put("price", this.getPrice());//指导价
+		this.FlowParam.put("liter", this.getLiter());//排量
+		this.FlowParam.put("geartype", this.getGeartype());//档位
+		this.FlowParam.put("ProductName", this.getProductName());//产品名称
+		this.FlowParam.put("ProductId", this.getProductId());//产品ID
 	}