From 9402e3bfee54aded37e67cc530e9ad52689b7f02 Mon Sep 17 00:00:00 2001
From: tangft <32189@DESKTOP-M6TAG3K>
Date: Mon, 26 Nov 2018 15:36:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E6=89=BF=E7=A7=9F=E4=BA=BA=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Comm/LBContractTemplate/contract_template.jsp  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
index dc4fbc68c..da96a1669 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp
@@ -3,6 +3,7 @@
 <%@page import="jbo.app.tenwa.customer.CUSTOMER_COMPANY_TEMP"%>
 <%@page import="jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP"%>
 <%@page import="jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP"%>
+<%@page import="jbo.app.tenwa.customer.CUSTOMER_ADDRESS_TEMP"%>
 <%@page import="com.amarsoft.app.check.CheckFLowPhaseNo"%>
 <%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
 	/*
@@ -59,11 +60,20 @@
 		NetMortgagor=cct.getAttribute("company_name").getString();
 	}else{
 		BizObjectManager cptm = JBOFactory.getBizObjectManager(CUSTOMER_PERSON_TEMP.CLASS_NAME);
-		String sSql = "select o.certid,o.mobile,o.nativeplace,o.fullname FROM o where o.customerid =:customerid and o.flowunid=:flowunid";
+		BizObjectManager catm = JBOFactory.getBizObjectManager(CUSTOMER_ADDRESS_TEMP.CLASS_NAME);
+		String sSql = "select o.certid,o.mobile,o.nativeplace,o.MAILING_ADDRESS,o.fullname,o.WORKADD FROM o where o.customerid =:customerid and o.flowunid=:flowunid";
+		String catSql = "select o.FULLADDRESS FROM o where o.customerid =:customerid and o.flowunid=:flowunid";
 		BizObject cpt = cptm.createQuery(sSql).setParameter("customerid", customerid).setParameter("flowunid", flowunid).getSingleResult(false);
+		BizObject cat = catm.createQuery(catSql).setParameter("customerid", customerid).setParameter("flowunid", flowunid).getSingleResult(false);
 		certid=cpt.getAttribute("certid").getString();
 		mobile=cpt.getAttribute("mobile").getString();
-		address=cpt.getAttribute("nativeplace").getString();
+		if("居住地址".equals(cpt.getAttribute("MAILING_ADDRESS").getString())){
+			address=cat.getAttribute("FULLADDRESS").getString();
+		}else if("户籍地址".equals(cpt.getAttribute("MAILING_ADDRESS").getString())){
+			address=cpt.getAttribute("nativeplace").getString();
+		}else if("单位地址".equals(cpt.getAttribute("MAILING_ADDRESS").getString())){
+			address=cpt.getAttribute("WORKADD").getString();
+		}
 		NetMortgagor=cpt.getAttribute("fullname").getString();
 	}
 	//给网约车模板