From a24b6bbdea8ff714c568c221c183a4eb70fea4ea Mon Sep 17 00:00:00 2001
From: liuzhao <liuzhao@DESKTOP-NULDTFM>
Date: Sat, 7 Jul 2018 10:39:15 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0jbo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 130be71e9..603063f88 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -19,6 +19,7 @@
 				<attribute name="UPDATEUSERID" label="更新人" type="STRING" length="32"/>
 				<attribute name="UPDATEORGID" label="更新部门" type="STRING" length="32"/>
 				<attribute name="UPDATETIME" label="更新时间" type="STRING" length="32"/>
+				<attribute name="contract_no" label="合同编号" type="STRING" length="100"/>
 			</attributes>
 			<manager>
 				<managerProperties>

From c1ed920326f80ce0bca28962bea45b9315280694 Mon Sep 17 00:00:00 2001
From: amarsoft <amarsoft@DESKTOP-3QRILR7>
Date: Sat, 7 Jul 2018 11:42:52 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf
index a5f7f946d..d65d8deac 100644
--- a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf
+++ b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowFunction.jspf
@@ -199,7 +199,7 @@ FlowFunction.signOpinion=function(sObjectType,sObjectNo,sFlowNo,sPhaseNo,isLoadS
 	    }
 	    //����ǩ�������
 	    AsDialog.PopView("/Common/WorkFlow/SignTaskOpinionInfo.jsp","TaskNo="+sTaskNo+"&ObjectType="+sObjectType+"&ObjectNo="+sObjectNo,
-				{width:"700px",height:"600px",title:"ǩ�����"},function(sReturn){
+				{width:"500px",height:"300px",title:"ǩ�����"},function(sReturn){
 					if(sReturn.length>0){
 						if(sReturn=="SUCCESS"){
 							alert("ǩ������ɹ�");	

From d62ed4c93b957af455a54cea356c924799b9ae30 Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei>
Date: Sat, 7 Jul 2018 13:29:07 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E4=BB=A3=E6=94=B6=E5=A4=8D=E5=AE=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp     | 4 ++--
 .../tenwa/collectaudit/cache/CollectAuditInfoCache.java    | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp
index 1ed91582a..c9723f6c3 100644
--- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp
@@ -24,8 +24,8 @@
 	String sButtons[][] = {
 		{"true","All","Button","�����ۿ�","�����ۿ�","batchCollect()","","","","btn_icon_add",""},
 		//{"true","All","Button","ʵʱ�ۿ�","ʵʱ�ۿ�","timelyCollect()","","","","btn_icon_add",""},
-		{"true","All","Button","�ֹ��ۿ�","�ֹ��ۿ�","afterCollectManage()","","","","btn_icon_add",""},
-		{"true","All","Button","��ѯ�����ۿ�","��ѯ�����ۿ�","queryBatchCollect()","","","","btn_icon_add",""},
+		//{"true","All","Button","�ֹ��ۿ�","�ֹ��ۿ�","afterCollectManage()","","","","btn_icon_add",""},
+		{"true","All","Button","�ֶ�ˢ��","�ֶ�ˢ��","queryBatchCollect()","","","","btn_icon_add",""},
 		{"true","","Button","�˻�","���δͨ��,�˻س���","if(confirm('ȷ��Ҫ�˻���?')){viewAndEdit()}","","","","btn_icon_detail",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
index 1765b62ce..eec395d97 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
@@ -447,10 +447,9 @@ public class CollectAuditInfoCache {
 			batch_number += ";�ֹ�������:"+rent;
 		}
 		//�����ո�״̬
-		bc.createQuery("update O set O.COLLECT_STATUS=:COLLECT_STATUS ,O.COLLECT_MSG=:COLLECT_MSG,O.BATCH_NO=:BATCH_NUMBER where O.id=:id")
+		bc.createQuery("update O set O.COLLECT_STATUS=:COLLECT_STATUS ,O.COLLECT_MSG=:COLLECT_MSG where O.id=:id")
 		.setParameter("COLLECT_STATUS", "�տ�ɹ�")
 		.setParameter("COLLECT_MSG", map.get("ERR_MSG"))
-		.setParameter("BATCH_NUMBER", batch_number)
 		.setParameter("id", bo.getAttribute("id").toString()).executeUpdate();
 		map.put("RET_CODE", "0000");
 		return map;
@@ -751,7 +750,7 @@ public class CollectAuditInfoCache {
 			Map<String, String> map = new HashMap<String, String>();
 			JBOTransaction transaction = JBOFactory.createJBOTransaction();
 			BizObjectManager bmi = JBOFactory.getFactory().getManager(LC_RENT_PLAN.CLASS_NAME,transaction);
-			BizObject boi = bmi.createQuery("select v.sys_guid() as v.id,O.QUOT_ID as v.QUOT_ID,O.CUST_ID as v.CUST_ID,O.PROJECT_ID as v.PROJECT_ID,O.PROJECT_PLAN_NUMBER as v.PROJECT_PLAN_NUMBER,"
+			BizObject boi = bmi.createQuery("select v.replace(v.uuid(),'-','') as v.id,O.QUOT_ID as v.QUOT_ID,O.CUST_ID as v.CUST_ID,O.PROJECT_ID as v.PROJECT_ID,O.PROJECT_PLAN_NUMBER as v.PROJECT_PLAN_NUMBER,"
 					+ "O.CONTRACT_ID as v.CONTRACT_ID,O.CONTRACT_PLAN_NUMBER as v.CONTRACT_PLAN_NUMBER,O.PAYMENT_NUMBER as v.PAYMENT_NUMBER,'' as v.EBANK_NUMBER,O.id as v.PLAN_ID,O.PLAN_LIST as v.PLAN_LIST,"
 					+ "'0' as v.INTEREST_ADJUST,'settlemethod6' as v.SETTLE_METHOD,'"+hire_list+"' as v.HIRE_LIST,'"+cerrentDate+"' as v.HIRE_DATE,'"+rent+"' as v.RENT,case when ("+rent+" - vl.interest_over) > 0 then ("+rent+" - vl.interest_over) else 0 end as v.CORPUS,case when ("+rent+" - vl.interest_over) > 0 then (vl.interest_over) else "+rent+" end as v.INTEREST,vl.penalty_over as v.PENALTY,"
 					+ "'0' as v.CORPUS_ADJUST,'0' as v.PENALTY_ADJUST,'0' as v.ROLL_BACK,O.COIN as v.COIN from O, jbo.app.tenwa.calc.VI_LC_RENT_PLAN vl where O.id = vl.id"
@@ -863,7 +862,7 @@ public class CollectAuditInfoCache {
 				BizObjectManager bm = JBOFactory.getFactory().getManager(LC_RENT_PLAN.CLASS_NAME,trans);
 				bm.createQuery("update O set O.BATCH_STATUS=:BATCH_STATUS,O.BATCH_NO=:BATCH_NO,O.BATCH_SN=:BATCH_SN where O.id=:id")
 						.setParameter("BATCH_STATUS", "")//������
-						.setParameter("BATCH_NO", "")
+						.setParameter("BATCH_NO", req_sn)
 						.setParameter("BATCH_SN", "")
 						.setParameter("id", biz.getAttribute("id").toString()).executeUpdate();
 				trans.commit();

From c77d470e9270c24d7be1a447d864bc3d1ef4e98c Mon Sep 17 00:00:00 2001
From: amarsoft <amarsoft@DESKTOP-3QRILR7>
Date: Sat, 7 Jul 2018 14:28:36 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E6=89=A3=E6=AC=BE=E5=8D=A1=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccountChange/AccountChangeList.jsp       | 166 +++++++++
 .../AccountChange/AccountChangeListMain.jsp   |  60 ++++
 .../LBDeductChangeDocumentInfo.jsp            |  92 +++++
 .../AccountChangeCompanyChangeInfo.jsp        | 260 ++++++++++++++
 .../company/AccountChangeCompanyInfo.jsp      | 330 ++++++++++++++++++
 .../company/AccountChangeCompanyMain.jsp      |  98 ++++++
 .../person/AccountChangePersonChangeInfo.jsp  | 213 +++++++++++
 .../person/AccountChangePersonInfo.jsp        | 326 +++++++++++++++++
 .../person/AccountChangePersonMain.jsp        |  97 +++++
 .../person/ControlForInitChangeAccount.jsp    |  36 ++
 .../person/DeductCardDocList.jsp              |  70 ++++
 .../AccountChangeApprovalApplyList.jsp        |  76 ++++
 .../AccountChangeCompanyChangeInfo.jsp        | 156 +++++++++
 .../company/AccountChangeCompanyInfo.jsp      | 106 ++++++
 .../person/AccountChangePersonChangeInfo.jsp  | 173 +++++++++
 .../person/AccountChangePersonInfo.jsp        | 103 ++++++
 .../person/DeductCardDocList.jsp              |  70 ++++
 .../{AccountPayMargin.java => CommLoan.java}  |   2 +-
 ...gin.java => CommLoanFactMoneyToMoney.java} |   2 +-
 19 files changed, 2434 insertions(+), 2 deletions(-)
 create mode 100644 WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/AccountChangeList.jsp
 create mode 100644 WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/AccountChangeListMain.jsp
 create mode 100644 WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/LBDeductChangeDocumentInfo.jsp
 create mode 100644 WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyChangeInfo.jsp
 create mode 100644 WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyInfo.jsp
 create mode 100644 WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyMain.jsp
 create mode 100644 WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonChangeInfo.jsp
 create mode 100644 WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp
 create mode 100644 WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonMain.jsp
 create mode 100644 WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/ControlForInitChangeAccount.jsp
 create mode 100644 WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/DeductCardDocList.jsp
 create mode 100644 WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp
 create mode 100644 WebContent/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyChangeInfo.jsp
 create mode 100644 WebContent/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyInfo.jsp
 create mode 100644 WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonChangeInfo.jsp
 create mode 100644 WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonInfo.jsp
 create mode 100644 WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/DeductCardDocList.jsp
 rename src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/{AccountPayMargin.java => CommLoan.java} (85%)
 rename src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/{OtherReceiveMargin.java => CommLoanFactMoneyToMoney.java} (85%)

diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/AccountChangeList.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/AccountChangeList.jsp
new file mode 100644
index 000000000..177170a93
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/AccountChangeList.jsp
@@ -0,0 +1,166 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ page import="com.tenwa.comm.dataRightmanager.DataRightManager" %>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+	String jboWhere = CurPage.getParameter("JboWhere");
+	if(jboWhere == null){
+		jboWhere = "";
+	}
+	String RightType=CurPage.getParameter("RightType");
+	if(RightType==null) RightType="";
+	 String curUserId = CurUser.getUserID();
+	 String curOrgId = CurUser.getOrgID();
+	ASObjectModel doTemp = new ASObjectModel("LBContractInfoForAccount");
+	String sCondtion=DataRightManager.getRightCondition(CurUser,"O");
+	doTemp.appendJboWhere(sCondtion);
+	doTemp.appendJboWhere(jboWhere);
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1"; 
+	dwTemp.ReadOnly = "1";
+	dwTemp.setPageSize(pageSize == null ? 20 : Integer.parseInt(pageSize));
+	
+	dwTemp.genHTMLObjectWindow("");
+	//0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
+	String sButtons[][];
+	if(jboWhere.endsWith("'approve_status05'")){
+		sButtons = new String[][]{
+				{"true","","Button","����","����","newRecord()","","","","btn_icon_add",""},
+				{"true","","Button","�༭","�༭","viewAndEdit()","","","","btn_icon_detail",""},
+				{"true","","Button","ȡ��","ȡ��","del()","","","","btn_icon_delete",""}
+		};
+	}else{
+		sButtons = new String[][]{
+				{"true","","Button","����","����","view()","","","","btn_icon_detail",""}
+		};
+	}
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	/*~[Describe=������¼;InputParam=��;OutPutParam=��;]~*/
+	function newRecord(){
+		var orgId = "<%=curOrgId%>";
+		AsDialog.OpenSelector("SelectContractInfoCustChangeList","orgId,"+orgId,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+			if(!sReturn||sReturn=="_CANCEL_"||sReturn==""||sReturn=="_NONE_"){
+					 //alert(getHtmlMessage('1'));//��ѡ��һ����Ϣ��
+						return;
+			}
+			sReturn = sReturn.split("@");
+			var contractId=sReturn[0];
+			var productId=sReturn[1];
+			var product_Name=sReturn[2];
+			var projectId=sReturn[3];
+		    var customerType=sReturn[4];
+			var customerId=sReturn[5]; 
+			var contractNumber=sReturn[6];
+			console.log(contractNumber+customerType);
+			var status=RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.businesschangeapply.SelectStatus","SubmitStatus", "flowNo=AccountChangeFlow,objectNo="+contractId);
+			if(status=="false"){
+				AsDebug.showMessage("��ʾ��Ϣ:","�ú�ͬ��������л���δ�ύ״̬", '','',true);
+				return;
+			}
+			if(customerType=='01'){
+				//����
+	        	var restul=RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.businesschangeapply.AccountChange","CopyCustomerConsignFormalToChange","projectId="+projectId+",flowNo=AccountChangeFlow,contractId="+contractId+",customerId="+customerId+",curUserId=<%=curUserId%>,contractNumber="+contractNumber);
+	        	var results = restul.split("@");
+				if(restul[0]=='ERROR'){
+					AsDebug.showMessage("��ʾ��Ϣ:","ϵͳ��æ����", '','',true);
+					return;
+				}
+				var applyId = results[1];
+				AsControl.OpenTabNew("/ProductManage/ProductConfig/PageConfigView.jsp","ConfigId=AccountCompanyChangeApply&ProjectId="+projectId+"&ContractId="+contractId+"&CustomerId="+customerId+"&ApplyId="+applyId+"&CustomerType="+customerType+"&ProductId="+productId,{"title":"��ͬ���["+contractNumber+"]�ۿ���"});
+			}else{
+				var restul=RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.businesschangeapply.AccountChange","CopyCustomerAccountFormalToChange","flowNo=AccountChangeFlow,contractId="+contractId+",customerId="+customerId+",curUserId=<%=curUserId%>,contractNumber="+contractNumber+",projectId="+projectId);
+				
+				var results = restul.split("@");
+				if(results[0]=='ERROR'){
+					AsDebug.showMessage("��ʾ��Ϣ:","ϵͳ��æ����", '','',true);
+					return;
+				}
+				var applyId = results[1];
+				AsControl.OpenTabNew("/ProductManage/ProductConfig/PageConfigView.jsp","ConfigId=AccountPersonChangeApply&ProjectId="+projectId+"&ContractId="+contractId+"&ApplyId="+applyId+"&CustomerId="+customerId+"&CustomerType="+customerType+"&ProductId="+productId,{"title":"��ͬ���["+contractNumber+"]�ۿ���"});
+			}	
+		},"��ѡ��ۿ���Ϣ����ĺ�ͬ");
+	}
+	function del(){
+		var rows = getSelRows(0);
+		if(rows.length == 0){
+			AsDebug.showMessage("��ʾ","��ѡ��һ������","","",true);
+			return;
+		}
+		var status=getItemValue(0,getRow(0),'status');
+		var contractId= getItemValue(0,getRow(0),'id');  
+    	var customerType=getItemValue(0,getRow(0),'customertype');
+    	var customerId=getItemValue(0,getRow(0),'customerid'); 
+        var projectId=getItemValue(0,getRow(0),'PROJECT_ID');
+        var productId=getItemValue(0,getRow(0),'PRODUCT_ID');
+        
+        if(status!="approve_status05"){
+    			AsDebug.showMessage("�ۿ���Ϣ�����������","ҵ���𲻿���ȡ��", '','',true);
+    			return;
+        }
+        if(customerType=='01'){
+        	//����
+        	var result=RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.businesschangeapply.AccountChange","CancelCustomerConsign","contractId="+contractId+",projectId="+projectId+",customerId="+customerId);
+	        if(result=="SUCCESS"){
+	        	AsDebug.showMessage("�ۿ���Ϣ�����������","ȡ���ɹ�", '','',true);
+	        	reloadSelf();
+	        }else{
+	        	AsDebug.showMessage("�ۿ���Ϣ�����������","ȡ��ʧ�ܣ�ϵͳ��æ�Ժ����ԡ���", '','',true);
+	        }
+	        
+        }else{
+        	var result=RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.businesschangeapply.AccountChange","CancelCustomerAccount","contractId="+contractId+",projectId="+projectId+",customerId="+customerId);
+        	if(result=="SUCCESS"){
+            	AsDebug.showMessage("�ۿ���Ϣ�����������","ȡ���ɹ�", '','',true);
+            	reloadSelf();
+            }else{
+	        	AsDebug.showMessage("�ۿ���Ϣ�����������","ȡ��ʧ�ܣ�ϵͳ��æ�Ժ����ԡ���", '','',true);
+	        }
+        }
+	}
+	function viewAndEdit(){
+		var rows = getSelRows(0);
+		if(rows.length == 0){
+			AsDebug.showMessage("��ʾ","��ѡ��һ������","","",true);
+			return;
+		}
+		var status=getItemValue(0,getRow(0),'status');
+		if("approve_status05" != status){
+			AsDebug.showMessage("��ʾ","ֻ��δ�ύ��״̬���ܼ�������", '','',true);
+			return;
+		}
+		var applyId=getItemValue(0,getRow(0),'IDV');
+		var contractId= getItemValue(0,getRow(0),'id');  
+    	var customerType=getItemValue(0,getRow(0),'customertype');
+    	var customerId=getItemValue(0,getRow(0),'customerid'); 
+        var projectId=getItemValue(0,getRow(0),'PROJECT_ID');
+        var productId=getItemValue(0,getRow(0),'PRODUCT_ID');
+        var contractNumber=getItemValue(0,getRow(0),'contract_number');
+        if(customerType=='01'){
+			//����
+			AsControl.OpenTabNew("/ProductManage/ProductConfig/PageConfigView.jsp","ConfigId=AccountCompanyChangeApply&ProjectId="+projectId+"&ContractId="+contractId+"&CustomerId="+customerId+"&CustomerType="+customerType+"&ApplyId="+applyId+"&ProductId="+productId,{"title":"��ͬ���["+contractNumber+"]�ۿ���"});
+		}else{
+			AsControl.OpenTabNew("/ProductManage/ProductConfig/PageConfigView.jsp","ConfigId=AccountPersonChangeApply&ProjectId="+projectId+"&ContractId="+contractId+"&CustomerId="+customerId+"&CustomerType="+customerType+"&ApplyId="+applyId+"&ProductId="+productId,{"title":"��ͬ���["+contractNumber+"]�ۿ���"});
+		}	
+	}
+	function view(){
+		var rows = getSelRows(0);
+		if(rows.length == 0){
+			AsDebug.showMessage("��ʾ","��ѡ��һ������","","",true);
+			return;
+		}
+		var status=getItemValue(0,getRow(0),'status');
+		var applyId=getItemValue(0,getRow(0),'IDV');
+		var contractId= getItemValue(0,getRow(0),'id');  
+    	var customerType=getItemValue(0,getRow(0),'customertype');
+    	var customerId=getItemValue(0,getRow(0),'customerid'); 
+        var projectId=getItemValue(0,getRow(0),'PROJECT_ID');
+        var productId=getItemValue(0,getRow(0),'PRODUCT_ID');
+        var contractNumber=getItemValue(0,getRow(0),'contract_number');
+        if(customerType=='01'){
+			//����
+			AsControl.OpenTabNew("/ProductManage/ProductConfig/PageConfigView.jsp","ConfigId=AccountCompanyChangeApply&ProjectId="+projectId+"&ContractId="+contractId+"&CustomerId="+customerId+"&CustomerType="+customerType+"&ProductId="+productId+"&RightType=ReadOnly&Status="+status+"&ApplyId="+applyId+"&HideButton=�ύ",{"title":"��ͬ���["+contractNumber+"]�ۿ���"});
+		}else{
+			AsControl.OpenTabNew("/ProductManage/ProductConfig/PageConfigView.jsp","ConfigId=AccountPersonChangeApply&ProjectId="+projectId+"&ContractId="+contractId+"&CustomerId="+customerId+"&CustomerType="+customerType+"&ProductId="+productId+"&RightType=ReadOnly&Status="+status+"&ApplyId="+applyId+"&HideButton=�ύ",{"title":"��ͬ���["+contractNumber+"]�ۿ���"});
+		}	
+	}
+</script>
+<%@	include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/AccountChangeListMain.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/AccountChangeListMain.jsp
new file mode 100644
index 000000000..03f3c51f6
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/AccountChangeListMain.jsp
@@ -0,0 +1,60 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin.jspf"%>
+<%
+	/*
+		ҳ��˵��:ʾ��ģ����ҳ��
+	 */
+	String PG_TITLE = "�ۿ��Ϣ�������"; // ��������ڱ��� <title> PG_TITLE </title>
+	String PG_CONTENT_TITLE = "&nbsp;&nbsp;ʾ��ģ����ҳ��&nbsp;&nbsp;"; //Ĭ�ϵ�����������
+	String PG_CONTNET_TEXT = "��������б�";//Ĭ�ϵ�����������
+	String PG_LEFT_WIDTH = "200";//Ĭ�ϵ�treeview����
+
+	//��ò������ж��Ƿ�ֱ�Ӵ�����ij��ҳ��
+	String pageType = CurPage.getParameter("pageType");
+	if(pageType == null){
+		pageType = "�ҵIJݸ�";
+	}
+	
+	//����Treeview
+	OHTMLTreeView tviTemp = new OHTMLTreeView(CurPage, "ʾ��ģ����ҳ��","right");
+
+	//������ͼ�ṹ
+	tviTemp.insertPage("root","�ҵIJݸ�","",1);
+	tviTemp.insertPage("root","����˵�����","",2);
+	tviTemp.insertPage("root","��������","",3);
+	tviTemp.insertPage("root","���ͨ��������","",4);
+	tviTemp.insertPage("root","��˲�ͨ��������","",5);
+	
+	//�������ֶ�����ͼ�ṹ�ķ�����SQL���ɺʹ�������   �μ�View������ ExampleView.jsp��ExampleView01.jsp
+%>
+<%@ include file="/Frame/resources/include/include_main.jspf"%>
+<script type="text/javascript"> 
+	function TreeViewOnClick(){
+		var sCurItemname = getCurTVItem().name;
+		var sUrl = "/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/AccountChangeList.jsp";
+		if(sCurItemname=='�ҵIJݸ�'){
+			AsControl.OpenView(sUrl,"JboWhere=csa.status='approve_status05'","right");
+		}else if(sCurItemname=='����˵�����'){
+			AsControl.OpenView(sUrl,"JboWhere=csa.status='approve_status01'","right");
+		}else if(sCurItemname=='��������'){
+			AsControl.OpenView(sUrl,"JboWhere=csa.status='approve_status04'","right");
+		}else if(sCurItemname=='���ͨ��������'){
+			AsControl.OpenView(sUrl,"JboWhere=csa.status='approve_status02'","right");
+		}else if(sCurItemname=='��˲�ͨ��������'){
+			AsControl.OpenView(sUrl,"JboWhere=csa.status='approve_status03'","right");
+		}else{
+			return;
+		}
+		setTitle(getCurTVItem().name);
+	}
+	
+	<%/*~[Describe=����treeview;]~*/%>
+	function initTreeView(){
+		<%=tviTemp.generateHTMLTreeView()%>
+		expandNode('root');
+		selectItemByName("<%=pageType%>");	//Ĭ�ϴ򿪵�(Ҷ��)ѡ��	
+	}
+	
+	initTreeView();
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/LBDeductChangeDocumentInfo.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/LBDeductChangeDocumentInfo.jsp
new file mode 100644
index 000000000..f0ecb5a8c
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/LBDeductChangeDocumentInfo.jsp
@@ -0,0 +1,92 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@include file="/Frame/resources/include/include_begin_info.jspf"%>
+<%@ page import="com.tenwa.doc.action.DocumentListAction" %>
+<%
+	//����������
+	String sObjectType=CurPage.getParameter("ObjectType");//
+	String contractId=CurPage.getParameter("ContractId");
+	
+	ASObjectModel doTemp = new ASObjectModel("LBAdjustDocumentInfo");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="2";      // ����DW��� 1:Grid 2:Freeform
+	dwTemp.ReadOnly = "0"; // �����Ƿ�ֻ�� 1:ֻ�� 0:��д
+	dwTemp.genHTMLObjectWindow("");
+	String[][] sButtons=null;
+	sButtons=new String[][]{
+			{"true","","Button","����","���������޸�","importRecord()","","","",""},
+			{"true","","Button","ȡ��","ȡ��","viewAndEdit_attachment()","","","","btn_icon_close"}};
+%><%@include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+	$(function() {
+		$("#FILE2").attr("type","file");
+		$("#myiframe0").attr("enctype","multipart/form-data");
+		var params={};
+		params["OBJECTTYPE"]="<%=sObjectType%>";
+		params["ContractId"]="<%=contractId%>";
+		var sparma="";
+	    for(var key in params){
+	    	sparma=sparma+"<input type=\"text\" name=\""+key+"\"  value=\""+params[key]+"\">"
+	    }
+	    $("#FILE2").append(sparma);
+		$("#myiframe0").attr("action","<%=sWebRootPath%>/Tenwa/ChannelPortal/BusinessHanding/FundRentAdjust/LBContractDocumentUpload.jsp?CompClientID=<%=CurComp.getClientID()%>");
+		$("#myiframe0").attr("method","post");
+		
+		setItemValue(0,0,"InputUserName","<%= CurUser.getUserName()%>");
+		setItemValue(0,0,"InputOrg","<%=CurUser.getOrgName()%>");
+		setItemValue(0,0,"InputTime","<%=StringFunction.getToday()%>");
+		
+	});
+	
+	function viewAndEdit_attachment(){
+		if(confirm("ȷ��ȡ���ϴ���")){
+			parent.AsDialog.ClosePage("_CANCEL_");
+		}
+	}
+	//�ύ
+	function importRecord(){
+		if(!iV_all('myiframe0'))return;
+		//$("#FILE").append(params);
+		var o = document.forms["myiframe0"];
+		var sFileName = o.FILE2.value;
+		var nameArr = sFileName.split("\\");
+		setItemValue(0,0,"FileName",encodeURI(nameArr[nameArr.length-1]));
+		if (typeof(sFileName) == "undefined" || sFileName==""){
+			alert("��ѡ�ϴ��ĸ���!");
+			return false;
+		}
+		if(/[!@'"#$%&\^*]/.test(nameArr[nameArr.length-1])){
+			alert("�ļ������Ϸ�");
+			return;
+		}
+		var flag=CheckStr(nameArr[nameArr.length-1]);
+		if(flag!="true"){
+			alert("ֻ���ϴ���׺��Ϊ"+flag+"���ļ�");
+			return ;
+		}
+		var fileSize;
+		if(typeof(ActiveXObject) == "function"){ // IE
+			var fso = new ActiveXObject("Scripting.FileSystemObject");
+			var f1 = fso.GetFile(sFileName);
+			fileSize = f1.size;
+		}else{
+			fileSize = o.FILE2.files[0].size;
+		}
+		if(fileSize > 50*1024*1024){
+			alert("�ļ�����50MB�������ϴ���");
+			return false;
+		}
+		return o.submit();
+	}
+	function CheckStr(str){
+		var s="jpg,jpeg,png";
+		var flag="false";
+		var s2=s.split(",");
+		for(var i=0;i<s2.length;i++){
+			if(str.split(".")[1]==s2[i]){
+				return "true";
+			}
+		}
+		return s;
+    }
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyChangeInfo.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyChangeInfo.jsp
new file mode 100644
index 000000000..c437635da
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyChangeInfo.jsp
@@ -0,0 +1,260 @@
+<%@page import="jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List00;Describe=ע����;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List01;Describe=����ҳ������;]~*/%>
+	<%
+	String PG_TITLE = "�����ֿۿ���Ϣ"; // ��������ڱ��� <title> PG_TITLE </title>
+	%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List02;Describe=�����������ȡ����;]~*/%>
+
+<%/*~END~*/%> 
+ 
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List03;Describe=�������ݶ���;]~*/%>
+
+<% 
+	String ID = CurPage.getParameter("id");//������ID
+	if(ID == null)ID = "";	
+	String RightType=CurPage.getParameter("RightType");
+	String ContractId = CurPage.getParameter("ContractId");
+	String applyId = CurPage.getParameter("ApplyId");
+	if(ContractId == null) ContractId = "";
+	String customerid = CurPage.getParameter("CustomerId");
+	String sTempletNo ="LBDeductCardChangeCompany";//--ģ���--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	doTemp.setHtmlEvent("IS_CONSIGN_REPAY", "onchange", "checkIsConsignRepay");
+	
+	//��ȡ��������������,����process�ж��Ƿ��Ѿ�ǩԼ��,����Ѿ�ǩԼ��,�ֿۿ��Ϣҳ��Ϊֻ��
+	BizObject boAccount = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME).createQuery("flow_unid=:applyId and file_flag='yes'").setParameter("applyId", applyId).getSingleResult(false);
+		if(boAccount!=null){
+			String signType = boAccount.getAttribute("SIGN_TYPE").toString();
+		    if(signType!="" ){
+				RightType= "ReadOnly";
+			} 
+		}
+
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	if((null!=RightType&&RightType.equals("ReadOnly"))){
+		dwTemp.ReadOnly = "1";//ֻ��ģʽ
+		RightType="ReadOnly";
+		isShowButton=false;
+	}else{
+		isShowButton=true;
+	}
+	dwTemp.Style = "2";//freeform
+	dwTemp.genHTMLObjectWindow(applyId);
+%>
+<%/*~END~*/%>
+	
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List04;Describe=���尴ť;]~*/%>
+<%
+	String sButtons[][] = {
+		//0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
+	//	{"true","All","Button","����","���������޸�","saveRecord()","","","","btn_icon_save"},
+	};
+%> 
+<%/*~END~*/%>
+	
+	
+	
+
+<%/*~BEGIN~���ɱ༭��~[Editable=false;CodeAreaID=List05;Describe=����ҳ��;]~*/%>
+	<%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List06;Describe=���尴ť�¼�;]~*/%>
+	<script type="text/javascript">
+	$(function(){
+// 		var offiD = parent.window.getItemValue(0,0,'id');
+// 		setItemValue(0,getRow(),"official_id",offiD);
+// 		checkIsConsignRepay();
+		if("ReadOnly"!='<%=RightType%>'){
+			checkIsConsignRepay();
+ 		}
+		var acc_number = getItemValue(0,0,"ACC_NUMBER").replace(/(\d{4})/g,'$1 ').replace(/\s*$/,'');
+		setItemValue(0,0,"ACC_NUMBER",acc_number);
+	})
+	/*~[Describe=�����¼;InputParam=��;OutPutParam=��;]~*/
+	function saveRecord(){
+		var contract_id=getItemValue(0,getRow(0),"contract_id");
+		if(typeof(contract_id) == "undefined" || contract_id.length == 0 ){
+			setItemValue(0,getRow(),"contract_id","<%=ContractId%>");
+		}
+		if(!checkAcNumber())  return;
+		
+		as_save("myiframe0","location.reload()");
+	}
+	
+	function setBankName(){
+		var bank_code = getItemValue(0,0,"BANK_CODE");
+		var result = AsControl.RunJsp("/Tenwa/ChannelPortal/BusinessHanding/Comm/CustomerAccount/GetBankName.jsp","bank_code="+bank_code);
+		if(result.length > 0){
+			setItemValue(0,0,"BANK_NAME",result);
+		}else{
+			setItemValue(0,0,"BANK_NAME","");
+		}
+	}
+	
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List07;Describe=�Զ��庯��;]~*/%>
+	<script type="text/javascript">
+	function checkIsConsignRepay(){
+		var iscr = getItemValue(0, 0, "IS_CONSIGN_REPAY");
+		if(iscr=="yes"){
+			setItemRequired(0, "BANK_CODE", true);
+ 			setItemReadOnly(0,0,"BANK_CODE", false);
+			$('#BANK_CODE').attr('disabled',false);
+			setItemRequired(0, "ACCOUNT", true);
+			setItemReadOnly(0,0,"ACCOUNT", false);
+			setItemRequired(0, "ACC_NUMBER", true);
+			setItemReadOnly(0,0,"ACC_NUMBER", false);
+// 			setItemValue(0,0, "DEBIT_BANK", "icbc");
+			setItemRequired(0, "CONSIGN_REPAY_CERT", true);
+ 			setItemReadOnly(0,0,"CONSIGN_REPAY_CERT", false);
+ 			setItemRequired(0, "CONSIGN_REPAY_PHONE", true);
+ 			setItemReadOnly(0,0,"CONSIGN_REPAY_PHONE", false);
+		}else{
+			setItemRequired(0, "BANK_CODE", false);
+			setItemReadOnly(0,0,"BANK_CODE", true);
+			$('#BANK_CODE').attr('disabled',true);
+			setItemRequired(0, "ACCOUNT", false);
+			setItemReadOnly(0,0,"ACCOUNT", true);
+			setItemRequired(0, "ACC_NUMBER", false);
+			setItemReadOnly(0,0,"ACC_NUMBER", true);
+			setItemRequired(0, "CONSIGN_REPAY_CERT", false);
+ 			setItemReadOnly(0,0,"CONSIGN_REPAY_CERT", true);
+ 			setItemRequired(0, "CONSIGN_REPAY_PHONE", false);
+ 			setItemReadOnly(0,0,"CONSIGN_REPAY_PHONE", true);
+			setItemValue(0,0, "DEBIT_BANK", "none");
+			setItemValue(0,0, "BANK_CODE", "");
+			setItemValue(0,0, "BANK_NAME", "");
+			setItemValue(0,0, "ACCOUNT", "");
+			setItemValue(0,0, "ACC_NUMBER", "");
+			setItemValue(0,0, "CONSIGN_REPAY_CERT", "");
+			setItemValue(0,0, "CONSIGN_REPAY_PHONE", "");
+			
+		}
+	}
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List08;Describe=ҳ��װ��ʱ�����г�ʼ��;]~*/%>
+	<script type="text/javascript">
+	function downLoadButton(){
+	 	  var contractId = "<%=ContractId%>";
+		  var filelist3=RunJavaMethodTrans("com.tenwa.customer.handler.person.CustomerPersonDocHandler","queryFileLibrary","contractId="+contractId);
+		  
+		  var obj=filelist3;
+		  var html="<span id='FILELIST'>";
+		  if(typeof(obj['inputtime'])=="undefined"){
+			    html+='<input  type="text"  style="width:200px" readonly />'
+		    	if('ReadOnly'!='<%=RightType%>'){
+					html+='<button type="button" onclick="upload()">�ϴ�</button>';
+				}		
+		  }else{
+			html+='<a class="btn_icon btn_icon_search" onclick="showImage(\''+obj['id']+'\',\''+obj['filename']+'\');">&nbsp;</a>';
+			html+='<a onclick=downloadFile(\''+obj['id']+'\')><font color="blue">'+obj['filename']+'</font></a>';
+			html+='���ϴ�ʱ��:'+obj['inputtime']+'��';
+			html+='���ϴ���:'+obj['inputuser']+'��';
+			html+='����С:'+Math.floor(obj['FileSize']/1024*100)/100+'kb��';
+			if('ReadOnly'!='<%=RightType%>'){
+				html+='<button type="button" onclick="upload()">�ϴ�</button>';
+			}
+		  }
+			html+='</span>'
+			$("#FILELIST").parent().html(html);
+		}
+	window.onload=function(){
+		downLoadButton();
+	}
+	function upload(){
+		var param="ContractId=<%=ContractId%>";
+		param+="&ObjectType=AccountChange";
+	 	var sUrl="/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/LBDeductChangeDocumentInfo.jsp";
+		AsDialog.PopView(sUrl,param,"dialogWidth=480px;dialogHeight=140px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(message){
+				if("success"==message){			  
+				downLoadButton();
+			}
+		},"�ϴ�����");
+	}
+	function downloadFile(id){
+		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+		window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+	}
+	function showImage(id,name){
+		var sUrl="/Tenwa/Comm/DocList/showImage.jsp";
+		var param="attrid="+id;
+		AsDialog.PopView(sUrl,param,"dialogWidth=480px;dialogHeight=400px;",function(message){
+			
+		},name);
+	}
+	//���п��Ÿ�ʽУ��
+	function checkAcNumber(){
+		var acc_number = allTrim(getItemValue(0,0,"ACC_NUMBER"));
+		//ȫ����
+		var num = /^\d*$/; 
+		//����6-25λ
+		if(acc_number.length < 6 || acc_number.length > 25) {
+			AsDebug.showMessage("����","�����˺ų��ȱ�����6��25֮�䣡","","",false);
+			setItemValue(0, 0, "ACC_NUMBER","");
+		    return false;
+		}else{
+			setItemValue(0, 0, "ACC_NUMBER", acc_number);
+			return true;
+		}
+		
+	}
+	
+	!function () {
+        $('#ACC_NUMBER').on('keyup mouseout input',function(){
+            var $this = $(this),
+                v = $this.val();
+            /\S{5}/.test(v) && $this.val(v.replace(/\s/g,'').replace(/(\d{4})(?=\d)/g, "$1 "));
+
+	    
+		var car_number = getItemValue(0,0,"ACC_NUMBER");
+	        var acc_number = allTrim(car_number);
+	        var num = /^\d*$/;
+	        if(!num.exec(acc_number)) {
+	        	AsDebug.showMessage("����","���ű���ȫΪ���֣�","","",false);
+	        	car_number = car_number.substring(0,car_number.length-1);
+				setItemValue(0, 0, "ACC_NUMBER", car_number);
+			}
+        });
+    }();
+
+	</script>	
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyInfo.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyInfo.jsp
new file mode 100644
index 000000000..87d53697e
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyInfo.jsp
@@ -0,0 +1,330 @@
+<%@page import="jbo.com.tenwa.lease.comm.LB_UNION_LESSEE"%>
+<%@page import="jbo.app.tenwa.customer.CUSTOMER_TEL"%>
+<%@page import="jbo.com.tenwa.lease.comm.LB_DEDUCT_CARD_HIS"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List00;Describe=ע����;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List01;Describe=����ҳ������;]~*/%>
+	<%
+	String PG_TITLE = "����ԭ�ۿ���Ϣ"; // ��������ڱ��� <title> PG_TITLE </title>
+	%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List02;Describe=�����������ȡ����;]~*/%>
+
+<%/*~END~*/%> 
+ 
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List03;Describe=�������ݶ���;]~*/%>
+
+<% 
+	String ID = CurPage.getParameter("id");//������ID
+	if(ID == null)ID = "";
+	String RightType=CurPage.getParameter("RightType");
+	if(RightType==null)RightType="";
+	String ContractId = CurPage.getParameter("ContractId");
+	if(ContractId == null) ContractId = "";
+	String PROJECT_ID = CurPage.getParameter("ProjectId");
+	if(PROJECT_ID == null) PROJECT_ID = "";
+	String CustomerId = CurPage.getParameter("CustomerId");
+	if(CustomerId == null) CustomerId = "";
+	String customerType=CurPage.getParameter("CustomerType");
+	if(customerType == null) customerType = "";
+	String applyId = CurPage.getParameter("ApplyId");
+	if(applyId == null) applyId = "";
+	
+	//��ȡ�绰����,����ǩ����
+	BizObjectManager bomTel = JBOFactory.getBizObjectManager(CUSTOMER_TEL.CLASS_NAME);
+	BizObject boTel = bomTel.createQuery("select * from o where customerid=:customerid").setParameter("customerid",CustomerId).getSingleResult(false);
+	String telephone = boTel.getAttribute("telephone").toString();
+	
+	//��ȡ����,����ǩ����
+	BizObjectManager bomName = JBOFactory.getBizObjectManager(LB_UNION_LESSEE.CLASS_NAME);
+	BizObject boName = bomName.createQuery("select * from o where CONTRACT_ID=:contract_id").setParameter("contract_id",ContractId).getSingleResult(false);
+	String customerName = boName.getAttribute("customer_name").toString();
+	
+	String status = CurPage.getParameter("Status");
+	String sTempletNo ="LBDeductCardOld";//--ģ���--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	if("approve_status02".equals(status)){
+		doTemp.setJboClass(LB_DEDUCT_CARD_HIS.CLASS_NAME);
+		doTemp.appendJboWhere("apply_id='"+CurPage.getParameter("ApplyId")+"'");
+	}
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	if(RightType!=null && "ReadOnly".equals(RightType)){
+		isShowButton=false;
+	}
+	dwTemp.genHTMLObjectWindow(ContractId);
+	String compClientID = request.getParameter("CompClientID");
+	dwTemp.replaceColumn("change", "<iframe type='iframe' id='change' name=\"change\" width=\"100%\" height=\"170\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyChangeInfo.jsp?CompClientID="+sCompClientID+"&RightType="+RightType+"\"></iframe>", CurPage.getObjectWindowOutput());
+	dwTemp.replaceColumn("contractList", "<iframe type='iframe' name=\"change\" width=\"100%\" height=\"150\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/DeductCardDocList.jsp?CompClientID="+sCompClientID+"&applyId="+applyId+"&customerType="+customerType+"&RightType="+RightType+"\"></iframe>", CurPage.getObjectWindowOutput());
+
+%>
+<%/*~END~*/%>
+	
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List04;Describe=���尴ť;]~*/%>
+<%
+	String sButtons[][] = {
+		//0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
+		{"true","All","Button","����","���������޸�","saveRecord()","","","","btn_icon_save"},
+		{"true","","Button","���ɱ������","���ɺ�ͬ","generateQuotation()","","","","btn_icon_detail",""},
+		{"true","","Button","�������ǩԼ","����ǩ�º�ͬ","signOnLine()","","","","btn_icon_detail",""},
+		{"true","","Button","��ѯǩԼ���","��ѯǩԼ���","getStatus()","","","","btn_icon_detail",""},
+		{"true","All","Button","�޸�","�޸�","edit()","","","","btn_icon_edit"},
+	    {"false","","Button","���غ�ͬ�ļ�","���غ�ͬ","downloadDoc()","","","","btn_icon_down",""}
+	};
+	//sButtonPosition = "south"; 
+%> 
+<%/*~END~*/%>
+	
+	
+	
+
+<%/*~BEGIN~���ɱ༭��~[Editable=false;CodeAreaID=List05;Describe=����ҳ��;]~*/%>
+	<%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List06;Describe=���尴ť�¼�;]~*/%>
+	<script type="text/javascript">
+	
+	/*~[Describe=�����¼;InputParam=��;OutPutParam=��;]~*/
+	function saveRecord(){
+		change.window.saveRecord();
+	}
+	
+	//������������
+	function generateQuotation(){
+		//�ж��Ƿ񱣴�����
+		var sResult=RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.businesschangeapply.AccountChange","checkDateStatus","contractId=<%=ContractId%>,customerType=<%=customerType%>,applyId=<%=applyId%>");
+		if(sResult=="ERROR"){
+			AsDebug.showMessage("��ʾ","���ȱ�������,�ڽ��к�ͬ������","","",true);
+			 return;
+		}
+		if(sResult=="isNotPay"){
+			AsDebug.showMessage("��ʾ","����ί�д���,������������������","","",true);
+			return;
+		}
+		var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","getMakeContractProcessContract","contract_id=<%=ContractId%>,customerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+		if(result=="isDoc" || result=="isPdf"){
+			var flag = window.confirm("�Ѿ����ɹ���ͬ,�Ƿ�����������������");
+			if(flag==true){
+				//�ϳ�֮ǰ���ɹ��ĺ�ͬ
+				 var resultStatus = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","updateDocContractStatusContract","contract_id=<%=ContractId%>,CustomerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+				 if("error"==resultStatus){
+						AsDebug.showMessage("��ʾ","���ɺ�ͬʧ�ܣ�","","",true);	
+						return;
+					} 
+				 makeContract();
+				 AsDebug.showMessage("��ʾ","��ͬ�ļ�����ת��pdf......","","",true,"","","",function(){
+						window.location.reload();	
+				 });
+			}  
+			return;
+		}else if(result=="isSigning"){
+			AsDebug.showMessage("��ʾ","�Ѿ��������ǩԼ,�޷�������������","","",true);	
+			return;
+		}else{
+			 makeContract();
+			 AsDebug.showMessage("��ʾ","��ͬ�ļ�����ת��pdf......","","",true,"","","",function(){
+					window.location.reload();	
+			 });
+			 
+		}
+	}
+	
+	//���������������巽��
+	function makeContract(){
+		var param={};
+		var tempParam={};
+		var sparam="";	
+		var customerName ="";
+		var telephone ="";
+		var contractId="<%=ContractId%>";
+	    var id = "<%=applyId%>";
+		//��������ǻ�ȡ�����������û����͵绰����,�ŵ���ͬ�б�����
+		var sResult=RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.businesschangeapply.AccountChange","getNameAndPhone","contractId=<%=ContractId%>,customerType=<%=customerType%>,applyId=<%=applyId%>");
+		if(sResult!="ERROR"){
+			var result = sResult.split("@");
+			customerName = result[0];
+			telephone = result[1];
+		}
+	   
+	    //�����ļ�������ϵ
+	 	param["templateNo"]="5a447a5399eb4e8e8238f9404b04c165";//htmlģ���
+		tempParam["OBJECTTYPE"]="DeductCardChange"; 
+		tempParam["FLOW_UNID"]="<%=applyId%>"; //��ߴ�����м��Id,Ψһ��
+		tempParam["CONTRACT_ID"]=contractId; //��ͬid
+		tempParam["CUSTOMERNAME"]=customerName;//����������
+		tempParam["TELEPHONE"]=telephone;//�������ֻ�����
+		tempParam["NEW_TIME"]=getNowFormatDate();//��ǰʱ��
+		tempParam["id"]=id;//�м��id,����ģ������ȥ
+ 		tempParam["IDS"]=id;//
+		tempParam["Flag"]="true";//���ɺ�ͬ��������������(�ж�����) 
+		
+		tempParam["CurUserId"]="<%=CurUser.getUserID()%>";
+		tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>";
+		tempParam["fileSavePath"]="<%=CurConfig.getConfigure("FileSavePath")%>";
+		param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//����ģ��IJ�����
+		for(var key in param){
+			  if(sparam.length>0){sparam+=",";}
+			   sparam+=key+"="+param[key];
+		}
+		var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam);
+		//���ļ�ת��pdf��ʽ
+		RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdf","contract_id="+id+",customerType=<%=customerType%>,FlowUnid=<%=applyId%>,,flagType=flowunid");
+		if(result == "success"){
+			var attributeID = AsControl.RunJsp("/Tenwa/Lease/Flow/Rent/BatchIncome/GetLBDocAttributeID.jsp",
+					"FLOW_UNID="+tempParam["FLOW_UNID"]+"&OBJECTTYPE="+tempParam["OBJECTTYPE"]);
+			/* loadFile(attributeID); */
+		}else{
+			alert("����ʧ�ܣ�");
+		}
+	}
+	
+	function signOnLine(){
+		var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","getMakeContractProcessContract","contract_id=<%=ContractId%>,customerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+		if(result=="notExsit"){
+			AsDebug.showMessage("��ʾ","����������������,�ٵ���ǩԼ!","","",true);
+			return;
+		}else if(result=="isDoc"){
+			AsDebug.showMessage("��ʾ","��ͬ�ļ�����ת��pdf......","","",true);
+			return;
+		}else if(result=="isSigning"){
+			AsDebug.showMessage("��ʾ","�Ѿ��������ǩԼ","","",true);
+			return;
+		}
+		//���״̬Ϊ��pdf����е���ǩԼ
+		var sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","PersonDeductSignIng","contract_id=<%=ContractId%>,CurUserID=<%=CurUser.getUserID()%>,customerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+		if("success"==sReturn){
+		AsDebug.showMessage("��ʾ","����ǩԼ����ɹ�!","","",true,"","","",function(){
+			window.location.reload();	
+		});	
+		}else{
+		AsDebug.showMessage("��ʾ","����ǩԼ����ʧ��!","","",true,"","","",function(){
+			window.location.reload();	
+		});		
+		  }
+		
+	}
+	//��ɵ���ǩԼ,��ѯ����ǩԼ��״̬
+	 function getStatus(){
+		 var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","getMakeContractProcessContract","contract_id=<%=ContractId%>,customerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+			if(result=="notExsit"){
+				AsDebug.showMessage("��ʾ","����������������,�ٵ���ǩԼ!","","",true);
+				return;
+			}else if(result=="isDoc"){
+				AsDebug.showMessage("��ʾ","��ͬ�ļ�����ת��pdf......","","",true);
+				return;
+			}else if(result=="isPdf"){
+				AsDebug.showMessage("��ʾ","��ͬ�ļ�û��ǩԼ......","","",true);
+				return;
+			}
+		var sParams="contract_id=<%=ContractId%>,customerType=<%=customerType%>,CurUserID=<%=CurUser.getUserID()%>,FlowUnid=<%=applyId%>";
+		var sReturn=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","contractSignStatusForContract",sParams);
+		AsDebug.showMessage("��ʾ",sReturn,"","",true,'','','',function(){		
+			/* window.location.reload();	 */
+				});
+	 }
+	//�����Ѿ��Ǻ��µĺ�ͬ
+	 function downloadDoc(){
+		   var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","getMakeContractProcessContract","contract_id=<%=ContractId%>,customerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+			if(result=="notExsit"){
+				AsDebug.showMessage("��ʾ","����������������,������!","","",true);
+				return;
+			}
+	    	var sParams="contract_id=<%=ContractId%>,customerType=<%=customerType%>,FlowUnid=<%=applyId%>";
+			var sReturn=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","downloadDocContract",sParams);
+			var results = sReturn.split("@");
+			if("success"==results[0]){
+			AsDebug.showMessage("��ʾ","���سɹ�","","",true,'','','',function(){		
+					});	
+			var attributeId = results[1];
+			loadFile(attributeId);
+			}else{
+				AsDebug.showMessage("��ʾ","����ʧ��","","",true,'','','',function(){			
+					});	
+			}
+	    }
+	
+	 function loadFile(id){
+			if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+			window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+		}
+	 
+	 function edit(){
+		 	var flag = window.confirm("�޸����ݻ���������������ǩԼ�ĺ�ͬ,�Ƿ��޸�");
+			if(flag==true){
+				//�ϳ�֮ǰ���ɹ��ĺ�ͬ
+				 var resultStatus = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","updateDocContractStatusContract","contract_id=<%=ContractId%>,CustomerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+				 if("error"==resultStatus){
+						AsDebug.showMessage("��ʾ","�޸�ʧ�ܣ�","","",true);	
+						return;
+					}
+				 reloadSelf();	
+			} 
+		}
+	
+	//��ȡ��ǰ����
+	function getNowFormatDate() {
+	    var date = new Date();
+	    var seperator1 = "-";
+	    var seperator2 = ":";
+	    var month = date.getMonth() + 1;
+	    var strDate = date.getDate();
+	    if (month >= 1 && month <= 9) {
+	        month = "0" + month;
+	    }
+	    if (strDate >= 0 && strDate <= 9) {
+	        strDate = "0" + strDate;
+	    }
+	    var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
+	            + " " + date.getHours() + seperator2 + date.getMinutes()
+	            + seperator2 + date.getSeconds();
+	    return currentdate;
+	} 
+	
+	
+	
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List07;Describe=�Զ��庯��;]~*/%>
+	<script type="text/javascript">
+	
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List08;Describe=ҳ��װ��ʱ�����г�ʼ��;]~*/%>
+	<script type="text/javascript">
+	
+	</script>	
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyMain.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyMain.jsp
new file mode 100644
index 000000000..f6ee03fa9
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyMain.jsp
@@ -0,0 +1,98 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin.jspf"%>
+<%
+	/*
+		ҳ��˵��:ʾ��ģ����ҳ��
+	 */
+	String PG_TITLE = "ʾ��ģ����ҳ��"; // ��������ڱ��� <title> PG_TITLE </title>
+	String PG_CONTENT_TITLE = "&nbsp;&nbsp;ʾ��ģ����ҳ��&nbsp;&nbsp;"; //Ĭ�ϵ�����������
+	String PG_CONTNET_TEXT = "��������б�";//Ĭ�ϵ�����������
+	String PG_LEFT_WIDTH = "200";//Ĭ�ϵ�treeview����
+	String ContractId = CurPage.getParameter("ContractId");
+	if(ContractId == null) ContractId = "";
+	//����Treeview
+	OHTMLTreeView tviTemp = new OHTMLTreeView(CurPage, "�ۿ���Ϣ���","right");
+
+	out.write(new Button("�ر�", "�ر�", "closePage()", "", "btn_icon_close").getHtmlText());
+	out.write(new Button("�ύ", "�ύ", "doSubmit()", "", "btn_icon_submit").getHtmlText());
+	
+	//������ͼ�ṹ
+	/* String sFolder1=tviTemp.insertFolder("root","ʾ����Ϣ","",1);
+	tviTemp.insertPage(sFolder1,"���е�ʾ����Ϣ","",1);
+	tviTemp.insertPage(sFolder1,"�ҵ�ʾ����Ϣ","",2);
+	tviTemp.insertPage(sFolder1,"����ʾ����Ϣ","",3); */
+	tviTemp.insertPage("root","��Ŀ������Ϣ","",1);
+	tviTemp.insertPage("root","�ۿ���Ϣ���","",2);
+	tviTemp.insertPage("root","��ͬ��ӡ","",3);
+	
+	//�������ֶ�����ͼ�ṹ�ķ�����SQL���ɺʹ�������   �μ�View������ ExampleView.jsp��ExampleView01.jsp
+%>
+<%@ include file="/Frame/resources/include/include_main.jspf"%>
+<script type="text/javascript">
+//�ر�
+function closePage(){
+	var url ="/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/AccountChangeList.jsp";
+ 	AsControl.OpenTabNew(url,"",{title:"�ۿ�������"}); 
+ }
+//�ύ����
+function submitApply(){
+	//�ύǰУ���Ƿ���ڱ����¼
+	autoRiskScan("����ί������Ϣ���","ContractId=<%=ContractId%>&isAutoCommit=false&ObjectType=FlowDefaultObject","0010",function(riskMessage){
+		console.log(riskMessage);
+		if(riskMessage != true){
+ 			return;
+ 		}
+		
+		var sURL='/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/ControlForInitChangeAccount.jsp';
+		AsControl.RunJsp(sURL,"ContractId=<%=ContractId%>",function(sReturn){
+			if(allTrim(sReturn)=='success'){
+//					if(confirm('�ύ�ɹ�����ȷ�������غ�ͬ�嵥�б�ҳ�棬��ȡ�����������ӱ����Ϣ��')){
+//						closePage();
+//					}
+				AsDebug.showMessage('��ʾ��','�ύ�ɹ���',400,100,true);
+ 				setTimeout(function(){
+ 					AsDebug.removeWindow();
+	 				closePage();
+
+ 				},2000);
+ 				
+			
+ 				
+ 			}else{
+ 				AsDebug.showMessage('ע�⣺',allTrim(sReturn),400,100,true);
+ 				setTimeout(function(){
+ 					AsDebug.removeWindow();
+	 				closePage();
+ 				},2000);
+
+ 			}
+		});
+	});
+	
+	
+}
+	function TreeViewOnClick(){
+		//���tviTemp.TriggerClickEvent=true�����ڵ���ʱ������������
+//		var sCurItemID = getCurTVItem().id;
+		var sCurItemname = getCurTVItem().name;
+		var param="ContractId="+'<%=ContractId%>';
+		if(sCurItemname=='��Ŀ������Ϣ'){
+			AsControl.OpenView("/Tenwa/ChannelPortal/BusinessHanding/Comm/LBProject/LBProjectInfo.jsp",param,"right");
+		}else if(sCurItemname=='�ۿ���Ϣ���'){
+			AsControl.OpenView("/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/company/AccountChangeCompanyInfo.jsp",param,"right");
+		}else if(sCurItemname=='��ͬ��ӡ'){
+			AsControl.OpenView("/Tenwa/Comm/ContractTemplate/LBCommContractPrintList.jsp",param,"right");
+		}
+		setTitle(getCurTVItem().name);
+	}
+	
+	<%/*~[Describe=����treeview;]~*/%>
+	function initTreeView(){
+		<%=tviTemp.generateHTMLTreeView()%>
+		expandNode('root');
+		selectItemByName("��Ŀ������Ϣ");	//Ĭ�ϴ򿪵�(Ҷ��)ѡ��	
+	}
+	
+	initTreeView();
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonChangeInfo.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonChangeInfo.jsp
new file mode 100644
index 000000000..93cc996a1
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonChangeInfo.jsp
@@ -0,0 +1,213 @@
+<%@page import="jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List00;Describe=ע����;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List01;Describe=����ҳ������;]~*/%>
+	<%
+	String PG_TITLE = "��Ȼ���ֿۿ���Ϣ"; // ��������ڱ��� <title> PG_TITLE </title>
+	%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List02;Describe=�����������ȡ����;]~*/%>
+
+<%/*~END~*/%> 
+ 
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List03;Describe=�������ݶ���;]~*/%>
+
+<% 
+	String ID = CurPage.getParameter("id");//������ID
+	if(ID == null)ID = "";
+	String RightType=CurPage.getParameter("RightType");
+	if(RightType==null)RightType="";
+	String ContractId = CurPage.getParameter("ContractId");
+	if(ContractId == null) ContractId = "";
+	String applyId = CurPage.getParameter("ApplyId");
+	if(applyId == null) applyId = "";
+	
+	String sTempletNo ="LBDeductCardChange";//--ģ���--
+	
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	//��ȡ��������������,����process�ж��Ƿ��Ѿ�ǩԼ��,����Ѿ�ǩԼ��,�ֿۿ��Ϣҳ��Ϊֻ��
+	BizObject boAccount = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME).createQuery("flow_unid=:applyId and file_flag='yes'").setParameter("applyId", applyId).getSingleResult(false);
+		if(boAccount!=null){
+			String signType = boAccount.getAttribute("SIGN_TYPE").toString();
+		    if(signType!="" ){
+				RightType= "ReadOnly";
+			} 
+		}
+
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	if(RightType!=null && RightType.equals("ReadOnly")){
+		dwTemp.ReadOnly = "1";//ֻ��ģʽ
+	}
+	dwTemp.Style = "2";//freeform
+	dwTemp.genHTMLObjectWindow(applyId);
+%>
+<%/*~END~*/%>
+	
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List04;Describe=���尴ť;]~*/%>
+<%
+
+	String sButtons[][] = {
+		//0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
+		//{"true","All","Button","����","���������޸�","saveRecord()","","","","btn_icon_save"},
+	};
+	//sButtonPosition = "south"; 
+%> 
+<%/*~END~*/%>
+	
+	
+	
+
+<%/*~BEGIN~���ɱ༭��~[Editable=false;CodeAreaID=List05;Describe=����ҳ��;]~*/%>
+	<%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List06;Describe=���尴ť�¼�;]~*/%>
+	<script type="text/javascript">
+	$(function(){
+		var id = parent.window.getItemValue(0,0,'id');
+		setItemValue(0,0,'official_id',id);
+	})
+	/*~[Describe=�����¼;InputParam=��;OutPutParam=��;]~*/
+	function saveRecord(){
+		var contract_id=getItemValue(0,getRow(0),"contract_id");
+		if(typeof(contract_id) == "undefined" || contract_id.length == 0 ){
+			setItemValue(0,getRow(),"contract_id","<%=ContractId%>");
+		}
+		as_save("myiframe0","");
+	}
+	
+	function setBankName(){
+		var bank_code = getItemValue(0,0,"BANK_CODE");
+		var result = AsControl.RunJsp("/Tenwa/ChannelPortal/BusinessHanding/Comm/CustomerAccount/GetBankName.jsp","bank_code="+bank_code);
+		if(result.length > 0){
+			setItemValue(0,0,"BANK_NAME",result);
+		}else{
+			setItemValue(0,0,"BANK_NAME","");
+		}
+	}
+	
+	
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List07;Describe=�Զ��庯��;]~*/%>
+	<script type="text/javascript">
+	
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List08;Describe=ҳ��װ��ʱ�����г�ʼ��;]~*/%>
+	<script type="text/javascript">
+	function downLoadButton(){
+	 	  var contractId = "<%=ContractId%>";
+	 	 var sRightType='<%=RightType%>';
+		  var filelist3=RunJavaMethodTrans("com.tenwa.customer.handler.person.CustomerPersonDocHandler","queryFileLibrary","contractId="+contractId);
+		  var obj=filelist3;
+		  var html="<span id='FILELIST'>";
+		  if(typeof(obj['inputtime'])=="undefined"){
+			    html+='<input  type="text"  style="width:200px" readonly />'
+		    	if('ReadOnly'!='<%=RightType%>'){
+					html+='<button type="button" onclick="upload()">�ϴ�</button>';
+				}				
+		  }else{
+		   <%--  if('ReadOnly'!='<%=RightType%>'){
+		    	html+='<a class="btn_icon btn_icon_close" onclick="deleteFile(\''+obj['id']+'\');">&nbsp;</a>';
+			} --%>
+			html+='<a class="btn_icon btn_icon_search" onclick="showImage(\''+obj['id']+'\',\''+obj['filename']+'\');">&nbsp;</a>';
+			html+='<a onclick=downloadFile(\''+obj['id']+'\')><font color="blue">'+obj['filename']+'</font></a>';
+			html+='���ϴ�ʱ��:'+obj['inputtime']+'��';
+			html+='���ϴ���:'+obj['inputuser']+'��';
+			html+='����С:'+Math.floor(obj['FileSize']/1024*100)/100+'kb��';
+			if('ReadOnly'!='<%=RightType%>'){
+				html+='<button type="button" onclick="upload()">�ϴ�</button>';
+			}
+			
+		  }
+			html+='</span>'
+			$("#FILELIST").parent().html(html);
+		}
+	window.onload=function(){
+		downLoadButton();
+	}
+	function upload(){
+		var param="ContractId=<%=ContractId%>";
+		param+="&ObjectType=AccountChange";
+	 	var sUrl="/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/LBDeductChangeDocumentInfo.jsp";
+		AsDialog.PopView(sUrl,param,"dialogWidth=480px;dialogHeight=140px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(message){
+				if("success"==message){			  
+				downLoadButton();
+			}
+		},"�ϴ�����");
+	}
+	function downloadFile(id){
+		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+		window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+	}
+	function deleteFile(id){
+		var sParams="attId="+id;
+		alert(id);
+		var sReturnInfo = RunJavaMethodTrans("com.tenwa.doc.action.DocListAction","deleteAttr",sParams);
+		 reloadSelf(); 
+	}
+	
+	function showImage(id,name){
+		var sUrl="/Tenwa/Comm/DocList/showImage.jsp";
+		var param="attrid="+id;
+		AsDialog.PopView(sUrl,param,"dialogWidth=480px;dialogHeight=400px;",function(message){
+			
+		},name);
+	}
+	
+	//���п��Ÿ�ʽУ��
+	function checkAcNumber(){
+		var acc_number = getItemValue(0,0,"ACC_NUMBER");
+		//ȫ����
+		var num = /^\d*$/; 
+		//����6-25λ
+		if(acc_number.length < 6 || acc_number.length > 25) {
+			AsDebug.showMessage("����","�����˺ų��ȱ�����6��25֮�䣡","","",false);
+			setItemValue(0, 0, "ACC_NUMBER","");
+		    return false;
+		}else if(!num.exec(acc_number)) {
+			AsDebug.showMessage("����","�����˺ű���ȫΪ���֣�","","",false);
+			setItemValue(0, 0, "ACC_NUMBER","");
+		   	return false;
+		}else{
+			setItemValue(0, 0, "ACC_NUMBERV", acc_number);
+			return true;
+		}
+		
+	}
+	</script>	
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp
new file mode 100644
index 000000000..7cb215c2b
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp
@@ -0,0 +1,326 @@
+<%@page import="jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST"%>
+<%@page import="jbo.com.tenwa.lease.comm.LB_DEDUCT_CARD_CHANGE"%>
+<%@page import="jbo.com.tenwa.lease.comm.LB_UNION_LESSEE"%>
+<%@page import="jbo.app.tenwa.customer.CUSTOMER_TEL"%>
+<%@page import="jbo.com.tenwa.lease.comm.LB_DEDUCT_CARD_HIS"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List00;Describe=ע����;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List01;Describe=����ҳ������;]~*/%>
+	<%
+	String PG_TITLE = "��Ȼ��ԭ�ۿ���Ϣ"; // ��������ڱ��� <title> PG_TITLE </title>
+	%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List02;Describe=�����������ȡ����;]~*/%>
+
+<%/*~END~*/%> 
+ 
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List03;Describe=�������ݶ���;]~*/%>
+
+<% 
+	String ID = CurPage.getParameter("id");//������ID
+	if(ID == null)ID = "";
+	String RightType=CurPage.getParameter("RightType");
+	if(RightType==null)RightType="";
+	String applyId = CurPage.getParameter("ApplyId");
+	if(applyId==null)applyId="";
+	String customerType=CurPage.getParameter("CustomerType");
+	if(customerType==null)customerType="";
+	String ContractId = CurPage.getParameter("ContractId");
+	if(ContractId==null)ContractId="";
+	String customerId = CurPage.getParameter("CustomerId");
+	if(customerId==null)customerId="";
+	//��ȡ�绰����
+	BizObjectManager bomTel = JBOFactory.getBizObjectManager(CUSTOMER_TEL.CLASS_NAME);
+	BizObject boTel = bomTel.createQuery("select * from o where customerid=:customerid").setParameter("customerid",customerId).getSingleResult(false);
+	String telephone = boTel.getAttribute("telephone").toString();
+	//��ȡ����
+	BizObjectManager bomName = JBOFactory.getBizObjectManager(LB_UNION_LESSEE.CLASS_NAME);
+	BizObject boName = bomName.createQuery("select * from o where CONTRACT_ID=:contract_id").setParameter("contract_id",ContractId).getSingleResult(false);
+	String customerName = boName.getAttribute("customer_name").toString();
+	
+	
+	
+	if(customerId == null) customerId = "";
+	String status = CurPage.getParameter("Status");
+	String sTempletNo ="LBDeductCardOldPerson";//--ģ���--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	doTemp.setVisible("IS_CONSIGN_REPAY", false);
+	doTemp.setVisible("CONSIGN_REPAY_CERT", false);
+	doTemp.setVisible("CONSIGN_REPAY_PHONE", false);
+	if("approve_status02".equals(status)){
+		doTemp.setJboClass(LB_DEDUCT_CARD_HIS.CLASS_NAME);
+		doTemp.appendJboWhere("apply_id='"+CurPage.getParameter("ApplyId")+"'");
+	}
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	if(RightType!=null && "ReadOnly".equals(RightType)){
+		isShowButton=false;
+	}
+	
+	
+	dwTemp.genHTMLObjectWindow(ContractId);
+	String compClientID = request.getParameter("CompClientID");
+	dwTemp.replaceColumn("change", "<iframe type='iframe' name=\"change\" width=\"100%\" height=\"150\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonChangeInfo.jsp?CompClientID="+sCompClientID+"&RightType="+RightType+"\"></iframe>", CurPage.getObjectWindowOutput());
+	dwTemp.replaceColumn("contractList", "<iframe type='iframe' name=\"change\" width=\"100%\" height=\"150\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/DeductCardDocList.jsp?CompClientID="+sCompClientID+"&applyId="+applyId+"&customerType="+customerType+"&RightType="+RightType+"\"></iframe>", CurPage.getObjectWindowOutput());
+%>
+<%/*~END~*/%>
+	
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List04;Describe=���尴ť;]~*/%>
+<%
+	String sButtons[][] = {
+		//0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
+		{"true","All","Button","����","���������޸�","saveRecord()","","","","btn_icon_save"},
+		{"true","","Button","���ɱ������","���ɺ�ͬ","generateQuotation()","","","","btn_icon_detail",""},
+		{"true","","Button","�������ǩԼ","����ǩ�º�ͬ","signOnLine()","","","","btn_icon_detail",""},
+		{"true","","Button","��ѯǩԼ���","��ѯǩԼ���","getStatus()","","","","btn_icon_detail",""},
+		{"true","All","Button","�޸�","�޸�","edit()","","","","btn_icon_edit"},
+	    {"false","","Button","���غ�ͬ�ļ�","���غ�ͬ","downloadDoc()","","","","btn_icon_down",""}
+	};
+	//sButtonPosition = "south"; 
+	
+%> 
+<%/*~END~*/%>
+	
+	
+	
+
+<%/*~BEGIN~���ɱ༭��~[Editable=false;CodeAreaID=List05;Describe=����ҳ��;]~*/%>
+	<%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List06;Describe=���尴ť�¼�;]~*/%>
+	<script type="text/javascript">
+	/*~[Describe=�����¼;InputParam=��;OutPutParam=��;]~*/
+	function saveRecord(){
+		change.window.saveRecord();
+	}
+	
+	//����ί�пۿ���Ȩ���ͬ 
+	function generateQuotation(){
+		//�ж��Ƿ񱣴�����
+		var sResult=RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.businesschangeapply.AccountChange","checkDateStatus","contractId=<%=ContractId%>,customerType=<%=customerType%>,applyId=<%=applyId%>");
+		if(sResult=="ERROR"){
+			AsDebug.showMessage("��ʾ","���ȱ�������,�ڽ��к�ͬ������","","",true);
+			 return;
+		}
+		 <%-- alert("<%=ContractId%>"); --%>
+		var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","getMakeContractProcessContract","contract_id=<%=ContractId%>,customerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+		if(result=="isDoc" || result=="isPdf" ){
+			var flag = window.confirm("�Ѿ����ɹ���ͬ,�Ƿ���������ί�пۿ���Ȩ��");
+			if(flag==true){
+				//�ϳ�֮ǰ���ɹ��ĺ�ͬ
+				 var resultStatus = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","updateDocContractStatusContract","contract_id=<%=ContractId%>,CustomerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+				 if("error"==resultStatus){
+						AsDebug.showMessage("��ʾ","���ɺ�ͬʧ�ܣ�","","",true);	
+						return;
+					} 
+				 makeContract();
+				 AsDebug.showMessage("��ʾ","��ͬ�ļ�����ת��pdf......","","",true,"","","",function(){
+						window.location.reload();	
+				 });
+			}  
+			return;
+		}else if(result=="isSigning"){
+			AsDebug.showMessage("��ʾ","�Ѿ��������ǩԼ,�޷�������������","","",true);	
+			return;
+		}else{
+			 makeContract();
+			 AsDebug.showMessage("��ʾ","��ͬ�ļ�����ת��pdf......","","",true,"","","",function(){
+					window.location.reload();	
+			 });
+			 
+		}
+	}
+	
+	//����ί�пۿ���Ȩ����巽��
+	function makeContract(){
+		var param={};
+		var tempParam={};
+		var sparam="";	
+	    var contractId="<%=ContractId%>";
+	    var customerName = "<%=customerName%>";
+	    var telephone = "<%=telephone%>";
+	   	var id = "<%=applyId%>";
+	    //�����ļ�������ϵ
+	 	param["templateNo"]="2becb0b56d804676bd2ec4fc30620556";//ģ���
+		tempParam["OBJECTTYPE"]="DeductCardChange"; 
+		tempParam["FLOW_UNID"]="<%=applyId%>";
+		tempParam["CONTRACT_ID"]=contractId; //��ͬid
+		tempParam["CUSTOMERNAME"]=customerName;//����������
+		tempParam["TELEPHONE"]=telephone;//�������ֻ�����
+		tempParam["NEW_TIME"]=getNowFormatDate();//��ǰʱ��
+		tempParam["id"]=id; //�м��id,����ģ������ȥ
+ 		tempParam["IDS"]=id;//
+		tempParam["Flag"]="true";//���ɺ�ͬ��������������(�ж�����) 
+		
+		tempParam["CurUserId"]="<%=CurUser.getUserID()%>";
+		tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>";
+		tempParam["fileSavePath"]="<%=CurConfig.getConfigure("FileSavePath")%>";
+		param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//����ģ��IJ�����
+		for(var key in param){
+			  if(sparam.length>0){sparam+=",";}
+			   sparam+=key+"="+param[key];
+		}
+		var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam);
+		//���ļ�ת��pdf��ʽ
+		RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdf","contract_id="+id+",customerType=<%=customerType%>,FlowUnid=<%=applyId%>,flagType=flowunid");
+		if(result == "success"){
+			var attributeID = AsControl.RunJsp("/Tenwa/Lease/Flow/Rent/BatchIncome/GetLBDocAttributeID.jsp",
+					"FLOW_UNID="+tempParam["FLOW_UNID"]+"&OBJECTTYPE="+tempParam["OBJECTTYPE"]);
+			/* loadFile(attributeID); */
+		}else{
+			alert("����ʧ�ܣ�");
+		}
+	}
+	function loadFile(id){
+		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+		window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+	}
+	function signOnLine(){
+		var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","getMakeContractProcessContract","contract_id=<%=ContractId%>,customerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+		if(result=="notExsit"){
+			AsDebug.showMessage("��ʾ","��������ί�пۿ���Ȩ��,�ٵ���ǩԼ!","","",true);
+			return;
+		}else if(result=="isDoc"){
+			AsDebug.showMessage("��ʾ","��ͬ�ļ�����ת��pdf......","","",true);
+			return;
+		}else if(result=="isSigning"){
+			AsDebug.showMessage("��ʾ","�Ѿ��������ǩԼ","","",true);
+			return;
+		}else if(result=="complete"){
+			AsDebug.showMessage("��ʾ","����ǩԼ�����","","",true);
+			return;
+		}
+		//���״̬Ϊ��pdf����е���ǩԼ
+		var sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","PersonDeductSignIng","contract_id=<%=ContractId%>,CurUserID=<%=CurUser.getUserID()%>,customerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+		if("success"==sReturn){
+		AsDebug.showMessage("��ʾ","����ǩԼ����ɹ�!","","",true,"","","",function(){
+			window.location.reload();	
+		});	
+		}else{
+		AsDebug.showMessage("��ʾ","����ǩԼ����ʧ��!","","",true,"","","",function(){
+			window.location.reload();	
+		});		
+		  }
+		
+	}
+	//��ɵ���ǩԼ,��ѯ����ǩԼ��״̬
+	 function getStatus(){
+		 var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","getMakeContractProcessContract","contract_id=<%=ContractId%>,customerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+			if(result=="notExsit"){
+				AsDebug.showMessage("��ʾ","��������ί�пۿ���Ȩ��,�ٲ�ѯ״̬!","","",true);
+				return;
+			}else if(result=="isDoc"){
+				AsDebug.showMessage("��ʾ","��ͬ�ļ�����ת��pdf......","","",true);
+				return;
+			}else if(result=="isPdf"){
+				AsDebug.showMessage("��ʾ","��ͬ�ļ�û�з������ǩԼ......","","",true);
+				return;
+			}
+		var sParams="contract_id=<%=ContractId%>,customerType=<%=customerType%>,CurUserID=<%=CurUser.getUserID()%>,FlowUnid=<%=applyId%>";
+		var sReturn=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","contractSignStatusForContract",sParams);
+		AsDebug.showMessage("��ʾ",sReturn,"","",true,'','','',function(){		
+			/*  window.location.reload(); */
+				});
+	 }
+	//�����Ѿ��Ǻ��µĺ�ͬ
+	 function downloadDoc(){
+		 var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","getMakeContractProcessContract","contract_id=<%=ContractId%>,customerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+			if(result=="notExsit"){
+				AsDebug.showMessage("��ʾ","��������ί�пۿ���Ȩ��,������!","","",true);
+				return;
+			}
+	    	var sParams="contract_id=<%=ContractId%>,customerType=<%=customerType%>,FlowUnid=<%=applyId%>";
+			var sReturn=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","downloadDocContract",sParams);
+			var results = sReturn.split("@");
+			if("success"==results[0]){
+			AsDebug.showMessage("��ʾ","���سɹ�","","",true,'','','',function(){		
+					});	
+			var attributeId = results[1];
+			loadFile(attributeId);
+			}else{
+				AsDebug.showMessage("��ʾ","����ʧ��","","",true,'','','',function(){			
+					});	
+			}
+	    }
+	function edit(){
+	 	var flag = window.confirm("�޸����ݻ���������������ǩԼ�ĺ�ͬ,�Ƿ��޸�");
+		if(flag==true){
+			//�ϳ�֮ǰ���ɹ��ĺ�ͬ
+			 var resultStatus = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","updateDocContractStatusContract","contract_id=<%=ContractId%>,CustomerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+			 if("error"==resultStatus){
+					AsDebug.showMessage("��ʾ","�޸�ʧ�ܣ�","","",true);	
+					return;
+				}
+			 reloadSelf();	
+		} 
+	}
+	//���غ�ͬ
+	function loadFile(id){
+		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+		window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+	}
+	
+	//��ȡ��ǰ����
+	function getNowFormatDate() {
+	    var date = new Date();
+	    var seperator1 = "-";
+	    var seperator2 = ":";
+	    var month = date.getMonth() + 1;
+	    var strDate = date.getDate();
+	    if (month >= 1 && month <= 9) {
+	        month = "0" + month;
+	    }
+	    if (strDate >= 0 && strDate <= 9) {
+	        strDate = "0" + strDate;
+	    }
+	    var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
+	            + " " + date.getHours() + seperator2 + date.getMinutes()
+	            + seperator2 + date.getSeconds();
+	    return currentdate;
+	} 
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List07;Describe=�Զ��庯��;]~*/%>
+	<script type="text/javascript">
+	
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List08;Describe=ҳ��װ��ʱ�����г�ʼ��;]~*/%>
+	<script type="text/javascript">
+	
+	</script>	
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonMain.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonMain.jsp
new file mode 100644
index 000000000..340314eea
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonMain.jsp
@@ -0,0 +1,97 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin.jspf"%>
+<%
+	/*
+		ҳ��˵��:ʾ��ģ����ҳ��
+	 */
+	String PG_TITLE = "ʾ��ģ����ҳ��"; // ��������ڱ��� <title> PG_TITLE </title>
+	String PG_CONTENT_TITLE = "&nbsp;&nbsp;ʾ��ģ����ҳ��&nbsp;&nbsp;"; //Ĭ�ϵ�����������
+	String PG_CONTNET_TEXT = "��������б�";//Ĭ�ϵ�����������
+	String PG_LEFT_WIDTH = "200";//Ĭ�ϵ�treeview����
+	String ContractId = CurPage.getParameter("ContractId");
+	if(ContractId == null) ContractId = "";
+	//����Treeview
+	OHTMLTreeView tviTemp = new OHTMLTreeView(CurPage, "�ۿ���Ϣ���","right");
+
+	out.write(new Button("�ر�����", "�ر�����", "closePage()", "", "btn_icon_close").getHtmlText());
+	out.write(new Button("�ύ", "�ύ", "submitApply()", "", "btn_icon_submit").getHtmlText());
+	//������ͼ�ṹ
+	/* String sFolder1=tviTemp.insertFolder("root","ʾ����Ϣ","",1);
+	tviTemp.insertPage(sFolder1,"���е�ʾ����Ϣ","",1);
+	tviTemp.insertPage(sFolder1,"�ҵ�ʾ����Ϣ","",2);
+	tviTemp.insertPage(sFolder1,"����ʾ����Ϣ","",3); */
+	tviTemp.insertPage("root","��Ŀ������Ϣ","",1);
+	tviTemp.insertPage("root","�ۿ���Ϣ���","",2);
+	tviTemp.insertPage("root","��ͬ��ӡ","",3);
+	
+	//�������ֶ�����ͼ�ṹ�ķ�����SQL���ɺʹ�������   �μ�View������ ExampleView.jsp��ExampleView01.jsp
+%>
+<%@ include file="/Frame/resources/include/include_main.jspf"%>
+<script type="text/javascript"> 
+//�ر�
+function closePage(){
+ 	AsControl.colseCurTab();
+ }
+//�ύ����
+function submitApply(){
+	//�ύǰУ���Ƿ���ڱ����¼
+	autoRiskScan("�����ۿ��Ϣ���","ContractId=<%=ContractId%>&isAutoCommit=false&ObjectType=FlowDefaultObject","0010",function(riskMessage){
+		console.log(riskMessage);
+		if(riskMessage != true){
+ 			return;
+ 		}
+		
+		var sURL='/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/ControlForInitChangeAccount.jsp';
+		AsControl.RunJsp(sURL,"ContractId=<%=ContractId%>",function(sReturn){
+			if(allTrim(sReturn)=='success'){
+//					if(confirm('�ύ�ɹ�����ȷ�������غ�ͬ�嵥�б�ҳ�棬��ȡ�����������ӱ����Ϣ��')){
+//						closePage();
+//					}
+				AsDebug.showMessage('��ʾ��','�ύ�ɹ���',400,100,true);
+ 				setTimeout(function(){
+ 					AsDebug.removeWindow();
+	 				closePage();
+
+ 				},2000);
+ 				
+			
+ 				
+ 			}else{
+ 				AsDebug.showMessage('ע�⣺',allTrim(sReturn),400,100,true);
+ 				setTimeout(function(){
+ 					AsDebug.removeWindow();
+	 				closePage();
+ 				},2000);
+
+ 			}
+		});
+	});
+	
+	
+}
+	function TreeViewOnClick(){
+		//���tviTemp.TriggerClickEvent=true�����ڵ���ʱ������������
+//		var sCurItemID = getCurTVItem().id;
+		var sCurItemname = getCurTVItem().name;
+		var param="ContractId="+'<%=ContractId%>';
+		if(sCurItemname=='��Ŀ������Ϣ'){
+			AsControl.OpenView("/Tenwa/ChannelPortal/BusinessHanding/Comm/LBProject/LBProjectInfo.jsp",param,"right");
+		}else if(sCurItemname=='�ۿ���Ϣ���'){
+			AsControl.OpenView("/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp",param,"right");
+		}else if(sCurItemname=='��ͬ��ӡ'){
+			AsControl.OpenView("/Tenwa/Comm/ContractTemplate/LBCommContractPrintList.jsp",param,"right");
+
+		}
+		setTitle(getCurTVItem().name);
+	}
+	
+	<%/*~[Describe=����treeview;]~*/%>
+	function initTreeView(){
+		<%=tviTemp.generateHTMLTreeView()%>
+		expandNode('root');
+		selectItemByName("��Ŀ������Ϣ");	//Ĭ�ϴ򿪵�(Ҷ��)ѡ��	
+	}
+	
+	initTreeView();
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/ControlForInitChangeAccount.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/ControlForInitChangeAccount.jsp
new file mode 100644
index 000000000..6d6082ed1
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/ControlForInitChangeAccount.jsp
@@ -0,0 +1,36 @@
+<%@page import="jbo.sys.CHANNEL_SUBMIT_APPLICATIONS"%>
+<%@page import="com.tenwa.action.channelportal.channelsubmit.ChannelSubmitAction" %>
+<%@page import="com.tenwa.action.channelportal.businesshanding.businesschangeapply.ChannelUpdate" %>
+<%@page import="com.amarsoft.are.jbo.*"%>
+<%@ page contentType="text/html; charset=GBK"%><%@
+ include file="/IncludeBeginMDAJAX.jsp"%><% 
+	try{
+		String ContractId = CurPage.getParameter("ContractId");
+		String flowNo = "AccountChangeFlow";
+		String ProjectId = CurPage.getParameter("ProjectId");
+		String CustomerType = CurPage.getParameter("CustomerType");
+		String param ="ContractId="+ContractId+"&ProjectId="+ProjectId+"&CustomerType="+CustomerType;
+		
+		String curUserId=CurPage.getParameter("CurUserID");
+		BizObjectManager bom=JBOFactory.getBizObjectManager(CHANNEL_SUBMIT_APPLICATIONS.CLASS_NAME);
+		
+		if(bom!=null){
+			List<BizObject> bos = bom.createQuery("select * from O WHERE Objectno=:Objectno and FlowNo='AccountChangeFlow' and status='approve_status01'")
+			.setParameter("Objectno", ContractId)
+			.getResultList();
+			if(bos.size()>0){
+				out.print("�����ظ��ύ");
+			}else{
+				String result =ChannelSubmitAction.changeSubmitStatus(curUserId,ContractId,flowNo,param,null);
+				if("SUCCESS".equals(result)){
+					out.print("SUCCESS");
+				}else{
+					out.print("ERROR");
+				}
+			}	
+		}
+	}catch(Exception e){
+		out.print("ERROR");
+		throw e;
+	}
+%><%@ include file="/IncludeEndAJAX.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/DeductCardDocList.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/DeductCardDocList.jsp
new file mode 100644
index 000000000..bd7eed0e5
--- /dev/null
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/DeductCardDocList.jsp
@@ -0,0 +1,70 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2017-09-28
+        Content: 
+        History Log: 
+    */
+	String applyId = CurPage.getParameter("applyId");
+	if(applyId==null) applyId = "";
+    String customerType = CurPage.getParameter("customerType");
+    if(customerType==null) customerType = "";
+	ASObjectModel doTemp = new ASObjectModel("DeductCardDocList");
+	//�����м��id��ѯ
+	doTemp.appendJboWhere("flow_unid='"+applyId+"'");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--����ΪGrid���--
+	dwTemp.ReadOnly = "1";	 //ֻ��ģʽ
+	dwTemp.setPageSize(20);
+	dwTemp.genHTMLObjectWindow("");
+	//0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
+	String sButtons[][] = {
+		
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<style>
+	.test>td{
+		color:red;
+	}
+</style>
+<script type="text/javascript">
+   
+	
+	//�ڼ������������
+	function afterSearch(){
+		for(var i=0;i<getRowCount(0);i++){
+		    var fileinfo=getObj(0,i,"fileinfo").innerHTML;
+			var obj=eval('('+fileinfo+')');
+			var html=""; 
+			for(var file in obj){
+				if(obj[file]['pdf']=="true"){
+					html+='<a class="btn_icon btn_icon_search" onclick="showPDF(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\');">&nbsp;</a>';
+				}
+				html+='<a onclick="loadFile(\''+obj[file]['id']+'\')" <font color="blue">'+obj[file]['filename']+'</font></a>';
+				html+='������ʱ��:'+obj[file]['inputtime']+'��';
+				html+='��������:'+obj[file]['inputuser']+'��';
+				html+='����С:'+Math.floor(obj[file]['FileSize']/1024*100)/100+'kb��';
+				html+='</br>';
+			}
+			getObj(0,i,"fileinfo").innerHTML=html;
+			getObj(0,i,"fileinfo").style["white-space"]="pre-wrap"; 
+		}
+	}
+	
+	
+	function showPDF(id,name){
+		var sUrl="/Tenwa/Comm/DocList/showPDF.jsp";
+		var param="attrid="+id;
+		AsControl.OpenPage(sUrl,param,"","");
+	}
+	 function loadFile(id){
+			if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+			window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+		}
+	 
+	
+	
+	
+	
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp
new file mode 100644
index 000000000..f3d482d9e
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp
@@ -0,0 +1,76 @@
+<%@ page contentType="text/html; charset=GBK"%>
+ <%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf"%>
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List06;Describe=�Զ��庯��;]~*/%>
+	<script type="text/javascript">
+ 	/*~[Describe=������¼;InputParam=��;OutPutParam=��;]~*/
+	<%-- function newApply()
+ 	{
+		AsDialog.OpenSelector("SelectContractInfoCustChangeList","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+			if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){
+				//alert(getHtmlMessage('1'));//��ѡ��һ����Ϣ��
+	    	return;
+		    }
+			debugger;
+			sReturn = sReturn.split("@");
+			var channelApplyId=sReturn[0];
+			var applyData=sReturn[1];
+			var jsonParam = eval("("+applyData+")");
+			alert(eval("("+2018003+")"));
+			alert(applyData);
+			alert(jsonParam);
+			var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
+			 $.each(jsonParam,function(name,value) {
+				sParams += ","+name+"="+value;
+			}); 
+			sParams =sParams+",ChannelApplyId="+channelApplyId;
+			alert(sParams);
+			var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);			
+		if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
+			var sReturnInfos=sReturnInfo.split("@");
+			if(sReturnInfos[0]=="success")
+		     {
+		  		var objectNo=sReturnInfos[1];
+		  		FlowFunction.openStartFlowPage(objectNo);
+		   }
+		 else
+		  {
+		  	 var mes=sReturnInfos[1];
+		  		alert(mes);
+		  }
+		 reloadSelf();	
+		},"��ѡ�����˼�¼");
+   }  --%>
+	function newApply(){
+		AsDialog.OpenSelector("SelectContractInfoCustChangeList","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+			if(!sReturn||sReturn=="_CANCEL_"||sReturn==""||sReturn=="_NONE_"){
+					 //alert(getHtmlMessage('1'));//��ѡ��һ����Ϣ��
+						return;
+			}
+			sReturn = sReturn.split("@");
+			var contractId=sReturn[0];
+			var productId=sReturn[1];
+			var product_Name=sReturn[2];
+			var projectId=sReturn[3];
+		    var customerType=sReturn[4];
+			var customerId=sReturn[5]; 
+			var contractNumber=sReturn[6];
+			var param="contractId="+contractId+",productId="+productId+",product_Name="+product_Name+",projectId="+projectId+",customerType="+customerType+",customerId="+customerId+",contractNumber="+contractNumber;
+			var sParams =param+",ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
+			var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);			
+		if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
+			var sReturnInfos=sReturnInfo.split("@");
+			if(sReturnInfos[0]=="success")
+		     {
+		  		var objectNo=sReturnInfos[1];
+		  		FlowFunction.openStartFlowPage(objectNo);
+		   }
+		 else
+		  {
+		  	 var mes=sReturnInfos[1];
+		  		alert(mes);
+		  }
+		 reloadSelf();	
+		},"��ѡ��ۿ���Ϣ����ĺ�ͬ");
+	}
+   </script>
+ <%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListEnd.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyChangeInfo.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyChangeInfo.jsp
new file mode 100644
index 000000000..d174fc211
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyChangeInfo.jsp
@@ -0,0 +1,156 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List00;Describe=ע����;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List01;Describe=����ҳ������;]~*/%>
+	<%
+	String PG_TITLE = "��Ȼ���ֿۿ���Ϣ"; // ��������ڱ��� <title> PG_TITLE </title>
+	%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List02;Describe=�����������ȡ����;]~*/%>
+
+<%/*~END~*/%> 
+ 
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List03;Describe=�������ݶ���;]~*/%>
+
+<% 
+	String FlowUnid = CurPage.getParameter("FlowUnid");
+	String rightType = CurPage.getParameter("RightType");
+	if(FlowUnid == null)FlowUnid = "";	
+	String ContractId = CurPage.getParameter("ContractId");
+	String IsHistory = CurPage.getParameter("IsHistory");
+	String PhaseNo = CurPage.getParameter("PhaseNo");
+	if(ContractId == null) ContractId = "";
+	String sTempletNo ="LBDeductCardChangeCompanyTemp";//--ģ���--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	dwTemp.ReadOnly="1";
+	dwTemp.genHTMLObjectWindow(FlowUnid);
+%>
+<%/*~END~*/%>
+	
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List04;Describe=���尴ť;]~*/%>
+<%
+	String sButtons[][] = {
+		//0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
+		{"false","All","Button","����","���������޸�","saveRecord()","","","","btn_icon_save"},
+	};
+	sButtonPosition = "south"; 
+%> 
+<%/*~END~*/%>
+	
+	
+	
+
+<%/*~BEGIN~���ɱ༭��~[Editable=false;CodeAreaID=List05;Describe=����ҳ��;]~*/%>
+	<%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List06;Describe=���尴ť�¼�;]~*/%>
+	<script type="text/javascript">
+	$(function(){
+		checkIsConsignRepayd();
+		downLoadButton();
+	})
+	//У��ۿ�����
+	function checkIsConsignRepayd(){
+		var isConsignRepayd = getItemValue(0,0,'IS_CONSIGN_REPAY');
+		//1.����ʷ���ǵ�һ�ڵ㣬���ί�д���ʱΪ���ɱ༭
+		if('true'=='<%=IsHistory%>'||"0020"=='<%=PhaseNo%>'||"0030"=='<%=PhaseNo%>'||isConsignRepayd=='no'){
+			$("#DEBIT_BANK").attr('disabled',true);
+		}else{
+			//2.���˲���ί�д�������ѡ�ۿ������Ƴ�����ѡ��ɱ༭
+			if(isConsignRepayd=='yes'){
+				$('#DEBIT_BANK option[value=other]').remove();
+				$('#DEBIT_BANK option[value=none]').remove();
+				$('#DEBIT_BANK option[value=abc]').remove();
+				$('#DEBIT_BANK option[value=ccb]').remove();
+			}
+			$("#DEBIT_BANK").attr('disabled',false);
+		}
+	}
+	function downLoadButton(){
+	 	  var contractId = "<%=ContractId%>";
+		  var filelist3=RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.CustomerPersonDocHandler","queryFileLibrary","contractId="+contractId);
+		  
+		  var obj=filelist3;
+		  var html="<span id='FILELIST'>";
+		  if(typeof(obj['inputtime'])=="undefined"){
+			    html+='<input  type="text"  style="width:200px" readonly />'
+// 				html+='<button type="button" onclick="upload()"> �ϴ�</button>';				
+		  }else{
+			html+='<a class="btn_icon btn_icon_search" onclick="showImage(\''+obj['id']+'\',\''+obj['filename']+'\');">&nbsp;</a>';
+			html+='<a onclick=downloadFile(\''+obj['id']+'\')><font color="blue">'+obj['filename']+'</font></a>';
+			html+='���ϴ�ʱ��:'+obj['inputtime']+'��';
+			html+='���ϴ���:'+obj['inputuser']+'��';
+			html+='����С:'+Math.floor(obj['FileSize']/1024*100)/100+'kb��';
+// 			html+='<button type="button" onclick="upload()">�ϴ�</button>';
+		  }
+			html+='</span>'
+			$("#FILELIST").parent().html(html);
+	}
+	/*~[Describe=�����¼;InputParam=��;OutPutParam=��;]~*/
+	function saveRecord(){
+		var contract_id=getItemValue(0,getRow(0),"contract_id");
+		if(typeof(contract_id) == "undefined" || contract_id.length == 0 ){
+			setItemValue(0,getRow(),"contract_id","<%=ContractId%>");
+		}
+		as_save("myiframe0","");
+	}
+	
+	function downloadFile(id){
+		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+		window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+	}
+	function showImage(id,name){
+		var sUrl="/Tenwa/Comm/DocList/showImage.jsp";
+		var param="attrid="+id;
+		AsDialog.PopView(sUrl,param,"dialogWidth=480px;dialogHeight=400px;",function(message){
+			
+		},name);
+	}
+	
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List07;Describe=�Զ��庯��;]~*/%>
+	<script type="text/javascript">
+	
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List08;Describe=ҳ��װ��ʱ�����г�ʼ��;]~*/%>
+	<script type="text/javascript">
+	
+	</script>	
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyInfo.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyInfo.jsp
new file mode 100644
index 000000000..af6b7d384
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyInfo.jsp
@@ -0,0 +1,106 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List00;Describe=ע����;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List01;Describe=����ҳ������;]~*/%>
+	<%
+	String PG_TITLE = "��Ȼ��ԭ�ۿ���Ϣ"; // ��������ڱ��� <title> PG_TITLE </title>
+	%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List02;Describe=�����������ȡ����;]~*/%>
+
+<%/*~END~*/%> 
+ 
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List03;Describe=�������ݶ���;]~*/%>
+
+<% 
+	String FlowUnid = CurPage.getParameter("FlowUnid");
+	if(FlowUnid == null)FlowUnid = "";	
+	String ContractId = CurPage.getParameter("ContractId");
+	if(ContractId == null) ContractId = "";
+	String applyId = CurPage.getParameter("ChannelApplyId");
+	if(applyId==null)applyId="";
+	String RightType = CurPage.getParameter("RightType");
+	if(RightType!=null)RightType = "";
+	String sTempletNo ="LBDeductCardOldTemp";//--ģ���--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	doTemp.setVisible("IS_CONSIGN_REPAY", true);
+	doTemp.setVisible("CONSIGN_REPAY_CERT", true);
+	doTemp.setVisible("CONSIGN_REPAY_PHONE", true);
+	doTemp.setVisible("DEBIT_BANK", true);
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	dwTemp.genHTMLObjectWindow(FlowUnid);
+	String compClientID = request.getParameter("CompClientID");
+	dwTemp.replaceColumn("change", "<iframe type='iframe' name=\"frame_list_invoice\" width=\"100%\" height=\"150\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/Lease/Flow/AccountInfoChange/company/AccountChangeCompanyChangeInfo.jsp?CompClientID="+sCompClientID+"\"></iframe>", CurPage.getObjectWindowOutput());
+	dwTemp.replaceColumn("contractList", "<iframe type='iframe' name=\"change\" width=\"100%\" height=\"150\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/Lease/Flow/AccountInfoChange/person/DeductCardDocList.jsp?CompClientID="+sCompClientID+"&applyId="+applyId+"&RightType="+RightType+"\"></iframe>", CurPage.getObjectWindowOutput());
+
+%>
+<%/*~END~*/%>
+	
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List04;Describe=���尴ť;]~*/%>
+<%
+	String sButtons[][] = {
+		//0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
+		{"ReadOnly".equals(RightType)?"false":"true","All","Button","����","���������޸�","saveRecord()","","","","btn_icon_save"},
+	};
+%> 
+<%/*~END~*/%>
+	
+	
+	
+
+<%/*~BEGIN~���ɱ༭��~[Editable=false;CodeAreaID=List05;Describe=����ҳ��;]~*/%>
+	<%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List06;Describe=���尴ť�¼�;]~*/%>
+	<script type="text/javascript">
+	
+	/*~[Describe=�����¼;InputParam=��;OutPutParam=��;]~*/
+	function saveRecord(){
+		frame_list_invoice.window.saveRecord();
+	}
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List07;Describe=�Զ��庯��;]~*/%>
+	<script type="text/javascript">
+	
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List08;Describe=ҳ��װ��ʱ�����г�ʼ��;]~*/%>
+	<script type="text/javascript">
+	
+	</script>	
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonChangeInfo.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonChangeInfo.jsp
new file mode 100644
index 000000000..aa21b7126
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonChangeInfo.jsp
@@ -0,0 +1,173 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List00;Describe=ע����;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List01;Describe=����ҳ������;]~*/%>
+	<%
+	String PG_TITLE = "��Ȼ���ֿۿ���Ϣ"; // ��������ڱ��� <title> PG_TITLE </title>
+	%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List02;Describe=�����������ȡ����;]~*/%>
+
+<%/*~END~*/%> 
+ 
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List03;Describe=�������ݶ���;]~*/%>
+
+<% 
+	String FlowUnid = CurPage.getParameter("FlowUnid");
+	String rightType = CurPage.getParameter("RightType");
+	if(FlowUnid == null)FlowUnid = "";	
+	String ContractId = CurPage.getParameter("ContractId");
+	if(ContractId == null) ContractId = "";
+	String applyId = CurPage.getParameter("ChannelApplyId");
+	if(applyId == null) applyId = "";
+	String sTempletNo ="LBDeductCardChangeTemp";//--ģ���--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	dwTemp.genHTMLObjectWindow(FlowUnid);
+%>
+<%/*~END~*/%>
+	
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List04;Describe=���尴ť;]~*/%>
+<%
+	String sButtons[][] = {
+		//0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
+		/* {"true","All","Button","����","���������޸�","saveRecord()","","","","btn_icon_save"}, */
+	};
+	sButtonPosition = "south"; 
+%> 
+<%/*~END~*/%>
+	
+	
+	
+
+<%/*~BEGIN~���ɱ༭��~[Editable=false;CodeAreaID=List05;Describe=����ҳ��;]~*/%>
+	<%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+	
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List06;Describe=���尴ť�¼�;]~*/%>
+	<script type="text/javascript">
+	
+	/*~[Describe=�����¼;InputParam=��;OutPutParam=��;]~*/
+	$(function(){
+		  setItemReadOnly(0,0,"bank_name",true);
+		  setItemReadOnly(0,0,"account",true);
+		  setItemReadOnly(0,0,"acc_number",true);
+		  if("ReadOnly" == "<%=rightType%>"){
+			  setItemReadOnly(0,0,"debit_bank",true);
+		  }
+		  downLoadButton();
+	});
+	function saveRecord(){
+		var contract_id=getItemValue(0,getRow(0),"contract_id");
+		if(typeof(contract_id) == "undefined" || contract_id.length == 0 ){
+			setItemValue(0,getRow(),"contract_id","<%=ContractId%>");
+		}
+		as_save("myiframe0","");
+	}
+	function downLoadButton(){
+	 	  var contractId = "<%=ContractId%>";
+		  var filelist3=RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.CustomerPersonDocHandler","queryFileLibrary","contractId="+contractId);
+		  
+		  var obj=filelist3;
+		  var html="<span id='FILELIST'>";
+		  if(typeof(obj['inputtime'])=="undefined"){
+			    html+='<input  type="text"  style="width:200px" readonly />'
+// 				html+='<button type="button" onclick="upload()"> �ϴ�</button>';				
+		  }else{
+			html+='<a class="btn_icon btn_icon_search" onclick="showImage(\''+obj['id']+'\',\''+obj['filename']+'\');">&nbsp;</a>';
+			html+='<a onclick=downloadFile(\''+obj['id']+'\')><font color="blue">'+obj['filename']+'</font></a>';
+			html+='���ϴ�ʱ��:'+obj['inputtime']+'��';
+			html+='���ϴ���:'+obj['inputuser']+'��';
+			//html+='����С:'+Math.floor(obj['FileSize']/1024*100)/100+'kb��<a class="btn_icon_detail" onclick="editOffice(\''+obj['id']+'\',\''+obj['filename']+'\',\''+obj['inputuser']+'\')">&nbsp;</a> ';
+			html+='����С:'+Math.floor(obj['FileSize']/1024*100)/100+'kb��';
+// 			html+='<button type="button" onclick="upload()">�ϴ�</button>';
+		  }
+			html+='</span>'
+			$("#FILELIST").parent().html(html);
+	}
+	
+	function downloadFile(id){
+		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+		window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+	}
+	function showImage(id,name){
+		var sUrl="/Tenwa/Comm/DocList/showImage.jsp";
+		var param="attrid="+id;
+		AsDialog.PopView(sUrl,param,"dialogWidth=480px;dialogHeight=400px;",function(message){
+			
+		},name);
+	}
+	//�����Ѿ��Ǻ��µĺ�ͬ
+	 function downloadDoc(){
+	    	 var sParams="FlowUnid=<%=applyId%>";
+			var sReturn=RunJavaMethodTrans("com.tenwa.action.channelportal.ContractSignAction","downloadDocContract",sParams);
+			var results = sReturn.split("@");
+			if("success"==results[0]){
+			AsDebug.showMessage("��ʾ","���سɹ�","","",true,'','','',function(){		
+					});	
+			var attributeId = results[1];
+			loadFile(attributeId);
+			}else{
+				AsDebug.showMessage("��ʾ","����ʧ��","","",true,'','','',function(){			
+					});	
+			}
+			
+	    }
+	
+	//���غ�ͬ
+	function loadFile(id){
+		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+		window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+	}
+	
+	(function() {
+		window.parent.parent.parent.downNormalProxy = function() {
+			exportWORLD();
+		}
+		window.parent.parent.parent.downEleProxy = function() {
+			downloadDoc();
+		}
+	})();
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List07;Describe=�Զ��庯��;]~*/%>
+	<script type="text/javascript">
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List08;Describe=ҳ��װ��ʱ�����г�ʼ��;]~*/%>
+	<script type="text/javascript">
+	</script>
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonInfo.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonInfo.jsp
new file mode 100644
index 000000000..011e41f45
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonInfo.jsp
@@ -0,0 +1,103 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List00;Describe=ע����;]~*/%>
+
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List01;Describe=����ҳ������;]~*/%>
+	<%
+	String PG_TITLE = "��Ȼ��ԭ�ۿ���Ϣ"; // ��������ڱ��� <title> PG_TITLE </title>
+	%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List02;Describe=�����������ȡ����;]~*/%>
+
+<%/*~END~*/%> 
+ 
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List03;Describe=�������ݶ���;]~*/%>
+
+<% 
+	String FlowUnid = CurPage.getParameter("FlowUnid");
+	if(FlowUnid == null)FlowUnid = "";	
+	String ContractId = CurPage.getParameter("ContractId");
+	if(ContractId == null) ContractId = "";
+	String applyId = CurPage.getParameter("ChannelApplyId");
+	if(applyId==null)applyId="";
+	String RightType = CurPage.getParameter("RightType");
+	if(RightType!=null)RightType = "";
+	String sTempletNo ="LBDeductCardOldTemp";//--ģ���--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	dwTemp.genHTMLObjectWindow(FlowUnid);
+	String compClientID = request.getParameter("CompClientID");
+	dwTemp.replaceColumn("change", "<iframe type='iframe' name=\"frame_list_invoice\" width=\"100%\" height=\"150\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/Lease/Flow/AccountInfoChange/person/AccountChangePersonChangeInfo.jsp?CompClientID="+sCompClientID+"\"></iframe>", CurPage.getObjectWindowOutput());
+	dwTemp.replaceColumn("contractList", "<iframe type='iframe' name=\"change\" width=\"100%\" height=\"150\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/Lease/Flow/AccountInfoChange/person/DeductCardDocList.jsp?CompClientID="+sCompClientID+"&applyId="+applyId+"&RightType="+RightType+"\"></iframe>", CurPage.getObjectWindowOutput());
+
+%>
+<%/*~END~*/%>
+	
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List04;Describe=���尴ť;]~*/%>
+<%
+	String sButtons[][] = {
+		//0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
+		{"true","All","Button","����","���������޸�","saveRecord()","","","","btn_icon_save"}
+	};
+	sButtonPosition = "north"; 
+%> 
+<%/*~END~*/%>
+	
+	
+	
+
+<%/*~BEGIN~���ɱ༭��~[Editable=false;CodeAreaID=List05;Describe=����ҳ��;]~*/%>
+	<%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List06;Describe=���尴ť�¼�;]~*/%>
+	<script type="text/javascript">
+	
+	/*~[Describe=�����¼;InputParam=��;OutPutParam=��;]~*/
+	function saveRecord(){
+		frame_list_invoice.window.saveRecord();
+	}
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List07;Describe=�Զ��庯��;]~*/%>
+	<script type="text/javascript">
+	
+	</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List08;Describe=ҳ��װ��ʱ�����г�ʼ��;]~*/%>
+	<script type="text/javascript">
+	
+	</script>	
+<%/*~END~*/%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/DeductCardDocList.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/DeductCardDocList.jsp
new file mode 100644
index 000000000..bd7eed0e5
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/person/DeductCardDocList.jsp
@@ -0,0 +1,70 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2017-09-28
+        Content: 
+        History Log: 
+    */
+	String applyId = CurPage.getParameter("applyId");
+	if(applyId==null) applyId = "";
+    String customerType = CurPage.getParameter("customerType");
+    if(customerType==null) customerType = "";
+	ASObjectModel doTemp = new ASObjectModel("DeductCardDocList");
+	//�����м��id��ѯ
+	doTemp.appendJboWhere("flow_unid='"+applyId+"'");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--����ΪGrid���--
+	dwTemp.ReadOnly = "1";	 //ֻ��ģʽ
+	dwTemp.setPageSize(20);
+	dwTemp.genHTMLObjectWindow("");
+	//0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
+	String sButtons[][] = {
+		
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<style>
+	.test>td{
+		color:red;
+	}
+</style>
+<script type="text/javascript">
+   
+	
+	//�ڼ������������
+	function afterSearch(){
+		for(var i=0;i<getRowCount(0);i++){
+		    var fileinfo=getObj(0,i,"fileinfo").innerHTML;
+			var obj=eval('('+fileinfo+')');
+			var html=""; 
+			for(var file in obj){
+				if(obj[file]['pdf']=="true"){
+					html+='<a class="btn_icon btn_icon_search" onclick="showPDF(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\');">&nbsp;</a>';
+				}
+				html+='<a onclick="loadFile(\''+obj[file]['id']+'\')" <font color="blue">'+obj[file]['filename']+'</font></a>';
+				html+='������ʱ��:'+obj[file]['inputtime']+'��';
+				html+='��������:'+obj[file]['inputuser']+'��';
+				html+='����С:'+Math.floor(obj[file]['FileSize']/1024*100)/100+'kb��';
+				html+='</br>';
+			}
+			getObj(0,i,"fileinfo").innerHTML=html;
+			getObj(0,i,"fileinfo").style["white-space"]="pre-wrap"; 
+		}
+	}
+	
+	
+	function showPDF(id,name){
+		var sUrl="/Tenwa/Comm/DocList/showPDF.jsp";
+		var param="attrid="+id;
+		AsControl.OpenPage(sUrl,param,"","");
+	}
+	 function loadFile(id){
+			if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+			window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+		}
+	 
+	
+	
+	
+	
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountPayMargin.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoan.java
similarity index 85%
rename from src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountPayMargin.java
rename to src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoan.java
index 7e940031e..2a5790e4e 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountPayMargin.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoan.java
@@ -7,7 +7,7 @@ import com.amarsoft.are.jbo.JBOTransaction;
 import com.tenwa.comm.exception.BusinessException;
 import com.tenwa.voucher.service.VoucherJavaParamService;
 
-public class AccountPayMargin implements VoucherJavaParamService{
+public class CommLoan implements VoucherJavaParamService{
 
 	@Override
 	public Map<String, String> getJavaParam(JBOTransaction tx,
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherReceiveMargin.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java
similarity index 85%
rename from src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherReceiveMargin.java
rename to src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java
index 1ff7e808d..30a4a50d9 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherReceiveMargin.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java
@@ -7,7 +7,7 @@ import com.amarsoft.are.jbo.JBOTransaction;
 import com.tenwa.comm.exception.BusinessException;
 import com.tenwa.voucher.service.VoucherJavaParamService;
 
-public class OtherReceiveMargin implements VoucherJavaParamService{
+public class CommLoanFactMoneyToMoney implements VoucherJavaParamService{
 
 	@Override
 	public Map<String, String> getJavaParam(JBOTransaction tx,

From 9dd624c437bdc67762c94e0c635d4c78a37f3b12 Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei>
Date: Sat, 7 Jul 2018 14:34:58 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1=E5=9B=9B?=
 =?UTF-8?q?=E8=A6=81=E7=B4=A0=E9=AA=8C=E8=AF=81bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Flow/Comm/LBDebitCard/DebitCardInfo.jsp   |  6 +-
 .../customerfilterlist/DebitCardAction.java   | 63 ++++++++++---------
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
index f15328dd7..ec46453c6 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
@@ -151,8 +151,12 @@ function getNameOfBank(){
 		var res = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "verifyFourelementBank", parm);
 		if (res == "ERROR") {
 			alert("У��ʧ��");
+		}else if(res == 'SUCCESS'){
+			alert('�����');
+			reloadSelf();
+		}else{
+			alert(res);
 		}
-		reloadSelf();
 	}
 	 //��ʾ�Ƿ�Ϊָ������
 	function vertifyBankIsValid(){
diff --git a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java
index ea8112d09..b79dc668d 100644
--- a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java
+++ b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java
@@ -152,41 +152,44 @@ public String saveMobile(JBOTransaction tx) throws JBOException{
 } 
 //У�����п���Ҫ��
 public  String verifyFourelementBank(JBOTransaction tx) throws JBOException{
-	BizObjectManager bm = JBOFactory.getFactory().getManager(CUSTOMER_ACCOUNT_TEMP.CLASS_NAME);
-	String s=this.getFlowUnid();
-	BizObject bankObject = bm.createQuery("select customerid from O where flowunid=:FLOWUNID").setParameter("FLOWUNID",s).getSingleResult(false);
-	String customerid = bankObject.getAttribute("customerid").getString();
-	BizObject bo = bm.createQuery("select cpt.fullname,O.mobile,O.acc_number,O.account,cpt.CERTID,cpt.CERTTYPE,O.customerid from O,jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP cpt "
-			+ "where O.customerid = cpt.customerid and cpt.customerid=:customerid")
-			.setParameter("customerid",customerid).getSingleResult(false);
-	if (bo != null) {
-		//���ո�ǩԼ�����п���֤���ײ���URL
-		CollectAuditInfoCache cap = new CollectAuditInfoCache();
-		Map<String, String> map = new HashMap<String, String>();
-		map.put("ACCOUNT_NO", bo.getAttribute("acc_number").toString());//����
-		map.put("ACCOUNT_NAME", bo.getAttribute("account").toString());//����
-		map.put("ID_TYPE", "0");//����ʱ��֤������,0->����֤,Ĭ������֤
-		if (bo.getAttribute("CERTTYPE").toString().equals("Ind02")) {
-			map.put("ID_TYPE", "2");// 2->����
-		}
-		//map.put("ID_TYPE", "0");//����ʱ��֤������,0->����֤
-		map.put("ID", bo.getAttribute("CERTID").toString());//����ʱ��֤������
-		map.put("TEL", bo.getAttribute("mobile").toString());//����ʱԤ����11λ�ֻ���
-		//��Ҫ��
-		Map<String, String> fourMsg = new HashMap<String, String>();
-		try {
-			fourMsg = cap.vitfyCollectManage(map);
-			bm.createQuery("update O set VERIFY=:verify,VERIFY_STATUS=:verify_status where customerid=:customerid")
-			.setParameter("verify", fourMsg.get("ERR_MSG"))
-			.setParameter("verify_status", "0000".equals(fourMsg.get("RET_CODE")) ? "Y" : "N")
-			.setParameter("customerid", customerid).executeUpdate();
+	try {
+		BizObjectManager bm = JBOFactory.getFactory().getManager(CUSTOMER_ACCOUNT_TEMP.CLASS_NAME);
+		String s=this.getFlowUnid();
+		BizObject bankObject = bm.createQuery("select customerid from O where flowunid=:FLOWUNID").setParameter("FLOWUNID",s).getSingleResult(false);
+		if(bankObject!=null){
+			String customerid = bankObject.getAttribute("customerid").getString();		
+			BizObject bo = bm.createQuery("select cpt.fullname,O.mobile,O.acc_number,O.account,cpt.CERTID,cpt.CERTTYPE,O.customerid from O,jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP cpt "
+					+ "where O.customerid = cpt.customerid and cpt.customerid=:customerid")
+					.setParameter("customerid",customerid).getSingleResult(false);
+			  if (bo != null) {
+				//���ո�ǩԼ�����п���֤���ײ���URL
+				CollectAuditInfoCache cap = new CollectAuditInfoCache();
+				Map<String, String> map = new HashMap<String, String>();
+				map.put("ACCOUNT_NO", bo.getAttribute("acc_number").toString());//����
+				map.put("ACCOUNT_NAME", bo.getAttribute("account").toString());//����
+				map.put("ID_TYPE", "0");//����ʱ��֤������,0->����֤,Ĭ������֤
+				if (bo.getAttribute("CERTTYPE").toString().equals("Ind02")) {
+					map.put("ID_TYPE", "2");// 2->����
+				}
+				//map.put("ID_TYPE", "0");//����ʱ��֤������,0->����֤
+				map.put("ID", bo.getAttribute("CERTID").toString());//����ʱ��֤������
+				map.put("TEL", bo.getAttribute("mobile").toString());//����ʱԤ����11λ�ֻ���
+				//��Ҫ��
+				Map<String, String> fourMsg = new HashMap<String, String>();
+				fourMsg = cap.vitfyCollectManage(map);
+				bm.createQuery("update O set VERIFY=:verify,VERIFY_STATUS=:verify_status where customerid=:customerid")
+				.setParameter("verify", fourMsg.get("ERR_MSG"))
+				.setParameter("verify_status", "0000".equals(fourMsg.get("RET_CODE")) ? "Y" : "N")
+				.setParameter("customerid", customerid).executeUpdate();
+				}
+			}else{
+				  return "�ۿ��Ϣδ����,���ȱ���!";
+			}
 		} catch (CryptException e) {
 			e.printStackTrace();
 			return "ERROR";
 		}
-	}
 	return "SUCCESS";
-
 }
 /*public static void main(String[] args) {
 	//���ո�ǩԼ�����п���֤���ײ���URL

From 2c5fdcab6deb81657f56fbeaeff54098812c0923 Mon Sep 17 00:00:00 2001
From: user <user@Lenovo-y50>
Date: Sat, 7 Jul 2018 15:03:40 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Project/BusinessApplication/ApprovalForm.jsp   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
index d69bec427..057593617 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
@@ -74,7 +74,7 @@
 		dwTemp.getDataObject().setVisible("thirdopinion", true);
 		dwTemp.getDataObject().setRequired("thirdchoice", true);
 		dwTemp.getDataObject().setRequired("thirdopinion", true);
-		dwTemp.setGroupHidden("0040,0050");
+		//dwTemp.setGroupHidden("0040,0050");
 	}else if("0050".equals(phaseNo)){
 		dwTemp.getDataObject().setVisible("firstchoice", true);
 		dwTemp.getDataObject().setVisible("firstopinion", true);
@@ -113,10 +113,10 @@
 		case '0020':
 			//$("#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;");
+			$("#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;");
 			_user_validator[0]['rules']['FIRSTCHOICE']['required0'] = true;
 			_user_validator[0]['messages']['FIRSTCHOICE']['required0'] = '������������';
 			_user_validator[0]['rules']['FIRSTOPINION']['required0'] = true;
@@ -127,8 +127,8 @@
 			//$("#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;");
+			$("#A_div_1250").attr("style","display:none;");
+			$("#A_div_1260").attr("style","display:none;");
 			_user_validator[0]['rules']['SECONDCHOICE']['required0'] = true;
 			_user_validator[0]['messages']['SECONDCHOICE']['required0'] = '�����븴�����';
 			_user_validator[0]['rules']['SECONDOPINION']['required0'] = true;

From f21803724df7e2607ee8fa14d5bb62b44c913b0b Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei>
Date: Sat, 7 Jul 2018 15:17:18 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E7=9A=84bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src_core/com/tenwa/flow/flowlog/ViewFlowLogService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src_core/com/tenwa/flow/flowlog/ViewFlowLogService.java b/src_core/com/tenwa/flow/flowlog/ViewFlowLogService.java
index ec88461b3..fd1214c03 100644
--- a/src_core/com/tenwa/flow/flowlog/ViewFlowLogService.java
+++ b/src_core/com/tenwa/flow/flowlog/ViewFlowLogService.java
@@ -58,8 +58,8 @@ public class ViewFlowLogService extends BaseTable{
 		.setParameter("curUserId",CurUserID).getSingleResult(false);
 		String pHASEOPINION="";
 		if(fobo!=null){
-			 pHASEOPINION=fobo.getAttribute(FLOW_OPINION.PHASEOPINION).toString();
-			fobo.getAttribute(FLOW_OPINION.PHASECHOICE).toString();
+			 pHASEOPINION=fobo.getAttribute(FLOW_OPINION.phaseopinion).toString();
+			fobo.getAttribute(FLOW_OPINION.phasechoice).toString();
 		}
 		if(pHASEOPINION!=null&&pHASEOPINION!=""){
 			fl.setAttributeValue("logcontent", FlowLogContent.replaceAll("@", DateAssistant.getTodayNow()).concat("  �����"+pHASEOPINION));

From 3ff2457392180915250c2bd386f8a7840f0f9ab6 Mon Sep 17 00:00:00 2001
From: user <user@Lenovo-y50>
Date: Sat, 7 Jul 2018 16:00:33 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=A1=E6=89=B9=E8=A1=A8=E9=A1=B5=E9=9D=A2=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=94=E9=98=B6=E6=AE=B5=E6=98=BE=E7=A4=BA=E5=88=9D=E5=AE=A1?=
 =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessApplication/ApprovalForm.jsp      | 35 +++++++------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
index 057593617..a2dcb0fe2 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
@@ -80,26 +80,17 @@
 		dwTemp.getDataObject().setVisible("firstopinion", true);
 		dwTemp.getDataObject().setReadOnly("firstchoice", true);
 		dwTemp.getDataObject().setReadOnly("firstopinion", true);
-		dwTemp.getDataObject().setVisible("secondchoice", true);
-		dwTemp.getDataObject().setVisible("secondopinion", true);
-		dwTemp.getDataObject().setReadOnly("secondchoice", true);
-		dwTemp.getDataObject().setReadOnly("secondopinion", true);
-		if(money<200000){
-			dwTemp.getDataObject().setVisible("thirdchoice", false);
-			dwTemp.getDataObject().setVisible("thirdopinion", false);
-			dwTemp.getDataObject().setRequired("thirdchoice", false);
-			dwTemp.getDataObject().setRequired("thirdopinion", false);
-			dwTemp.getDataObject().setReadOnly("thirdchoice", false);
-			dwTemp.getDataObject().setReadOnly("thirdopinion", false);
-		}else{
-			dwTemp.getDataObject().setVisible("thirdchoice", true);
-			dwTemp.getDataObject().setVisible("thirdopinion", true);
-			dwTemp.getDataObject().setRequired("thirdchoice", true);
-			dwTemp.getDataObject().setRequired("thirdopinion", true);
-			dwTemp.getDataObject().setReadOnly("thirdchoice", true);
-			dwTemp.getDataObject().setReadOnly("thirdopinion", true);
-		}
-		//dwTemp.setGroupHidden("0040,0050");
+		dwTemp.getDataObject().setVisible("secondchoice", false);
+		dwTemp.getDataObject().setVisible("secondopinion", false);
+		dwTemp.getDataObject().setReadOnly("secondchoice", false);
+		dwTemp.getDataObject().setReadOnly("secondopinion", false);
+		dwTemp.getDataObject().setVisible("thirdchoice", false);
+		dwTemp.getDataObject().setVisible("thirdopinion", false);
+		dwTemp.getDataObject().setRequired("thirdchoice", false);
+		dwTemp.getDataObject().setRequired("thirdopinion", false);
+		dwTemp.getDataObject().setReadOnly("thirdchoice", false);
+		dwTemp.getDataObject().setReadOnly("thirdopinion", false);
+		dwTemp.setGroupHidden("0030,0040,0050");
 	}
 	dwTemp.genHTMLObjectWindow(flowunid);
 	
@@ -150,9 +141,9 @@
 			$("#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_1240").attr("style","display:none;");
 			$("#A_div_1250").attr("style","display:none;");
-			//$("#A_div_1260").attr("style","display:none;");
+			$("#A_div_1260").attr("style","display:none;");
 			_user_validator[0]['rules']['FOURCHOICE']['required0'] = true;
 			_user_validator[0]['messages']['FOURCHOICE']['required0'] = '�������ܾ������';
 			_user_validator[0]['rules']['FOUROPINION']['required0'] = true;

From ec2c4befddc175587a2770a16ccb5ffa906fd92f Mon Sep 17 00:00:00 2001
From: user <user@Lenovo-y50>
Date: Sat, 7 Jul 2018 17:38:14 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8F=91=E8=B5=B7=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LBProjectIntoTempInitCarBusiness.java     | 108 ++++++++++++------
 1 file changed, 72 insertions(+), 36 deletions(-)

diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
index 67e0fe54b..5ffa8878d 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
@@ -1,6 +1,7 @@
 package com.tenwa.lease.flow.project.commbusiness;
 
 import jbo.app.tenwa.customer.CUSTOMER_COMPANY_TEMP;
+import jbo.app.tenwa.customer.CUSTOMER_INFO;
 import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP;
 import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
 import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP;
@@ -27,11 +28,12 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 	public Object run(Transaction Sqlca) throws Exception {
 		    this.initBussinessParam(Sqlca);
 		    BizObjectManager bm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME); 
-		    BizObjectManager bmCPT = JBOFactory.getBizObjectManager(CUSTOMER_PERSON_TEMP.CLASS_NAME,Sqlca); //˳���ʼ���ͻ���Ϣ
+		    BizObjectManager bmCPT = JBOFactory.getBizObjectManager(CUSTOMER_PERSON_TEMP.CLASS_NAME,Sqlca);
 		    BizObjectManager bmLULT = JBOFactory.getBizObjectManager(LB_UNION_LESSEE_TEMP.CLASS_NAME,Sqlca);
 		    BizObjectManager bmCCT = JBOFactory.getBizObjectManager(CUSTOMER_COMPANY_TEMP.CLASS_NAME,Sqlca);
 		    BizObjectManager bmLECT = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR_TEMP.CLASS_NAME,Sqlca);
 		    BizObjectManager bmLCIT = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO_TEMP.CLASS_NAME,Sqlca);
+		    BizObjectManager bmCI = JBOFactory.getBizObjectManager(CUSTOMER_INFO.CLASS_NAME,Sqlca);
 		    
 		    Sqlca.join(bm);
 			String customerId = UUIDUtil.getUUID();
@@ -42,56 +44,90 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			BizObject bmCC = bmCCT.newObject();
 			BizObject bmLEC = bmLECT.newObject();
 			BizObject bmLCI = bmLCIT.newObject();
+			BizObject bmLC = bmCI.newObject();
 			
 			
 			ASUser asUser=new ASUser(this.getAttribute("CurUserID").toString());
 			
-			bmLCI.setAttributeValue("FLOWUNID", this.getAttribute("FlowUnid"));
-			bmLCI.setAttributeValue("VERSIONID", this.getAttribute("versionid"));
+			//�ͻ���Ϣ��
+			bmLC.setAttributeValue("customerid", customerId);//��Ȼ��ID
+			bmLC.setAttributeValue("customername", this.getAttribute("custname"));//��Ȼ������
+			bmLC.setAttributeValue("customertype", this.getAttribute("CustomerType"));//�ͻ�����
+			bmLC.setAttributeValue("certtype", this.getAttribute("certtype"));//֤������
+			bmLC.setAttributeValue("certid", this.getAttribute("certid"));//֤����
+			bmLC.setAttributeValue("inputuserid", asUser.getUserID());//�Ǽ���
+			bmLC.setAttributeValue("inputorgid", asUser.getOrgID());//�ǼDz���
+			bmLC.setAttributeValue("inputtime", StringFunction.getTodayNow());//�Ǽ�ʱ��,ϵͳ��ǰʱ��
+			String deptid =  asUser.getOrgID() ;
+			if(deptid.startsWith("8006")) {
+	    		BizObject distributor_bo=JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",deptid).getSingleResult(false);
+	    		if(distributor_bo!=null) {
+	    			bmLC.setAttributeValue("distributor_id",distributor_bo.getAttribute("distributor_no"));//������ID
+	    		}
+	    	}
 			
-			boCRT.setAttributeValue("flowunid", this.getAttribute("FlowUnid"));
-			boCRT.setAttributeValue("customerid", customerId);
-			boCRT.setAttributeValue("FULLNAME", this.getAttribute("custname"));
-			boCRT.setAttributeValue("CERTTYPE", this.getAttribute("certtype"));
-			boCRT.setAttributeValue("CERTID", this.getAttribute("certid"));
-			boCRT.setAttributeValue("InputOrgID", asUser.getOrgID());
-			boCRT.setAttributeValue("InputUserID", asUser.getUserID());
-			boCRT.setAttributeValue("InputTime", StringFunction.getToday());
+			//��ͬ��Ϣ��
+			bmLCI.setAttributeValue("FLOWUNID", this.getAttribute("FlowUnid"));//����ID
+			bmLCI.setAttributeValue("PRODUCT_ID", this.getAttribute("ProductId"));//��ƷID
+			bmLCI.setAttributeValue("VERSIONID", this.getAttribute("versionid"));//�汾ID
+			bmLCI.setAttributeValue("INPUTUSERID", asUser.getUserID());//�Ǽ���
+			bmLCI.setAttributeValue("INPUTORGID", asUser.getOrgID());//�ǼDz���
+			bmLCI.setAttributeValue("INPUTTIME", StringFunction.getTodayNow());//�Ǽ�ʱ��,ϵͳ��ǰʱ��
+			
+			//��Ȼ����Ϣ��
+			boCRT.setAttributeValue("flowunid", this.getAttribute("FlowUnid"));//����ID
+			boCRT.setAttributeValue("customerid", customerId);//��Ȼ��ID
+			boCRT.setAttributeValue("FULLNAME", this.getAttribute("custname"));//��Ȼ������
+			boCRT.setAttributeValue("CERTTYPE", this.getAttribute("certtype"));//֤������
+			boCRT.setAttributeValue("CERTID", this.getAttribute("certid"));//��Ȼ��֤����
+			boCRT.setAttributeValue("INPUTUSERID", asUser.getUserID());//�Ǽ���
+			boCRT.setAttributeValue("INPUTORGID", asUser.getOrgID());//�ǼDz���
+			boCRT.setAttributeValue("inputtime", StringFunction.getTodayNow());//�Ǽ�ʱ��,ϵͳ��ǰʱ��
 			boCRT.setAttributeValue("BALANCESHEET", "������");
 
 			//���ݿͻ��������ò���
 			String certType = this.getAttribute("certtype").toString();
 			if(certType.equals("Ent02")){
-				bmCC.setAttributeValue("flowunid", this.getAttribute("FlowUnid"));
-				bmCC.setAttributeValue("customerid", customerId);
-				bmCC.setAttributeValue("enterprisename", this.getAttribute("custname"));
-				bmCC.setAttributeValue("certid", this.getAttribute("certid"));				
+				//������Ϣ��
+				bmCC.setAttributeValue("flowunid", this.getAttribute("FlowUnid"));//����ID
+				bmCC.setAttributeValue("customerid", customerId);//����ID
+				bmCC.setAttributeValue("enterprisename", this.getAttribute("custname"));//��������
+				bmCC.setAttributeValue("certid", this.getAttribute("certid"));//����֤����		
+				bmCC.setAttributeValue("certtype", this.getAttribute("certtype"));//֤������
+				bmCC.setAttributeValue("inputuserid", asUser.getUserID());//�Ǽ���
+				bmCC.setAttributeValue("inputorgid", asUser.getOrgID());//�ǼDz���
+				bmCC.setAttributeValue("inputtime", StringFunction.getTodayNow());//�Ǽ�ʱ��,ϵͳ��ǰʱ��
 				bmCCT.saveObject(bmCC);
 			}
 			
-			bmLEC.setAttributeValue("FLOWUNID", this.getAttribute("FlowUnid"));
-			bmLEC.setAttributeValue("MODEL", this.getAttribute("carSystem"));
-			bmLEC.setAttributeValue("BRAND", this.getAttribute("productModel"));
-			bmLEC.setAttributeValue("car_series", this.getAttribute("carSeries"));
-			bmLEC.setAttributeValue("modelId", this.getAttribute("modelid"));
-			bmLEC.setAttributeValue("NOW_TOTAL", this.getAttribute("price"));
-			bmLEC.setAttributeValue("VNDR_NAME", asUser.getUserName());
-			bmLEC.setAttributeValue("DISPLACEMENT", this.getAttribute("liter"));
-			bmLEC.setAttributeValue("gears", this.getAttribute("geartype"));
+			//������������Ϣ��
+			bmLEC.setAttributeValue("FLOWUNID", this.getAttribute("FlowUnid"));//����ID
+			bmLEC.setAttributeValue("BRAND", this.getAttribute("productModel"));//Ʒ��
+			bmLEC.setAttributeValue("car_series", this.getAttribute("carSeries"));//��ϵ
+			bmLEC.setAttributeValue("MODEL", this.getAttribute("carSystem"));//�ͺ�
+			bmLEC.setAttributeValue("modelId", this.getAttribute("modelid"));//����ID
+			bmLEC.setAttributeValue("NOW_TOTAL", this.getAttribute("price"));//����ָ����
+			bmLEC.setAttributeValue("VNDR_NAME", asUser.getUserName());//��Ӧ��
+			bmLEC.setAttributeValue("DISPLACEMENT", this.getAttribute("liter"));//����
+			bmLEC.setAttributeValue("gears", this.getAttribute("geartype"));//��λ
+			bmLEC.setAttributeValue("INPUTUSERID", asUser.getUserID());//�Ǽ���
+			bmLEC.setAttributeValue("INPUTORGID", asUser.getOrgID());//�ǼDz���
+			bmLEC.setAttributeValue("INPUTTIME", StringFunction.getTodayNow());//�Ǽ�ʱ��,ϵͳ��ǰʱ��
 			
-			boLULT.setAttributeValue("CUSTOMER_NAME", this.getAttribute("custname"));
-			boLULT.setAttributeValue("project_id", this.getAttribute("ProjectId"));
-			boLULT.setAttributeValue("customer_id", customerId);
-			boLULT.setAttributeValue("flowunid", this.getAttribute("FlowUnid"));
-			boLULT.setAttributeValue("InputOrgID", asUser.getOrgID());
-			boLULT.setAttributeValue("InputUserID", asUser.getUserID());
-			boLULT.setAttributeValue("InputTime", StringFunction.getToday());
-			boLULT.setAttributeValue("is_main", "Y");
+			//��������Ϣ��
+			boLULT.setAttributeValue("FLOWUNID", this.getAttribute("FlowUnid"));//����ID
+			boLULT.setAttributeValue("CUSTOMER_ID", customerId);//������ID
+			boLULT.setAttributeValue("CUSTOMER_NAME", this.getAttribute("custname"));//����������
+			boLULT.setAttributeValue("PROJECT_ID", this.getAttribute("ProjectId"));//��ĿID
+			boLULT.setAttributeValue("IS_MAIN", "Y");//�Ƿ�����������
+			boLULT.setAttributeValue("INPUTUSERID", asUser.getUserID());//�Ǽ���
+			boLULT.setAttributeValue("INPUTORGID", asUser.getOrgID());//�ǼDz���
+			boLULT.setAttributeValue("INPUTTIME", StringFunction.getTodayNow());//�Ǽ�ʱ��,ϵͳ��ǰʱ��
 			
 			//��Ŀ��Ϣ��
-			String deptid =  asUser.getOrgID() ;
-			if(deptid.startsWith("8006")) {
-	    		BizObject distributor_bo=JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",deptid).getSingleResult(false);
+			String INPUTUSERID =  asUser.getOrgID() ;
+			if(INPUTUSERID.startsWith("8006")) {
+	    		BizObject distributor_bo=JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",INPUTUSERID).getSingleResult(false);
 	    		if(distributor_bo!=null) {
 	    			bo.setAttributeValue("distributor_id",distributor_bo.getAttribute("distributor_no"));//������ID
 	    		}
@@ -111,7 +147,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			bo.setAttributeValue("INPUTTIME", StringFunction.getTodayNow());//�Ǽ�ʱ��,ϵͳ��ǰʱ��
 			bo.setAttributeValue("BUSINESSTYPE", this.getAttribute("businessType"));//ҵ������
 			bo.setAttributeValue("project_manage",asUser.getUserID());//��Ŀ����
-			bo.setAttributeValue("project_dept",deptid);//��������
+			bo.setAttributeValue("project_dept",INPUTUSERID);//��������
 			bo.setAttributeValue("PROJECT_STATUS","0");//��Ŀ״̬
 			
 			bm.saveObject(bo);

From dfe77a4b1ffb801970a742ee30073fcffa0bfc17 Mon Sep 17 00:00:00 2001
From: user <user@Lenovo-y50>
Date: Sat, 7 Jul 2018 17:44:31 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8F=91=E8=B5=B7=E8=84=9A=E6=9C=AC=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LBProjectIntoTempInitCarBusiness.java     | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
index 5ffa8878d..a6e0d2552 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
@@ -44,25 +44,25 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			BizObject bmCC = bmCCT.newObject();
 			BizObject bmLEC = bmLECT.newObject();
 			BizObject bmLCI = bmLCIT.newObject();
-			BizObject bmLC = bmCI.newObject();
+			BizObject bmC = bmCI.newObject();
 			
 			
 			ASUser asUser=new ASUser(this.getAttribute("CurUserID").toString());
 			
 			//�ͻ���Ϣ��
-			bmLC.setAttributeValue("customerid", customerId);//��Ȼ��ID
-			bmLC.setAttributeValue("customername", this.getAttribute("custname"));//��Ȼ������
-			bmLC.setAttributeValue("customertype", this.getAttribute("CustomerType"));//�ͻ�����
-			bmLC.setAttributeValue("certtype", this.getAttribute("certtype"));//֤������
-			bmLC.setAttributeValue("certid", this.getAttribute("certid"));//֤����
-			bmLC.setAttributeValue("inputuserid", asUser.getUserID());//�Ǽ���
-			bmLC.setAttributeValue("inputorgid", asUser.getOrgID());//�ǼDz���
-			bmLC.setAttributeValue("inputtime", StringFunction.getTodayNow());//�Ǽ�ʱ��,ϵͳ��ǰʱ��
+			bmC.setAttributeValue("customerid", customerId);//��Ȼ��ID
+			bmC.setAttributeValue("customername", this.getAttribute("custname"));//��Ȼ������
+			bmC.setAttributeValue("customertype", this.getAttribute("CustomerType"));//�ͻ�����
+			bmC.setAttributeValue("certtype", this.getAttribute("certtype"));//֤������
+			bmC.setAttributeValue("certid", this.getAttribute("certid"));//֤����
+			bmC.setAttributeValue("inputuserid", asUser.getUserID());//�Ǽ���
+			bmC.setAttributeValue("inputorgid", asUser.getOrgID());//�ǼDz���
+			bmC.setAttributeValue("inputtime", StringFunction.getTodayNow());//�Ǽ�ʱ��,ϵͳ��ǰʱ��
 			String deptid =  asUser.getOrgID() ;
 			if(deptid.startsWith("8006")) {
 	    		BizObject distributor_bo=JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",deptid).getSingleResult(false);
 	    		if(distributor_bo!=null) {
-	    			bmLC.setAttributeValue("distributor_id",distributor_bo.getAttribute("distributor_no"));//������ID
+	    			bmC.setAttributeValue("distributor_id",distributor_bo.getAttribute("distributor_no"));//������ID
 	    		}
 	    	}
 			
@@ -155,6 +155,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			bmLULT.saveObject(boLULT);
 			bmLECT.saveObject(bmLEC);
 			bmLCIT.saveObject(bmLCI);
+			bmCI.saveObject(bmC);
 			
 		    String sMessage="true"; 
 		    return sMessage;

From dd6c654facc1de55939e2016481c06d9ccd31015 Mon Sep 17 00:00:00 2001
From: user <user@Lenovo-y50>
Date: Sat, 7 Jul 2018 17:55:59 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8F=91=E8=B5=B7=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commbusiness/LBProjectIntoTempInitCarBusiness.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
index a6e0d2552..7d0f55c4b 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
@@ -125,9 +125,9 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			boLULT.setAttributeValue("INPUTTIME", StringFunction.getTodayNow());//�Ǽ�ʱ��,ϵͳ��ǰʱ��
 			
 			//��Ŀ��Ϣ��
-			String INPUTUSERID =  asUser.getOrgID() ;
-			if(INPUTUSERID.startsWith("8006")) {
-	    		BizObject distributor_bo=JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",INPUTUSERID).getSingleResult(false);
+			String inputorgid =  asUser.getOrgID() ;
+			if(inputorgid.startsWith("8006")) {
+	    		BizObject distributor_bo=JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",inputorgid).getSingleResult(false);
 	    		if(distributor_bo!=null) {
 	    			bo.setAttributeValue("distributor_id",distributor_bo.getAttribute("distributor_no"));//������ID
 	    		}
@@ -147,7 +147,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			bo.setAttributeValue("INPUTTIME", StringFunction.getTodayNow());//�Ǽ�ʱ��,ϵͳ��ǰʱ��
 			bo.setAttributeValue("BUSINESSTYPE", this.getAttribute("businessType"));//ҵ������
 			bo.setAttributeValue("project_manage",asUser.getUserID());//��Ŀ����
-			bo.setAttributeValue("project_dept",INPUTUSERID);//��������
+			bo.setAttributeValue("project_dept",inputorgid);//��������
 			bo.setAttributeValue("PROJECT_STATUS","0");//��Ŀ״̬
 			
 			bm.saveObject(bo);

From 1aaa82b02af9a74b3c4bc7a95508884d3d055fb4 Mon Sep 17 00:00:00 2001
From: user <user@Lenovo-y50>
Date: Sat, 7 Jul 2018 18:55:59 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=86=85=E9=83=A8=E6=84=8F=E8=A7=81=E5=92=8C=E7=BB=8F?=
 =?UTF-8?q?=E9=94=80=E5=95=86=E6=84=8F=E8=A7=81=E5=AD=97=E6=AE=B5=E5=85=A5?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessApplication/ApprovalForm.jsp      |  8 +-
 .../businessapply/BusinessApproveManager.java | 76 ++++++++++++++++++-
 2 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
index a2dcb0fe2..6be6f784f 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
@@ -313,8 +313,14 @@
 			phaseChoice = getItemValue(0,0,"fourchoice");
 			phaseOpinion = getItemValue(0,0,"fouropinion");
 		}
+		var InterOpinion1 = getItemValue(0,0,"InterOpinion1");
+		var DistriOpinion1 = getItemValue(0,0,"DistriOpinion1");
+		var InterOpinion2 = getItemValue(0,0,"InterOpinion2");
+		var DistriOpinion2 = getItemValue(0,0,"DistriOpinion2");
+		var InterOpinion3 = getItemValue(0,0,"InterOpinion3");
+		var DistriOpinion3 = getItemValue(0,0,"DistriOpinion3");
 		var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","saveApproveOpinion",
-				"serialNo=<%=taskno%>,phaseNo=<%=phaseNo%>,flowunid=<%=flowunid%>,phaseChoice="+phaseChoice+",phaseOpinion="+phaseOpinion+",userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>");
+				"serialNo=<%=taskno%>,phaseNo=<%=phaseNo%>,flowunid=<%=flowunid%>,phaseChoice="+phaseChoice+",phaseOpinion="+phaseOpinion+",InterOpinion1="+InterOpinion1+",DistriOpinion1="+DistriOpinion1+",InterOpinion2="+InterOpinion2+",DistriOpinion2="+DistriOpinion2+",InterOpinion3="+InterOpinion3+",DistriOpinion3="+DistriOpinion3+",userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>");
 		if("SUCCESS" == sResult){
 			resetDWDialog("����ɹ���",true);
 			reloadSelf();
diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
index 58aa004c2..4d342ea7d 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
@@ -21,7 +21,69 @@ public class BusinessApproveManager {
 	private String userid;
 	private String orgid;
 	private String plate_number;
+	private String InterOpinion1;
+	private String DistriOpinion1;
+	private String InterOpinion2;
+	private String DistriOpinion2;
+	private String InterOpinion3;
+	private String DistriOpinion3;
 	
+	public String getDistriOpinion1() {
+		return DistriOpinion1;
+	}
+
+	public void setDistriOpinion1(String distriOpinion1) {
+		DistriOpinion1 = distriOpinion1;
+	}
+
+	public String getInterOpinion2() {
+		return InterOpinion2;
+	}
+
+	public void setInterOpinion2(String interOpinion2) {
+		InterOpinion2 = interOpinion2;
+	}
+
+	public String getDistriOpinion2() {
+		return DistriOpinion2;
+	}
+
+	public void setDistriOpinion2(String distriOpinion2) {
+		DistriOpinion2 = distriOpinion2;
+	}
+
+	public String getInterOpinion3() {
+		return InterOpinion3;
+	}
+
+	public void setInterOpinion3(String interOpinion3) {
+		InterOpinion3 = interOpinion3;
+	}
+
+	public String getDistriOpinion3() {
+		return DistriOpinion3;
+	}
+
+	public void setDistriOpinion3(String distriOpinion3) {
+		DistriOpinion3 = distriOpinion3;
+	}
+
+	public String getPhaseNo() {
+		return phaseNo;
+	}
+
+	public void setPhaseNo(String phaseNo) {
+		this.phaseNo = phaseNo;
+	}
+
+	public String getInterOpinion1() {
+		return InterOpinion1;
+	}
+
+	public void setInterOpinion1(String interOpinion1) {
+		InterOpinion1 = interOpinion1;
+	}
+
 	public String getPlate_number() {
 		return plate_number;
 	}
@@ -92,15 +154,27 @@ public class BusinessApproveManager {
 				bomFT.createQuery("update O set relativeobjectno='"+serialNo+"' where serialno='"+serialNo+"'").executeUpdate();
 				bo.setAttributeValue("phaseopinion", phaseOpinion);
 				bo.setAttributeValue("phasechoice", phaseChoice);
+				bo.setAttributeValue("InterOpinion1", InterOpinion1);
+				bo.setAttributeValue("DistriOpinion1", DistriOpinion1);
+				bo.setAttributeValue("InterOpinion2", InterOpinion2);
+				bo.setAttributeValue("DistriOpinion2", DistriOpinion2);
+				bo.setAttributeValue("InterOpinion3", InterOpinion3);
+				bo.setAttributeValue("DistriOpinion3", DistriOpinion3);
 			}else{
 				bo = bomFO.newObject();
 				bo.setAttributeValue("serialno", serialNo);
 				bo.setAttributeValue("opinionno", UUIDUtil.getUUID());
 				bo.setAttributeValue("phaseopinion", phaseOpinion);
 				bo.setAttributeValue("phasechoice", phaseChoice);
+				bo.setAttributeValue("InterOpinion1", InterOpinion1);
+				bo.setAttributeValue("DistriOpinion1", DistriOpinion1);
+				bo.setAttributeValue("InterOpinion2", InterOpinion2);
+				bo.setAttributeValue("DistriOpinion2", DistriOpinion2);
+				bo.setAttributeValue("InterOpinion3", InterOpinion3);
+				bo.setAttributeValue("DistriOpinion3", DistriOpinion3);
 				bo.setAttributeValue("inputuser", userid);
 				bo.setAttributeValue("inputorg", orgid);
-				bo.setAttributeValue("inputtime", StringFunction.getToday());
+				bo.setAttributeValue("inputtime", StringFunction.getTodayNow());
 				bomFT.createQuery("update O set relativeobjectno='"+serialNo+"' where serialno='"+serialNo+"'").executeUpdate();
 			}
 			bomFO.saveObject(bo);

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

---
 WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 243 +++++++++++++----------
 1 file changed, 136 insertions(+), 107 deletions(-)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 603063f88..761b7a09d 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -578,40 +578,7 @@
 				</managerProperties>
 			</manager>
 		</class>
-		<class name="LB_GUARANTEE_UNIT_TEMP" label="项目基本信息担保单位信息临时表" keyAttributes="ID">
-			<attributes>
-				<attribute name="ID" label="标识" type="STRING" length="32"/>
-				<attribute name="FLOWUNID" label="流程编号" type="STRING" length="32"/>
-				<attribute name="IS_FLOW" label="是否在流程中" type="STRING" length="32"/>
-				<attribute name="STATUS" label="状态" type="STRING" length="32"/>
-				<attribute name="PROJECT_ID" label="项目编号" type="STRING" length="32"/>
-				<attribute name="CONTRACT_ID" label="合同编号" type="STRING" length="32"/>
-				<attribute name="ASSUROR" label="担保人" type="STRING" length="32"/>
-				<attribute name="ASSURE_METHOD" label="担保类型" type="STRING" length="32"/>
-				<attribute name="ASSURE_RELATION" label="关系" type="STRING" length="32"/>
-				<attribute name="ASSURE_PROPERTY" label="担保单位性质" type="STRING" length="100"/>
-				<attribute name="CGMNOTE" label="备注" type="STRING" length="2000"/>
-				<attribute name="DATA_STATE" label="数据状态" type="STRING" length="32"/>
-				<attribute name="MODIFY_REASON" label="修改原因分类" type="STRING" length="32"/>
-				<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"/>
-				
-				<attribute name="Marital_status" label="婚姻状态" type="STRING" length="32"/>
-				<attribute name="company_phone" label="公司电话" type="INT" length="11"/>
-				<attribute name="Major_monthly_income" label="主要月收入" type="DOUBLE" length="22" scale="2"/>
-				
-			</attributes> 
-			<manager>
-				<managerProperties>
-					<property name="table" value="LB_GUARANTEE_UNIT_TEMP" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager>
-		</class>
+		
 		<class name="LB_SUPPLIER_INFO_TEMP" label="供应商信息临时表" keyAttributes="ID"> 
 		 <attributes>  
  				<attribute name="ID" label="标识" type="STRING" length="32"/>
@@ -894,43 +861,7 @@
 				</managerProperties>
 			</manager>
 		</class>
-		<class name="LB_GUARANTEE_UNIT" label="担保单位正式表" keyAttributes="ID">
-			<attributes>
-				<attribute name="ID" label="标识" type="STRING" length="32"/>
-				<attribute name="FLOWUNID" label="流程编号" type="STRING" length="32"/>
-				<attribute name="IS_FLOW" label="是否在流程中" type="STRING" length="32"/>
-				<attribute name="STATUS" label="状态" type="STRING" length="32"/>
-				<attribute name="PROJECT_ID" label="项目编号" type="STRING" length="32"/>
-				<attribute name="CONTRACT_ID" label="合同编号" type="STRING" length="32"/>
-				<attribute name="ASSUROR" label="担保人" type="STRING" length="32"/>
-				<attribute name="ASSURE_METHOD" label="担保类型" type="STRING" length="32"/>
-				<attribute name="ASSURE_RELATION" label="关系" type="STRING" length="32"/>
-				<attribute name="ASSURE_PROPERTY" label="担保单位性质" type="STRING" length="100"/>
-				<attribute name="CGMNOTE" label="备注" type="STRING" length="2000"/>
-				<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"/>
-				<attribute name="DATA_STATE" label="数据状态" type="STRING" length="32"/>
-				<attribute name="MODIFY_REASON" label="修改原因分类" type="STRING" length="32"/>
-				
-				
-				<attribute name="Marital_status" label="婚姻状态" type="STRING" length="32"/>
-				<attribute name="company_phone" label="公司电话" type="INT" length="11"/>
-				<attribute name="Major_monthly_income" label="主要月收入" type="DOUBLE" length="22" scale="2"/>
-				<attribute name="IS_HIS" label="是否存过历史" type="STRING" length="10"  />
-				
-				
-			</attributes>
-			<manager>
-				<managerProperties>
-					<property name="table" value="LB_GUARANTEE_UNIT" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager> 
-		</class>
+		
 		<class name="LB_CANCLE_INFO" label="撤销信息" keyAttributes="ID">
 			<attributes>
 				<attribute name="ID" label="标识" type="STRING" length="32"/>
@@ -1989,42 +1920,7 @@
 				</managerProperties>
 			</manager>
 		</class>
-		<class name="LB_GUARANTEE_UNIT_HIS" label="担保单位历史表" keyAttributes="ID">
-			<attributes>
-				<attribute name="ID" label="标识" type="STRING" length="32"/>
-				<attribute name="FLOWUNID" label="流程编号" type="STRING" length="32"/>
-				<attribute name="IS_FLOW" label="是否在流程中" type="STRING" length="32"/>
-				<attribute name="STATUS" label="状态" type="STRING" length="32"/>
-				<attribute name="PROJECT_ID" label="项目编号" type="STRING" length="32"/>
-				<attribute name="CONTRACT_ID" label="合同编号" type="STRING" length="32"/>
-				<attribute name="ASSUROR" label="担保人" type="STRING" length="32"/>
-				<attribute name="ASSURE_METHOD" label="担保类型" type="STRING" length="32"/>
-				<attribute name="ASSURE_RELATION" label="关系" type="STRING" length="32"/>
-				<attribute name="ASSURE_PROPERTY" label="担保单位性质" type="STRING" length="100"/>
-				<attribute name="CGMNOTE" label="备注" type="STRING" length="2000"/>
-				<attribute name="DATA_STATE" label="数据状态" type="STRING" length="32"/>
-				<attribute name="MODIFY_REASON" label="修改原因分类" type="STRING" length="32"/>
-				<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"/>
-				
-				
-				<attribute name="Marital_status" label="婚姻状态" type="STRING" length="32"/>
-				<attribute name="company_phone" label="公司电话" type="INT" length="11"/>
-				<attribute name="Major_monthly_income" label="主要月收入" type="DOUBLE" length="22" scale="2"/>
-				
-				
-			</attributes>
-			<manager>
-				<managerProperties>
-					<property name="table" value="LB_GUARANTEE_UNIT_HIS" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager>
-		</class>
+		
 		<class name="LB_GUARANTY_HIS" label="抵押物历史表" keyAttributes="ID">
 			<attributes>
 				<attribute name="ID" label="标识" type="STRING" length="32"/>
@@ -3852,6 +3748,139 @@
 				</managerProperties>
 			</manager>
 		</class>
+		<class name="LB_GUARANTEE_UNIT" label="" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="标识" type="STRING" length="32"/>
+				<attribute name="FLOWUNID" label="流程编号" type="STRING" length="32"/>
+				<attribute name="IS_FLOW" label="是否在流程中" type="STRING" length="32"/>
+				<attribute name="STATUS" label="状态" type="STRING" length="32"/>
+				<attribute name="PROJECT_ID" label="项目编号" type="STRING" length="32"/>
+				<attribute name="CONTRACT_ID" label="合同编号" type="STRING" length="32"/>
+				<attribute name="ASSUROR" label="担保人" type="STRING" length="32"/>
+				<attribute name="ASSURE_METHOD" label="担保类型" type="STRING" length="32"/>
+				<attribute name="ASSURE_RELATION" label="关系" type="STRING" length="32"/>
+				<attribute name="ASSURE_PROPERTY" label="担保单位性质" type="STRING" length="100"/>
+				<attribute name="CGMNOTE" label="备注" type="STRING" length="2000"/>
+				<attribute name="DATA_STATE" label="数据状态" type="STRING" length="32"/>
+				<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"/>
+				<attribute name="MODIFY_REASON" label="修改原因" type="STRING" length="32"/>
+				<attribute name="Marital_status" label="婚姻状态" type="STRING" length="32"/>
+				<attribute name="company_phone" label="公司电话" type="INT" length="10"/>
+				<attribute name="Major_monthly_income" label="主要月收入金额" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="IS_HIS" label="是否存过历史" type="STRING" length="10"/>
+				<attribute name="FULLNAME" label="担保人姓名" type="STRING" length="32"/>
+				<attribute name="SEX" label="担保人性别" type="STRING" length="5"/>
+				<attribute name="CERTTYPE" label="证件类型" type="STRING" length="32"/>
+				<attribute name="CERTID" label="证件号码" type="STRING" length="32"/>
+				<attribute name="MOBILE" label="电话号码" type="STRING" length="20"/>
+				<attribute name="ADDRESS" label="居住地址" type="STRING" length="80"/>
+				<attribute name="PROPERTY_TYPE" label="是否有本地房产" type="STRING" length="5"/>
+				<attribute name="OTHER_INCOME" label="房屋价值" type="STRING" length="32"/>
+				<attribute name="WORKCORP" label="单位名称" type="STRING" length="32"/>
+				<attribute name="WORKTEL" label="单位电话" type="STRING" length="20"/>
+				<attribute name="TITLE" label="职位" type="STRING" length="32"/>
+				<attribute name="WORKADD" label="单位地址" type="STRING" length="80"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_guarantee_unit" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+		<class name="LB_GUARANTEE_UNIT_HIS" label="" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="标识" type="STRING" length="32"/>
+				<attribute name="FLOWUNID" label="流程编号" type="STRING" length="32"/>
+				<attribute name="IS_FLOW" label="是否在流程中" type="STRING" length="32"/>
+				<attribute name="STATUS" label="状态" type="STRING" length="32"/>
+				<attribute name="PROJECT_ID" label="项目编号" type="STRING" length="32"/>
+				<attribute name="CONTRACT_ID" label="合同编号" type="STRING" length="32"/>
+				<attribute name="ASSUROR" label="担保人" type="STRING" length="32"/>
+				<attribute name="ASSURE_METHOD" label="担保类型" type="STRING" length="32"/>
+				<attribute name="ASSURE_RELATION" label="关系" type="STRING" length="32"/>
+				<attribute name="ASSURE_PROPERTY" label="担保单位性质" type="STRING" length="100"/>
+				<attribute name="CGMNOTE" label="备注" type="STRING" length="2000"/>
+				<attribute name="DATA_STATE" label="数据状态" type="STRING" length="32"/>
+				<attribute name="MODIFY_REASON" label="修改原因分类" type="STRING" length="32"/>
+				<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"/>
+				<attribute name="Marital_status" label="婚姻状态" type="STRING" length="32"/>
+				<attribute name="company_phone" label="公司电话" type="INT" length="10"/>
+				<attribute name="Major_monthly_income" label="主要月收入金额" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="FULLNAME" label="担保人姓名" type="STRING" length="32"/>
+				<attribute name="SEX" label="担保人性别" type="STRING" length="5"/>
+				<attribute name="CERTTYPE" label="证件类型" type="STRING" length="32"/>
+				<attribute name="CERTID" label="证件号码" type="STRING" length="32"/>
+				<attribute name="MOBILE" label="电话号码" type="STRING" length="20"/>
+				<attribute name="ADDRESS" label="居住地址" type="STRING" length="80"/>
+				<attribute name="PROPERTY_TYPE" label="是否有本地房产" type="STRING" length="5"/>
+				<attribute name="OTHER_INCOME" label="房屋价值" type="STRING" length="32"/>
+				<attribute name="WORKCORP" label="单位名称" type="STRING" length="32"/>
+				<attribute name="WORKTEL" label="单位电话" type="STRING" length="20"/>
+				<attribute name="TITLE" label="职位" type="STRING" length="32"/>
+				<attribute name="WORKADD" label="单位地址" type="STRING" length="80"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_guarantee_unit_his" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+		<class name="LB_GUARANTEE_UNIT_TEMP" label="" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="标识" type="STRING" length="32"/>
+				<attribute name="FLOWUNID" label="流程编号" type="STRING" length="32"/>
+				<attribute name="IS_FLOW" label="是否在流程中" type="STRING" length="32"/>
+				<attribute name="STATUS" label="状态" type="STRING" length="32"/>
+				<attribute name="PROJECT_ID" label="项目编号" type="STRING" length="32"/>
+				<attribute name="CONTRACT_ID" label="合同编号" type="STRING" length="32"/>
+				<attribute name="ASSUROR" label="担保人" type="STRING" length="32"/>
+				<attribute name="ASSURE_METHOD" label="担保类型" type="STRING" length="32"/>
+				<attribute name="ASSURE_RELATION" label="关系" type="STRING" length="32"/>
+				<attribute name="ASSURE_PROPERTY" label="担保单位性质" type="STRING" length="100"/>
+				<attribute name="CGMNOTE" label="备注" type="STRING" length="2000"/>
+				<attribute name="DATA_STATE" label="数据状态" type="STRING" length="32"/>
+				<attribute name="MODIFY_REASON" label="修改原因分类" type="STRING" length="32"/>
+				<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"/>
+				<attribute name="Marital_status" label="婚姻状态" type="STRING" length="32"/>
+				<attribute name="company_phone" label="公司电话" type="INT" length="10"/>
+				<attribute name="Major_monthly_income" label="主要月收入金额" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="FULLNAME" label="担保人姓名" type="STRING" length="32"/>
+				<attribute name="SEX" label="担保人性别" type="STRING" length="5"/>
+				<attribute name="CERTTYPE" label="证件类型" type="STRING" length="32"/>
+				<attribute name="CERTID" label="证件号码" type="STRING" length="32"/>
+				<attribute name="MOBILE" label="电话号码" type="STRING" length="20"/>
+				<attribute name="ADDRESS" label="居住地址" type="STRING" length="80"/>
+				<attribute name="PROPERTY_TYPE" label="是否有本地房产" type="STRING" length="5"/>
+				<attribute name="OTHER_INCOME" label="房屋价值" type="STRING" length="32"/>
+				<attribute name="WORKCORP" label="单位名称" type="STRING" length="32"/>
+				<attribute name="WORKTEL" label="单位电话" type="STRING" length="20"/>
+				<attribute name="TITLE" label="职位" type="STRING" length="32"/>
+				<attribute name="WORKADD" label="单位地址" type="STRING" length="80"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_guarantee_unit_temp" />
+					<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">

From 7198d6c4cc28e5cd48c18ee993bd8fc526b70bf6 Mon Sep 17 00:00:00 2001
From: liuz <liuz@DESKTOP-BF9USEF>
Date: Sat, 7 Jul 2018 19:17:17 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E4=BF=9D?=
 =?UTF-8?q?=E8=AF=81=E9=87=91=E6=94=B6=E5=8F=96=E9=80=89=E6=8B=A9=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DealerDeposit/DMarginChargeInfo_Temp.jsp  | 139 +++++++++++-------
 1 file changed, 84 insertions(+), 55 deletions(-)

diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
index fd464ceff..b14fcfd9d 100644
--- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
+++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
@@ -1,55 +1,84 @@
-<%@ page contentType="text/html; charset=GBK"%>
-<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
-	/*
-        Author: undefined 2018-05-27
-        Content: ʾ������ҳ��
-        History Log: 
-    */
-	String sFlowUnid = CurPage.getParameter("FlowUnid");
-	String sPrevUrl = CurPage.getParameter("id");
-	String sTempletNo = "DMarginChargeInfo_Temp";//--ģ���--
-	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
-	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
-	dwTemp.Style = "2";//freeform
-	dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
-	String sButtons[][] = {
-		{"true","All","Button","����","���������޸�","save()","","","",""},
-		{"true","All","Button","����","�����б�","returnList()","","","",""}
-	};
-%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
-<script type="text/javascript">
-	var sFlowUnid = "<%=sFlowUnid%>";
-	setItemValue(0,0,"MONEY_TYPE","��֤���տ�");
-	var payer=getItemValue(0, 0, "PAYER");
-	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);//��ʼ�����̱��
-		setItemValue(0,getRow(),"DISTRIBUTOR_ID","<%=sPrevUrl%>");//��ʼ�����̱��
-		as_save("myiframe0","returnList()");
-	}
- 	function returnList(){
-		 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){
-	    	if(!sReturn||sReturn=="_CANCEL_"){
-				alert(getHtmlMessage('1'));//��ѡ��һ����Ϣ��
-				return;
-	    	}
-	    	sReturn = sReturn.split("@");//"@"��ʾ����ҳ����������ʱ��������
-	    	setItemValue(0,getRow(),"ACCOUNT_INFO",sReturn[0]);//��ҳ��Ŀ�����������
-	    	setItemValue(0,getRow(),"ACCOUNT",sReturn[1]);
-	    	setItemValue(0,getRow(),"DISTRIBUTOR_ACCOUNT_TEMP",sReturn[2]);
-			},"��ѡ������");
-	}
-</script>
-<%@ include file="/Frame/resources/include/include_end.jspf"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	/*
+        Author: undefined 2018-05-27
+        Content: ʾ������ҳ��
+        History Log: 
+    */
+	String sFlowUnid = CurPage.getParameter("FlowUnid");
+	String sPrevUrl = CurPage.getParameter("id");
+	String sTempletNo = "DMarginChargeInfo_Temp";//--ģ���--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
+	String sButtons[][] = {
+		{"true","All","Button","����","���������޸�","save()","","","",""},
+		{"true","All","Button","����","�����б�","returnList()","","","",""}
+	};
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+	var sFlowUnid = "<%=sFlowUnid%>";
+	setItemValue(0,0,"MONEY_TYPE","��֤���տ�");
+	var payer=getItemValue(0, 0, "PAYER");
+	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);//��ʼ�����̱��
+		setItemValue(0,getRow(),"DISTRIBUTOR_ID","<%=sPrevUrl%>");//��ʼ�����̱��
+		as_save("myiframe0","returnList()");
+	}
+ 	function returnList(){
+		 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){
+	    	if(!sReturn||sReturn=="_CANCEL_"){
+				alert(getHtmlMessage('1'));//��ѡ��һ����Ϣ��
+				return;
+	    	}
+	    	sReturn = sReturn.split("@");//"@"��ʾ����ҳ����������ʱ��������
+	    	setItemValue(0,getRow(),"ACCOUNT_INFO",sReturn[0]);//��ҳ��Ŀ�����������
+	    	setItemValue(0,getRow(),"ACCOUNT",sReturn[1]);
+	    	setItemValue(0,getRow(),"DISTRIBUTOR_ACCOUNT_TEMP",sReturn[2]);
+			},"��ѡ������");
+	}
+	
+	function selectensure(){
+		AsDialog.OpenSelector("Depositcollection","","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;
+	    	}
+	    	sReturn = sReturn.split("@");//"@"��ʾ����ҳ����������ʱ��������
+	    	setItemValue(0,getRow(),"LOCAL_ACCOUNT",sReturn[0]);//��ҳ��Ŀ�����������
+	    	setItemValue(0,getRow(),"LOCAL_BANK",sReturn[1]);
+			},"��ѡ������");
+	}
+	function initRow()
+	{
+		//���û���ҵ���Ӧ��¼��������һ���������������ֶ�Ĭ��ֵ
+		if (getRowCount(0)==0) 
+		{
+			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()%>");
+		}        
+	}
+</script>
+
+<script language=javascript>	
+	initRow(); //ҳ��װ��ʱ����DW��ǰ��¼���г�ʼ��
+</script>	
+<%@ include file="/Frame/resources/include/include_end.jspf"%>

From 1b27eda27f4d0dcbd42c70c782becac2097d1dc1 Mon Sep 17 00:00:00 2001
From: amarsoft <amarsoft@DESKTOP-3QRILR7>
Date: Sat, 7 Jul 2018 20:02:15 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E8=B5=84=E6=96=99=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src_core/com/tenwa/doc/action/DocListAction.java | 3 ++-
 src_core/com/tenwa/doc/cache/DocListCache.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src_core/com/tenwa/doc/action/DocListAction.java b/src_core/com/tenwa/doc/action/DocListAction.java
index cee57e85a..952039899 100644
--- a/src_core/com/tenwa/doc/action/DocListAction.java
+++ b/src_core/com/tenwa/doc/action/DocListAction.java
@@ -55,7 +55,8 @@ public class DocListAction {
 		 delDocFile("LB_DOCATTRIBUTE","id='"+this.attId+"'",Transaction.createTransaction(tx));
 		 BizObjectManager bm=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCATTRIBUTE", tx);
 		 String library_id=bm.createQuery("select library_id from O where id=:id").setParameter("id", this.attId).getSingleResult(false).getAttribute("library_id").getString();
-		 bm.createQuery("delete from O where id=:id").setParameter("id", attId).executeUpdate();
+		 //bm.createQuery("delete from O where id=:id").setParameter("id", attId).executeUpdate();
+		 bm.createQuery("update O set DELETEED='Y' where id=:id").setParameter("id", attId).executeUpdate();
 		 BizObjectManager bm1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
 		 bm1.createQuery("update O set BUSINESS_CHECK=:BussinessCheck where id=:id").setParameter("BussinessCheck", this.BussinessCheck).setParameter("id", library_id).executeUpdate();
 		 tx.commit();
diff --git a/src_core/com/tenwa/doc/cache/DocListCache.java b/src_core/com/tenwa/doc/cache/DocListCache.java
index 7eedbbc96..1bc04e909 100644
--- a/src_core/com/tenwa/doc/cache/DocListCache.java
+++ b/src_core/com/tenwa/doc/cache/DocListCache.java
@@ -12,7 +12,7 @@ public class DocListCache {
 	public static String getFile(String libraryid) throws Exception{
 		
 		@SuppressWarnings("unchecked")
-		List<BizObject> list=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCATTRIBUTE").createQuery("Library_Id=:libraryid").setParameter("libraryid", libraryid).getResultList(false);
+		List<BizObject> list=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCATTRIBUTE").createQuery("Library_Id=:libraryid and (DELETEED<>'Y' or DELETEED is null)").setParameter("libraryid", libraryid).getResultList(false);
 		
 		StringBuffer sb=new StringBuffer();
 		sb.append("{");

From 0f4479df46cb7778ff298929eb0ed76fa65dba0f Mon Sep 17 00:00:00 2001
From: zhulianghua <zhulh@tenwa.com.cn>
Date: Sun, 8 Jul 2018 15:28:09 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=97=B6=E5=BC=B9=E5=87=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=AF=B9=E8=AF=9D=E6=A1=86,=E5=B9=B6=E4=B8=BA?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=A2=9E=E5=8A=A0=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Frame/page/js/ow/as_dw_info.js     |   2 +-
 .../Frame/page/ow/RequiredRuleUpdator.jsp     |   3 +-
 .../amarsoft/app/util/ProductParamUtil.java   | 102 ++++++++----------
 .../als/prd/config/loader/ProductConfig.java  |  59 ++++++++++
 .../httpclient/resources/GPSConfigure.java    |  11 +-
 .../resources/QuartzPropertiesUtil.java       |   9 +-
 6 files changed, 123 insertions(+), 63 deletions(-)

diff --git a/WebContent/Frame/page/js/ow/as_dw_info.js b/WebContent/Frame/page/js/ow/as_dw_info.js
index 04081eb22..a4cea6e0b 100644
--- a/WebContent/Frame/page/js/ow/as_dw_info.js
+++ b/WebContent/Frame/page/js/ow/as_dw_info.js
@@ -413,7 +413,7 @@ function showItemRequired(dwname,sColName){
 		   data: "DataObject=" + $("#SERIALIZED_ASD").val()  + "&ColName="+ sColName + "&Required=1",
 		   success: function(msg){
 			   if(msg.substring(0,5)=="fail:"){
-					  alert('У�����ʧ��:' +msg.substring(5));
+					  //alert('У�����ʧ��:' +msg.substring(5)); 2018/07/08 by zhulh �Ҳ���У���ļ�ûɶ�ô�С�ֵ�
 					  return;
 				  }
 				  $("#SERIALIZED_ASD").val(msg);
diff --git a/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp b/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp
index f6c65f00e..19f55619f 100644
--- a/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp
+++ b/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp
@@ -25,7 +25,8 @@ try{
 	ObjectConverts.saveObject(new java.io.File(Component.getDWTmpPath(asObj.getSerializableName())), asObj);
 	out.print(sDataObject);
 }catch(Exception e){
-	e.printStackTrace();
+	//e.printStackTrace();2018/07/08 by zhulh �Ҳ���У���ļ�ûɶ�ô�С�ֵ�
+	ARE.getLog().error(e.getMessage());
 	out.print("fail:"+ e.toString());
 }
 %>
\ No newline at end of file
diff --git a/src/com/amarsoft/app/util/ProductParamUtil.java b/src/com/amarsoft/app/util/ProductParamUtil.java
index 00a974a95..8734deb96 100644
--- a/src/com/amarsoft/app/util/ProductParamUtil.java
+++ b/src/com/amarsoft/app/util/ProductParamUtil.java
@@ -22,7 +22,7 @@ import org.dom4j.io.XMLWriter;
 import jbo.prd.PRD_SPECIFIC_LIBRARY;
 import jbo.sys.LB_PRODUCT_INFO;
 
-import com.alibaba.fastjson.JSON;
+import com.amarsoft.app.als.prd.config.loader.ProductConfig;
 import com.amarsoft.app.base.businessobject.BusinessObject;
 import com.amarsoft.app.base.businessobject.BusinessObjectHelper;
 import com.amarsoft.app.base.util.XMLHelper;
@@ -253,9 +253,10 @@ public class ProductParamUtil {
 	public static List<Object> getProductDocInfo(String productId,String componentType) throws Exception{
 		List<Object> docInfo = new ArrayList<Object>();
 		String realXmlPath = getProductValueXmlBySql(productId);
-		BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PRODUCT_INFO.CLASS_NAME);
+		/*BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PRODUCT_INFO.CLASS_NAME);
 		BizObject boLPI =  bomLPI.createQuery("ID=:ID").setParameter("ID", realXmlPath).getSingleResult(true);
-		String pData = boLPI.getAttribute("PRODUCT_DATA").getString();
+		String pData = boLPI.getAttribute("PRODUCT_DATA").getString();*/
+		String pData = ProductConfig.getProductData(realXmlPath);
 		String type = componentType;
 		if("".equals(pData)){
 		}else{
@@ -392,7 +393,7 @@ public class ProductParamUtil {
 	 * @throws Exception
 	 * @author zhulh
 	 */
-	public static Map<String,List<Map<String,String>>> getProductComponentDecisionTable(String productId,String componentType,String paramName1,String paramName2) throws Exception{
+	public static Map<String,List<Map<String,String>>> getProductComponentDecisionTable(String productId,String componentType,String... paramNames) throws Exception{
 		Map<String,List<Map<String,String>>> productComponent = new HashMap<String,List<Map<String,String>>>();
 		String realXmlPath = getProductValueXmlBySql(productId);
 		//List<BusinessObject> componentList = XMLHelper.getBusinessObjectList(realXmlPath,"Component||Status='1'","ID");
@@ -406,24 +407,19 @@ public class ProductParamUtil {
 			List<Map<String,String>> parameValues = new ArrayList<Map<String,String>>();
 			for(BusinessObject boP:parameters){
 				Map<String,String> parameValue = new HashMap<String,String>();
-				String paramValue1 = "";
-				String paramValue2 = "";
-				if(boP.containsAttribute("OPTIONALVALUE_"+(paramName1.toUpperCase()))){
-					paramValue1 = boP.getString("OPTIONALVALUE_"+(paramName1.toUpperCase()));
-				}else if(boP.containsAttribute("VALUE_"+(paramName1.toUpperCase()))){
-					paramValue1 = boP.getString("VALUE_"+(paramName1.toUpperCase()));
-				}else if(boP.containsAttribute("MANDATORYVALUE_"+(paramName1.toUpperCase()))){
-					paramValue1 = boP.getString("MANDATORYVALUE_"+(paramName1.toUpperCase()));
+				String paramValue = "";
+				for(String paramName : paramNames) {
+					if(boP.containsAttribute("OPTIONALVALUE_"+(paramName.toUpperCase()))){
+						paramValue = boP.getString("OPTIONALVALUE_"+(paramName.toUpperCase()));
+					}else if(boP.containsAttribute("VALUE_"+(paramName.toUpperCase()))){
+						paramValue = boP.getString("VALUE_"+(paramName.toUpperCase()));
+					}else if(boP.containsAttribute("MANDATORYVALUE_"+(paramName.toUpperCase()))){
+						paramValue = boP.getString("MANDATORYVALUE_"+(paramName.toUpperCase()));
+					} else {
+						paramValue = boP.getString(paramName.toUpperCase());
+					}
+					parameValue.put(paramName, paramValue);
 				}
-				if(boP.containsAttribute("OPTIONALVALUE_"+(paramName2.toUpperCase()))){
-					paramValue2 = boP.getString("OPTIONALVALUE_"+(paramName2.toUpperCase()));
-				}else if(boP.containsAttribute("VALUE_"+(paramName2.toUpperCase()))){
-					paramValue2 = boP.getString("VALUE_"+(paramName2.toUpperCase()));
-				}else if(boP.containsAttribute("MANDATORYVALUE_"+(paramName2.toUpperCase()))){
-					paramValue2 = boP.getString("MANDATORYVALUE_"+(paramName2.toUpperCase()));
-				}
-				parameValue.put(paramName1, paramValue1);
-				parameValue.put(paramName2, paramValue2);
 				parameValues.add(parameValue);
 			}
 			productComponent.put(bo.getString("ID"), parameValues);
@@ -464,9 +460,10 @@ public class ProductParamUtil {
 		}*/
 		String parameterValue = "";
 		String realXmlPath = getProductValueXmlBySql(productId);
-		BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PRODUCT_INFO.CLASS_NAME);
+		/*BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PRODUCT_INFO.CLASS_NAME);
 		BizObject boLPI =  bomLPI.createQuery("ID=:ID").setParameter("ID", realXmlPath).getSingleResult(true);
-		String pData = boLPI.getAttribute("PRODUCT_DATA").getString();
+		String pData = boLPI.getAttribute("PRODUCT_DATA").getString();*/
+		String pData = ProductConfig.getProductData(realXmlPath);
 		String type = componentType;
 		if("".equals(pData)){
 		}else{
@@ -508,30 +505,28 @@ public class ProductParamUtil {
 		List<BusinessObject> exists = getBusinessObject(realXmlPath, "PRD0201");
 		String result="";
 		for(BusinessObject bo:exists){
-			List<Map> list = com.alibaba.fastjson.JSONArray.parseArray(bo.getObject("DecisionTable").toString(), Map.class);
+			List<BusinessObject> parameters = bo.getBusinessObjects("DecisionTable");
 			if("ExpenseType".equals(bo.getString("ID"))){
 				continue;
 			}
-			for (Map map : list) {
-				String key = map.get("jbo.sample.DecisionTable").toString();
-				Map mapValue = (Map)JSON.parse(key); 
+			for(BusinessObject boP:parameters){
 				String maxDays = "";
 				String minDays = "";
-				if(mapValue.containsKey("MINIMUMVALUE_"+(paramName1.toUpperCase()))){
-					minDays = mapValue.get("MINIMUMVALUE_"+(paramName1.toUpperCase())).toString();
-				}else if(mapValue.containsKey("MINIMUMVALUE_"+(paramName2.toUpperCase()))){
-					minDays = mapValue.get("MINIMUMVALUE_"+(paramName2.toUpperCase())).toString();
+				if(boP.containsAttribute("MINIMUMVALUE_"+(paramName1.toUpperCase()))){
+					minDays = boP.getString("MINIMUMVALUE_"+(paramName1.toUpperCase()));
+				}else if(boP.containsAttribute("MINIMUMVALUE_"+(paramName2.toUpperCase()))){
+					minDays = boP.getString("MINIMUMVALUE_"+(paramName2.toUpperCase()));
 				}
-				if(mapValue.containsKey("MAXIMUMVALUE_"+(paramName1.toUpperCase()))){
-					maxDays = mapValue.get("MAXIMUMVALUE_"+(paramName1.toUpperCase())).toString();
-				}else if(mapValue.containsKey("MAXIMUMVALUE_"+(paramName2.toUpperCase()))){
-					maxDays = mapValue.get("MAXIMUMVALUE_"+(paramName2.toUpperCase())).toString();
+				if(boP.containsAttribute("MAXIMUMVALUE_"+(paramName1.toUpperCase()))){
+					maxDays = boP.getString("MAXIMUMVALUE_"+(paramName1.toUpperCase()));
+				}else if(boP.containsAttribute("MAXIMUMVALUE_"+(paramName2.toUpperCase()))){
+					maxDays = boP.getString("MAXIMUMVALUE_"+(paramName2.toUpperCase()));
 				}
 				if(Integer.parseInt(minDays)<=Integer.parseInt(overDays)&& Integer.parseInt(maxDays)>=Integer.parseInt(overDays)){
-					if(mapValue.containsKey("VALUE_"+(paramName1.toUpperCase()))){
-						result = mapValue.get("VALUE_"+(paramName1.toUpperCase())).toString();
-					}else if(mapValue.containsKey("VALUE_"+(paramName2.toUpperCase()))){
-						result = mapValue.get("VALUE_"+(paramName2.toUpperCase())).toString();
+					if(boP.containsAttribute("VALUE_"+(paramName1.toUpperCase()))){
+						result = boP.getString("VALUE_"+(paramName1.toUpperCase()));
+					}else if(boP.containsAttribute("VALUE_"+(paramName2.toUpperCase()))){
+						result = boP.getString("VALUE_"+(paramName2.toUpperCase()));
 					}
 					return result;
 				}
@@ -547,20 +542,20 @@ public class ProductParamUtil {
 	 * @author zhulh
 	 */
 	public static String getProductValueXmlBySql(String productId) throws JBOException{
-		BizObject bo = JBOFactory.getBizObjectManager(PRD_SPECIFIC_LIBRARY.CLASS_NAME).createQuery("productid=:ProductId").setParameter("ProductId", productId).getSingleResult(false);
+		/*BizObject bo = JBOFactory.getBizObjectManager(PRD_SPECIFIC_LIBRARY.CLASS_NAME).createQuery("productid=:ProductId").setParameter("ProductId", productId).getSingleResult(false);
 		String realXmlPath = "";
 		if(bo != null){
 			//String path = ProductParamUtil.class.getResource("/").toString();
 			String configfile = bo.getAttribute("configfile").toString();
-			/*if(path.startsWith("file:/home")){
+			if(path.startsWith("file:/home")){
 				path = path.substring(5, path.length()-9);
 			}else{
 				path = path.substring(6, path.length()-9);
-			}*/
+			}
 			//realXmlPath = path+configfile.substring(configfile.indexOf("/"));
 			realXmlPath = configfile;
-		}
-		return realXmlPath;
+		}*/
+		return productId;
 	}
 	
 	public static String getProductValueXml(String productId) throws JBOException{
@@ -581,12 +576,11 @@ public class ProductParamUtil {
 	
 	public static List<BusinessObject> getBusinessObject(String realXmlPath,String componentType) throws Exception{
 		List<BusinessObject> exists = new ArrayList<BusinessObject>();
-		BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PRODUCT_INFO.CLASS_NAME);
-		BizObject boLPI =  bomLPI.createQuery("ID=:ID").setParameter("ID", realXmlPath).getSingleResult(true);
-		if (boLPI == null) {
-			return exists;
-		}
-		String pData = boLPI.getAttribute("PRODUCT_DATA").getString();
+		//BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PRODUCT_INFO.CLASS_NAME);
+		//BizObject boLPI =  bomLPI.createQuery("ID=:ID").setParameter("ID", realXmlPath).getSingleResult(true);
+		//String pData = boLPI.getAttribute("PRODUCT_DATA").getString();
+		//�л���ȡ����
+		String pData = ProductConfig.getProductData(realXmlPath);
 		String type = componentType;
 		if("".equals(pData)){
 		}else{
@@ -607,9 +601,6 @@ public class ProductParamUtil {
 						Map<String,Object> valMap = new HashMap<String,Object>();
 						Set<Entry> vSet = value.entrySet();
 						for(Entry v:vSet){
-							if (v.getKey().toString().equals("DecisionTable")) {
-								System.out.println(v.getKey().toString());
-							}
 							valMap.put(v.getKey().toString(), v.getValue());
 						}
 						bos[i] = BusinessObject.createBusinessObject("jbo.sample.Parameter",valMap);
@@ -624,9 +615,10 @@ public class ProductParamUtil {
 	
 	public static List<BusinessObject> getBusinessObjectWithDecisionTable(String realXmlPath,String componentType) throws Exception{
 		List<BusinessObject> exists = new ArrayList<BusinessObject>();
-		BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PRODUCT_INFO.CLASS_NAME);
+		/*BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PRODUCT_INFO.CLASS_NAME);
 		BizObject boLPI =  bomLPI.createQuery("ID=:ID").setParameter("ID", realXmlPath).getSingleResult(true);
-		String pData = boLPI.getAttribute("PRODUCT_DATA").getString();
+		String pData = boLPI.getAttribute("PRODUCT_DATA").getString();*/
+		String pData = ProductConfig.getProductData(realXmlPath);
 		String type = componentType;
 		if("".equals(pData)){
 		}else{
diff --git a/src_prd/com/amarsoft/app/als/prd/config/loader/ProductConfig.java b/src_prd/com/amarsoft/app/als/prd/config/loader/ProductConfig.java
index 3c34ecb3c..2e0e49230 100644
--- a/src_prd/com/amarsoft/app/als/prd/config/loader/ProductConfig.java
+++ b/src_prd/com/amarsoft/app/als/prd/config/loader/ProductConfig.java
@@ -2,6 +2,8 @@ package com.amarsoft.app.als.prd.config.loader;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import jbo.prd.BUSINESS_TYPE;
 import jbo.prd.PRD_SPECIFIC_LIBRARY;
@@ -13,23 +15,80 @@ import com.amarsoft.app.base.config.impl.BusinessComponentConfig;
 import com.amarsoft.app.base.exception.ALSException;
 import com.amarsoft.app.base.util.DateHelper;
 import com.amarsoft.app.base.util.XMLHelper;
+import com.amarsoft.are.ARE;
 import com.amarsoft.are.lang.StringX;
+import com.amarsoft.awe.util.ASResultSet;
+import com.amarsoft.awe.util.SqlObject;
 import com.amarsoft.awe.util.Transaction;
 import com.amarsoft.dict.als.cache.AbstractCache;
+//import com.tenwa.httpclient.resources.BigDataPropertiesUtil;
+import com.tenwa.httpclient.resources.GPSConfigure;
+import com.tenwa.httpclient.resources.QuartzPropertiesUtil;
 
 public class ProductConfig extends AbstractCache{
 
 	private static BusinessObjectCache productCache = null;
+	private static Map<String, String> productInfos;
+	private static Map<String, String> holidays;
     
 	public void clear() throws Exception {
 		productCache.clear();
+		productInfos.clear();
+		holidays.clear();
 	}
 	
 	public synchronized boolean load(Transaction transaction) throws Exception {
+		//�����Ʒ
+		ARE.getLog().info("[CACHE] ProductInfo bulid Begin .................");
+		cacheProduct(transaction);
+		ARE.getLog().info("[CACHE] ProductInfo bulid End ...................");
+		ARE.getLog().info("[CACHE] Holiday bulid Begin .................");
+		cacheHoliday(transaction);
+		ARE.getLog().info("[CACHE] Holiday bulid End ...................");
+		/*ARE.getLog().info("[CACHE] BigDataParams bulid Begin .................");
+		BigDataPropertiesUtil.destroy();
+		BigDataPropertiesUtil.load();
+		ARE.getLog().info("[CACHE] BigDataParams bulid End ...................");*/
+		ARE.getLog().info("[CACHE] GPSParams bulid Begin .................");
+		GPSConfigure.destroy();
+		GPSConfigure.load();
+		ARE.getLog().info("[CACHE] GPSParams bulid End ...................");
+		ARE.getLog().info("[CACHE] GPSParams bulid Begin .................");
+		QuartzPropertiesUtil.destroy();
+		QuartzPropertiesUtil.load();
+		ARE.getLog().info("[CACHE] GPSParams bulid End ...................");
 		productCache=new BusinessObjectCache(500);
 		return true;
 	}
 	
+	private synchronized void cacheHoliday(Transaction transaction) throws Exception{
+		holidays = new ConcurrentHashMap<String, String>();
+		ASResultSet rs = null;
+		rs = transaction.getASResultSet(new SqlObject("select c_date, otype from bt_holiday"));
+		while(rs.next()) {
+			holidays.put(rs.getString("c_date"), rs.getString("otype"));
+		}
+		rs.close();
+	}
+	
+	private synchronized void cacheProduct(Transaction transaction) throws Exception{
+		productInfos = new ConcurrentHashMap<String, String>();
+		ASResultSet rs = null;
+		rs = transaction.getASResultSet(new SqlObject("select lpi.product_id,lpi.product_data,bt.typename from lb_product_info lpi left join business_type bt on lpi.product_id = bt.typeno"));
+		while(rs.next()) {
+			productInfos.put(rs.getString("product_id"), rs.getString("product_data"));
+		}
+		rs.close();
+	}
+	
+	public synchronized static String getProductData(String specificSerialNo) {
+		return productInfos.get(specificSerialNo);
+	}
+	
+	public synchronized static String getHoliday(String cdate) {
+		return holidays.get(cdate);
+	}
+	
 	/**
 	 * ��ȡ��Ʒ����
 	 * @param productID
diff --git a/src_tenwa/com/tenwa/httpclient/resources/GPSConfigure.java b/src_tenwa/com/tenwa/httpclient/resources/GPSConfigure.java
index f1e15ce1e..92d039556 100644
--- a/src_tenwa/com/tenwa/httpclient/resources/GPSConfigure.java
+++ b/src_tenwa/com/tenwa/httpclient/resources/GPSConfigure.java
@@ -7,13 +7,11 @@ import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.amarsoft.are.ARE;
-import com.tenwa.httpclient.ResultMessage;
-
 
 public class GPSConfigure {
-	private static final Map<String, String> attributes;
+	private static Map<String, String> attributes;
 	
-	static{
+	public static void load() {
 		attributes = new ConcurrentHashMap<String, String>();
 		Properties prop = new Properties();
 		try {
@@ -31,7 +29,12 @@ public class GPSConfigure {
 		ARE.getLog().info("init GPSConfigure info success");
 	}
 	
+	public static void destroy() {
+		if(attributes != null) attributes.clear();
+	}
+	
 	public static String get(String propName) {
+		if(attributes == null) load();
 		return attributes.get(propName);
 	}
 }
diff --git a/src_tenwa/com/tenwa/httpclient/resources/QuartzPropertiesUtil.java b/src_tenwa/com/tenwa/httpclient/resources/QuartzPropertiesUtil.java
index d42668de3..653ae28a6 100644
--- a/src_tenwa/com/tenwa/httpclient/resources/QuartzPropertiesUtil.java
+++ b/src_tenwa/com/tenwa/httpclient/resources/QuartzPropertiesUtil.java
@@ -9,9 +9,9 @@ import java.util.concurrent.ConcurrentHashMap;
 import com.amarsoft.are.ARE;
 
 public class QuartzPropertiesUtil {
-	private static final Map<String, String> attributes;
+	private static Map<String, String> attributes;
 	
-	static{
+	public static void load() {
 		attributes = new ConcurrentHashMap<String, String>();
 		Properties prop = new Properties();
 		try {
@@ -29,7 +29,12 @@ public class QuartzPropertiesUtil {
 		ARE.getLog().info("init QuartzPropertiesUtil info success");
 	}
 	
+	public static void destroy() {
+		if(attributes != null) attributes.clear();
+	}
+	
 	public static String get(String propName) {
+		if(attributes == null) load();
 		return attributes.get(propName);
 	}
 }

From 1ad56808d5cf1b39103c61cc31f8a08b21aff266 Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Sun, 8 Jul 2018 20:45:48 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=8F=E9=94=80?=
 =?UTF-8?q?=E5=95=86=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2=E5=92=8C=E6=8B=85?=
 =?UTF-8?q?=E4=BF=9D=E4=BA=BA=E4=BF=9D=E5=AD=98=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LmDistributorToproductList.jsp            | 19 ++++++++++++++++---
 .../LBGuaranteePerUnitInfo.jsp                | 10 +++++-----
 .../CustomerFamilyJoinTempInfo.jsp            |  2 ++
 .../apzl/saveunioncar/saveUnionCarUtil.java   | 16 ++++++++++------
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp
index 21de64ee4..8aad8aaec 100644
--- a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp
+++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp
@@ -27,7 +27,16 @@
 				//alert(getHtmlMessage('1'));//��ѡ��һ����Ϣ��
 	    			return;
 		  	   }
-			    Return =Return+sReturn;
+				var arr = sReturn.split("@~");
+				//����һ���µ�����
+				var sReturns = "";
+				//��������
+				for(var i = 0;i<arr.length-1;i++){
+				    if(sReturns.indexOf(arr[i]) == -1){  //�ж���s�������Ƿ���ڣ���������push��s������
+				    	sReturns=sReturns+arr[i]+"@~";
+				    }
+				}
+			    Return =Return+sReturns;
  				sParams = "CarBrandId="+Return;
  				/*
 					CarBrandId=admin@~
@@ -36,9 +45,13 @@
 					7c7624a558594bff8387ca6949982b21@~
 					00303ba448074b0792bd465dd2359b7c@
  				*/
+ 				debugger;
  				var sReturnInfo = RunJavaMethodTrans("com.tenwa.apzl.saveunioncar.saveUnionCarUtil","saveLmDistributorToProduct",sParams);
- 				if(sReturnInfo!="error"){
- 					alert("�þ������Ѱ󶨣�");
+ 				if(""!=sReturnInfo){
+ 					AsDebug.showMessage("��ʾ",sReturnInfo,"","",true,'','','',function(){
+ 					});
+ 				}else{
+ 					alert("�󶨳ɹ�������");
  				}
  				reloadSelf();
 		},"��ѡ������");
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp
index ae6645fc8..2fd0e58fd 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp
@@ -20,10 +20,10 @@
 
 	String sTempletNo = "GuarantorInfo";//--ģ���--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
-	doTemp.setDefaultValue("ASSUROR", customerid);
-	doTemp.setDefaultValue("PROJECT_ID", ProjectId);
-	doTemp.setDefaultValue("FLOWUNID", sFlowUnid);
-	doTemp.setDefaultValue("DATA_STATE", "guarantee");//��Ǹ������ǵ�������Ϣ
+// 	doTemp.setDefaultValue("ASSUROR", customerid);
+	doTemp.setDefaultValue("project_id", ProjectId);
+	doTemp.setDefaultValue("flowunid", sFlowUnid);
+// 	doTemp.setDefaultValue("DATA_STATE", "guarantee");//��Ǹ������ǵ�������Ϣ
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
 	//dwTemp.ReadOnly = "-2";//ֻ��ģʽ
@@ -113,7 +113,7 @@
 	function goBack(){ 
 		//Ҫ��ת��url
 		var url="/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitList.jsp";
-		var sparam="FlowUnid="+getItemValue(0,0,"FLOWUNID")+"&RightType="+'<%=RightType%>';
+		var sparam="FlowUnid="+getItemValue(0,0,"FLOWUNID")+"&ProjectId="+getItemValue(0,0,"project_id")+"&RightType="+'<%=RightType%>';
 		AsControl.OpenView(url,sparam,"_self","");
 	}
 
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp
index 4bce4ca9b..2a55c85ff 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp
@@ -7,11 +7,13 @@
         History Log: 
     */
 	String sPrevUrl = CurPage.getParameter("PrevUrl");
+	String ProjectId = CurPage.getParameter("ProjectId");
 	if(sPrevUrl == null) sPrevUrl = "";
 
 	String sTempletNo = "CustomerFamilyJoinTempInfo";//--ģ���--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	doTemp.setColTips("", "");
+	doTemp.setDefaultValue("project_id", ProjectId);
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
 	//dwTemp.ReadOnly = "-2";//ֻ��ģʽ
diff --git a/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java b/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java
index 630629ae6..c947c3028 100644
--- a/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java
+++ b/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java
@@ -3,6 +3,7 @@ package com.tenwa.apzl.saveunioncar;
 import java.util.List;
 import java.util.UUID;
 
+import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
 import jbo.app.tenwa.customer.LM_DISTRIBUTOR_TO_CAR;
 import jbo.app.tenwa.customer.LM_DISTRIBUTOR_TO_PRODUCT;
 import jbo.app.tenwa.customer.LM_PORTAL_TO_CAR;
@@ -136,7 +137,7 @@ public String getCarBrandId() {
 		String updateOrgId = params[1];
 		String updateTime = params[2];
 		String typeno = params[3];
-		//String productid=params[4];
+		String Message="";
 		int lle=0;
 		int i;
 	    try{
@@ -146,7 +147,10 @@ public String getCarBrandId() {
 				BizObject obcheck=Lmcheck.createQuery("DISTRIBUTOR_ID=:DISTRIBUTOR_ID and PRODUCT_ID=:PRODUCT_ID")
 						.setParameter("DISTRIBUTOR_ID", brandid).setParameter("PRODUCT_ID",typeno).getSingleResult(false);
 				if(obcheck!=null){
-					return "success";
+					BizObjectManager diManager = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME,tx);
+					BizObject di = diManager.createQuery("select distributor_name from O where O.id=:id").setParameter("id", brandid).getSingleResult(true);
+					Message = Message+di.getAttribute("distributor_name").getString()+":�þ������Ѱ󶨡�<br>";
+					continue;
 				}
 				String PortalToCarId=UUID.randomUUID().toString().replaceAll("-", "");
 				BizObjectManager Lmpc =  JBOFactory.getBizObjectManager(LM_DISTRIBUTOR_TO_PRODUCT.CLASS_NAME,tx);
@@ -166,10 +170,10 @@ public String getCarBrandId() {
 			e.printStackTrace();
 			tx.rollback();
 		}
-		if(lle>0){
-			return "success";
-		}
-		return "error";
+//		if(lle>0){
+//			return "success";
+//		}
+		return Message;
 	}
 	public String saveLmDistributorToDistrict(JBOTransaction tx)throws Exception {
 		/*