From 8ec4158ba32c02f2980e1a3430a3e177e3cd0536 Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei@baicgroup.com.cn>
Date: Wed, 30 Aug 2023 18:29:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=8F=B0=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5-=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomerFamilyTempInfo.jsp                | 150 +++++++--
 .../BusinessApplication/CustomerInfo.jsp      |  30 +-
 .../businessapply/CustomerInfoManage.java     | 286 +++++++++++++++++-
 3 files changed, 433 insertions(+), 33 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp
index 28a05c80f..eb6fef26c 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp
@@ -12,6 +12,10 @@
 	String IsHistory = CurPage.getParameter("IsHistory");
 	String customerid = Sqlca.getString("select customer_id from lb_union_lessee_temp where flowunid='"+flowunid+"'");
 	String marriage = Sqlca.getString("select MARRIAGE from CUSTOMER_PERSON_TEMP where flowunid='"+flowunid+"'");
+	String childrensNumber = Sqlca.getString("select CHILDRENS_NUMBER from CUSTOMER_PERSON_TEMP where flowunid='"+flowunid+"'");
+	System.out.println("flowunid=" + flowunid);
+	System.out.println("marriage=" + marriage);
+	System.out.println("childrensNumber=" + childrensNumber);
 	if(sPrevUrl == null) sPrevUrl = "";
 
 	String sTempletNo = "CustomerFamilyTempInfo";//--模板号--
@@ -32,11 +36,11 @@
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	$(function(){
-		$("#ID_ADDRESS").css("width",$("#ID_ADDRESS").parent().parent().parent().parent()[0].clientWidth/2+200+"px");
+		$("#ID_ADDRESS").css("width",$("#ID_ADDRESS").parent().parent().parent().parent()[0].clientWidth/2+200+"px");//户籍地址
 		$("#ID_ADDRESS").attr("ReadOnly","true");
-		$("#WORKUNIT").css("width",$("#WORKUNIT").parent().parent().parent().parent()[0].clientWidth/2+200+"px");
+		$("#WORKUNIT").css("width",$("#WORKUNIT").parent().parent().parent().parent()[0].clientWidth/2+200+"px");//居住地址
 		$("#WORKUNIT").attr("ReadOnly","true");
-		$("#WORK_ADDRESS").css("width",$("#WORK_ADDRESS").parent().parent().parent().parent()[0].clientWidth/2+200+"px");
+		$("#WORK_ADDRESS").css("width",$("#WORK_ADDRESS").parent().parent().parent().parent()[0].clientWidth/2+200+"px");//单位地址
 		$("#WORK_ADDRESS").attr("ReadOnly","true");
 		if("<%=marriage%>"=="01"){//已婚时,设置必填，显示配偶页面
 			changeFamilyRequiredTrue(<%=marriage%>);
@@ -68,6 +72,14 @@
 			$("#IDEXPIRY_TYPE_0").prop("checked", "checked");
 		}
 		changeIdexpiryType();
+
+		//页面初始化的时候，判断证件有效期类型，默认为短期
+		var partner_ = getItemValue(0,0,"PARTNER_");
+		if(partner_==""){
+			setItemValue(0,0,"Partner_","N");
+		}
+		changePartner();
+
 	});
 
 
@@ -105,9 +117,10 @@
 						return;
 					}
 					if(result !== ""){
-						setItemValue(0,0,"work_address_id",result.split("@")[0]);
-						setItemValue(0,0,"work_address_code",result.split("@")[1]);
-						setItemValue(0,0,"work_address",result.split("@")[2]);
+						alert("单位地址：" + result);
+						setItemValue(0,0,"WORK_ADDRESS_ID",result.split("@")[0]);
+						setItemValue(0,0,"WORK_ADDRESS_CODE",result.split("@")[1]);
+						setItemValue(0,0,"WORK_ADDRESS",result.split("@")[2]);
 					}
 				},
 				(!workAddressId?"新增":"修改")+"单位地址");
@@ -123,9 +136,10 @@
 						return;
 					}
 					if(result !== ""){
-						setItemValue(0,0,"id_address_id",result.split("@")[0]);
-						setItemValue(0,0,"id_address_code",result.split("@")[1]);
-						setItemValue(0,0,"id_address",result.split("@")[2]);
+						alert("户籍地址：" + result);
+						setItemValue(0,0,"ID_ADDRESS_ID",result.split("@")[0]);
+						setItemValue(0,0,"ID_ADDRESS_CODE",result.split("@")[1]);
+						setItemValue(0,0,"ID_ADDRESS",result.split("@")[2]);
 					}
 				},
 				(!workAddressId?"新增":"修改")+"户籍地址");
@@ -141,9 +155,10 @@
 						return;
 					}
 					if(result !== ""){
-						setItemValue(0,0,"live_address_id",result.split("@")[0]);
-						setItemValue(0,0,"live_address_code",result.split("@")[1]);
-						setItemValue(0,0,"workunit",result.split("@")[2]);
+						alert("居住地址：" + result);
+						setItemValue(0,0,"LIVE_ADDRESS_ID",result.split("@")[0]);
+						setItemValue(0,0,"LIVE_ADDRESS_CODE",result.split("@")[1]);
+						setItemValue(0,0,"WORKUNIT",result.split("@")[2]);
 					}
 				},
 				(!workAddressId?"新增":"修改")+"居住地址");
@@ -230,8 +245,10 @@
 		}
 	}
 	
-	function changeFamilyRequiredTrue(marriage){//设置配偶信息必填
+	function changeFamilyRequiredTrue(marriage, childrensNumber){//设置配偶信息必填
 		setItemValue(0,0,"status",marriage);//把父页面婚姻状况存入状态字段
+		setItemValue(0,0,"MARRY_TYPE",marriage);
+		setItemValue(0,0,"CHILDRENS_NUMBER",childrensNumber);
 		setItemRequired(0,"name",true);
 		setItemRequired(0,"certid",true);
 		setItemRequired(0,"tel",true);
@@ -244,8 +261,10 @@
 		setItemRequired(0,"workunit",true);
 		setItemRequired(0,"SEX",true);
 	}
-	function changeFamilyRequiredFalse(marriage){//设置配偶信息不必填
+	function changeFamilyRequiredFalse(marriage, childrensNumber){//设置配偶信息必填
 		setItemValue(0,0,"status",marriage);//把父页面婚姻状况存入状态字段
+		setItemValue(0,0,"MARRY_TYPE",marriage);
+		setItemValue(0,0,"CHILDRENS_NUMBER",childrensNumber);
 		setItemRequired(0,"name",false);
 		setItemRequired(0,"certid",false);
 		setItemRequired(0,"tel",false);
@@ -276,9 +295,78 @@
 			 	return;
 			 }
 		 }
- 	}
-	
+		var arrRequired=[
+			"IDEXPIRY",
+			"NATION",
+			"EDUCATION_LEVEL",
+			"WORK_ADDRESS",
+			"ID_ADDRESS",
+			"ENTERPRISE_NATURE",
+			"INDUSTRY_TYPE",
+			"CAREER_TYPE",
+			"MONTHLY_EXPENSES",
+			"WORK_ADDRESS_CODE",
+			"WORK_ADDRESS_ID",
+			"LIVE_ADDRESS_CODE",
+			"LIVE_ADDRESS_ID",
+			"ID_ADDRESS_CODE",
+			"RESIDENTIAL_STATUS",
+			"ID_ADDRESS_ID",
+			"BIRTHDAY",
+			"START_IDEXPIRY",
+			"IDEXPIRY_TYPE"
+		];
+		if(partner=="Y"){
+			for(var i=0;i<arrRequired.length;i++){
+				showItemRequired(0,arrRequired[i]);
+			}
+			for(var i=0;i<arrRequired.length;i++){
+				showItem(0,arrRequired[i]);
+			}
+		}else {
+			for(var i=0;i<arrRequired.length;i++){
+				hideItemRequired(0,arrRequired[i]);
+			}
+			for(var i=0;i<arrRequired.length;i++){
+				hideItem(0,arrRequired[i]);
+				setItemValue(0,0,arrRequired[i],"");
+			}
+		}
+	}
+
+	/**
+	 * 作为共同申请人需做的校验
+	 */
+	function checkPartnerPerson(){
+		alert(1234);
+		alert("partner=" + getItemValue(0,getRow(0),"PARTNER_"));
+		alert("partner2=" + getItemValue(0,getRow(0),"Partner_"));
+		if("Y" != getItemValue(0,getRow(0),"PARTNER_")){
+			return false;
+		}
+		if("" == getItemValue(0,0,"IDEXPIRY")){alert("请输入配偶的有效期结束日");return true;}
+		if("" == getItemValue(0,0,"NATION")){alert("请输入配偶的民族");return true;}
+		if("" == getItemValue(0,0,"EDUCATION_LEVEL")){alert("请输入配偶的最高学历");return true;}
+		if("" == getItemValue(0,0,"WORK_ADDRESS")){alert("请输入配偶的工作地址");return true;}
+		if("" == getItemValue(0,0,"ID_ADDRESS")){alert("请输入配偶的户籍地址");return true;}
+		if("" == getItemValue(0,0,"ENTERPRISE_NATURE")){alert("请输入配偶的单位性质");return true;}
+		if("" == getItemValue(0,0,"INDUSTRY_TYPE")){alert("请输入配偶的单位类型");return true;}
+		if("" == getItemValue(0,0,"CAREER_TYPE")){alert("请输入配偶的职业类型");return true;}
+		if("" == getItemValue(0,0,"MONTHLY_EXPENSES")){alert("请输入配偶的月支出");return true;}
+		if("" == getItemValue(0,0,"WORK_ADDRESS_CODE")){alert("请输入配偶的工作地址");return true;}
+		if("" == getItemValue(0,0,"WORK_ADDRESS_ID")){alert("请输入配偶的工作地址");return true;}
+		if("" == getItemValue(0,0,"LIVE_ADDRESS_CODE")){alert("请输入配偶的居住地址2");return true;}
+		if("" == getItemValue(0,0,"LIVE_ADDRESS_ID")){alert("请输入配偶的居住地址3");return true;}
+		if("" == getItemValue(0,0,"ID_ADDRESS_CODE")){alert("请输入配偶的户籍地址");return true;}
+		if("" == getItemValue(0,0,"RESIDENTIAL_STATUS")){alert("请输入配偶的居住状况");return true;}
+		if("" == getItemValue(0,0,"ID_ADDRESS_ID")){alert("请输入配偶的户籍地址");return true;}
+		if("" == getItemValue(0,0,"BIRTHDAY")){alert("请输入配偶的出生日期");return true;}
+		if("" == getItemValue(0,0,"START_IDEXPIRY")){alert("请输入配偶的有效期开始日");return true;}
+		if("" == getItemValue(0,0,"IDEXPIRY_TYPE")){alert("请输入配偶的有效期类型");return true;}
+	}
 	function save(){//保存配偶信息
+		<%--setItemValue(0,0,"MARRY_TYPE","<%=marriage%>");--%>
+		<%--setItemValue(0,0,"CHILDRENS_NUMBER","<%=childrensNumber %>");--%>
 	    var marriage=parent.getItemValue(0,0,"MARRIAGE");
 		var status = getItemValue(0,0,"status");//获取父页面婚姻状况
 		var name = getItemValue(0,0,"name");
@@ -345,6 +433,9 @@
 			if(!checkCertidRepeat()){
 				return;
 			}
+			if(checkPartnerPerson()){
+				return ;
+			}
 		}
  		
 		if(name.length > 0){
@@ -397,8 +488,31 @@
 				}
 			}
 			if("01"==marriage){
-				var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCustomerFamily",
-						  "relative=01,status=valid,customerid=<%=customerid%>,flowunid=<%=flowunid%>,projectId=<%=projectId%>,certid="+getItemValue(0,0,"certid")+",name="+getItemValue(0,0,"name")+",tel="+getItemValue(0,0,"tel")+",suname="+getItemValue(0,0,"suname")+",partner="+getItemValue(0,getRow(0),"Partner_")+",sposition="+getItemValue(0,getRow(0),"sposition")+",suphone="+getItemValue(0,getRow(0),"suphone")+",smincome="+getItemValue(0,getRow(0),"smincome")+",shukou="+getItemValue(0,getRow(0),"shukou")+",workunit="+getItemValue(0,getRow(0),"workunit")+",sex="+getItemValue(0,getRow(0),"SEX"));
+
+				var saveCustomerFamilyParam =  "relative=01,status=valid,customerid=<%=customerid%>,flowunid=<%=flowunid%>,projectId=<%=projectId%>,certid="
+						+getItemValue(0,0,"certid")+",name="+getItemValue(0,0,"name")+",tel="+getItemValue(0,0,"tel")+",suname="
+						+getItemValue(0,0,"suname")+",partner="+getItemValue(0,getRow(0),"Partner_")+",sposition="
+						+getItemValue(0,getRow(0),"sposition")+",suphone="+getItemValue(0,getRow(0),"suphone")+",smincome="
+						+getItemValue(0,getRow(0),"smincome")+",shukou="+getItemValue(0,getRow(0),"shukou")+",workunit="
+						+getItemValue(0,getRow(0),"workunit")+",sex="+getItemValue(0,getRow(0),"SEX");
+				if(partner=="Y"){
+					alert("------------------------>saveCustomerFamilyParam=" +567);
+					saveCustomerFamilyParam += ",idexpiry=" + getItemValue(0,0,"IDEXPIRY") + ",nation=" + getItemValue(0,0,"NATION")
+							+",educationLevel=" + getItemValue(0,0,"EDUCATION_LEVEL") + ",workAddress=" + getItemValue(0,0,"WORK_ADDRESS")
+							+",idAddress=" + getItemValue(0,0,"ID_ADDRESS") + ",enterpriseNature=" + getItemValue(0,0,"ENTERPRISE_NATURE")
+							+",industryType=" + getItemValue(0,0,"INDUSTRY_TYPE") + ",careerType=" + getItemValue(0,0,"CAREER_TYPE")
+							+",monthlyExpenses=" + getItemValue(0,0,"MONTHLY_EXPENSES") + ",workAddressCode=" + getItemValue(0,0,"WORK_ADDRESS_CODE")
+							+",workAddressId=" + getItemValue(0,0,"WORK_ADDRESS_ID") + ",liveAddressCode=" + getItemValue(0,0,"LIVE_ADDRESS_CODE")
+							+",liveAddressId=" + getItemValue(0,0,"LIVE_ADDRESS_ID") + ",idAddressCode=" + getItemValue(0,0,"ID_ADDRESS_CODE")
+							+",marryType=" + getItemValue(0,0,"MARRY_TYPE") + ",residentialStatus=" + getItemValue(0,0,"RESIDENTIAL_STATUS")
+							+",idAddressId=" + getItemValue(0,0,"ID_ADDRESS_ID") + ",childrensNumber=" + getItemValue(0,0,"CHILDRENS_NUMBER")
+							+",birthday=" + getItemValue(0,0,"BIRTHDAY") + ",startIdexpiry=" + getItemValue(0,0,"START_IDEXPIRY")
+							+",idexpiryType=" + getItemValue(0,0,"IDEXPIRY_TYPE");
+					alert("------------------------>saveCustomerFamilyParam=" + saveCustomerFamilyParam);
+				}
+					var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCustomerFamily",
+							saveCustomerFamilyParam);
+
 				if(sResult == "SUCCESS"){
 					reloadSelf();
 				}
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
index c730a99d1..7f04aa061 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
@@ -66,7 +66,7 @@
 	String compClientID = request.getParameter("CompClientID");
 	//自然人标识
 	String person = "person";
-	dwTemp.replaceColumn("family", "<iframe type='iframe' id='frame_list' name=\"frame_list\" width=\"100%\" height=\"300px\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp?CompClientID="+compClientID+"&customerid="+customerid+"&sPhaseNo="+sPhaseNo+"&IsHistory="+IsHistory+"\"></iframe>", CurPage.getObjectWindowOutput());
+	dwTemp.replaceColumn("family", "<iframe type='iframe' id='frame_list' name=\"frame_list\" width=\"100%\" height=\"400px\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyTempInfo.jsp?CompClientID="+compClientID+"&customerid="+customerid+"&sPhaseNo="+sPhaseNo+"&IsHistory="+IsHistory+"\"></iframe>", CurPage.getObjectWindowOutput());
 
 	String sButtons[][] = {
 		//{"true","","Button","身份校验","身份校验","identityVerification()","","","","btn_icon_check",""}
@@ -157,11 +157,12 @@
 
 	function changeFamilyRequired(){//已婚时设置配偶信息必填,并将婚姻状况参数传递到子页面
 		var marriage = getItemValue(0,getRow(0),"MARRIAGE");
+		var childrensNumber = getItemValue(0,getRow(0),"CHILDRENS_NUMBER");
 		if("01" == marriage){
-			frame_list.window.changeFamilyRequiredTrue(marriage);
+			frame_list.window.changeFamilyRequiredTrue(marriage, childrensNumber);
 			//as_save("myiframe0","frame_list.window.as_save(0);");
 		}else{
-			frame_list.window.changeFamilyRequiredFalse(marriage);
+			frame_list.window.changeFamilyRequiredFalse(marriage, childrensNumber);
 		}
 	}
 
@@ -436,17 +437,18 @@
 	}
 
 	function CheckDate(){
-		  var idexpiry=getItemValue(0,getRow(),"IDEXPIRY");
-		  var date1 = "<%=dateString%>";
-
-			  if(date1>=idexpiry){
-				  setErrorTips("IDEXPIRY","证件到期日必须晚于当前日期!");
-				  return false;
-			  }else{
-				  setErrorTips("IDEXPIRY","");
-				  return true;
-			  }
-
+		var idexpiry=getItemValue(0,getRow(),"IDEXPIRY");
+		var date1 = "<%=dateString%>";
+		var idexpiry_type = getItemValue(0,0,"IDEXPIRY_TYPE");
+		if("1" == idexpiry_type) {//短期
+			if (date1 >= idexpiry) {
+				setErrorTips("IDEXPIRY", "证件到期日必须晚于当前日期!");
+				return false;
+			} else {
+				setErrorTips("IDEXPIRY", "");
+				return true;
+			}
+		}
 
 	}
 
diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java
index e4762ec3e..297fb8ecd 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java
@@ -54,7 +54,267 @@ public class CustomerInfoManage {
 	private String zcProjectNumber;
 	private String zcContractNumber;
 	private String channel;
-	
+	// 北财风控中台新增字段
+
+	/**
+	 * 北财-'北财-共同申请人民族'
+	 */
+	private String nation;
+
+	/**
+	 * 北财-'北财-共同申请人最高学历'
+	 */
+	private String educationLevel;
+	/**
+	 * 北财-'北财-'北财-共同申请人单位地址''
+	 */
+	private String workAddress;
+
+	/**
+	 * 北财-'北财-共同申请人户籍地址'
+	 */
+	private String idAddress;
+
+	/**
+	 * 北财-'北财-共同申请人企业性质'
+	 */
+	private String enterpriseNature;
+
+	/**
+	 * 北财-'北财-共同申请人行业类型'
+	 */
+	private String industryType;
+
+	/**
+	 * 北财-'北财-共同申请人职业类型'
+	 */
+	private String careerType;
+
+	/**
+	 * 北财-'北财-共同申请人月支出'
+	 */
+	private String monthlyExpenses;
+
+	/**
+	 * 北财-'北财-共同申请人单位地址编码'
+	 */
+	private String workAddressCode;
+
+	/**
+	 * 北财-'北财-共同申请人单位地址关联id'
+	 */
+	private String workAddressId;
+
+	/**
+	 * 北财-'北财-共同申请人居住地址编码'
+	 */
+	private String liveAddressCode;
+
+	/**
+	 * 北财-'北财-共同申请人居住地址关联id'
+	 */
+	private String liveAddressId;
+
+	/**
+	 * 北财-'北财-共同申请人户籍地址编码'
+	 */
+	private String idAddressCode;
+
+	/**
+	 * 北财-'北财-共同申请人婚姻状况'
+	 */
+	private String marryType;
+
+	/**
+	 * 北财-'北财-共同申请人居住状况'
+	 */
+	private String residentialStatus;
+
+	/**
+	 * 北财-'北财-共同申请人户籍地址关联id'
+	 */
+	private String idAddressId;
+
+	/**
+	 * 北财-'北财-子女人数'
+	 */
+	private String childrensNumber;
+
+	/**
+	 * 北财-'北财-共同申请人出生日期'
+	 */
+	private String birthday;
+
+	/**
+	 * 北财-'北财-证件有效期开始时间'
+	 */
+	private String startIdexpiry;
+
+	/**
+	 * 北财-'北财-共同申请人身份证有效期'
+	 */
+	private String idexpiryType;
+
+	public String getNation() {
+		return nation;
+	}
+
+	public void setNation(String nation) {
+		this.nation = nation;
+	}
+
+	public String getEducationLevel() {
+		return educationLevel;
+	}
+
+	public void setEducationLevel(String educationLevel) {
+		this.educationLevel = educationLevel;
+	}
+
+	public String getWorkAddress() {
+		return workAddress;
+	}
+
+	public void setWorkAddress(String workAddress) {
+		this.workAddress = workAddress;
+	}
+
+	public String getIdAddress() {
+		return idAddress;
+	}
+
+	public void setIdAddress(String idAddress) {
+		this.idAddress = idAddress;
+	}
+
+	public String getEnterpriseNature() {
+		return enterpriseNature;
+	}
+
+	public void setEnterpriseNature(String enterpriseNature) {
+		this.enterpriseNature = enterpriseNature;
+	}
+
+	public String getIndustryType() {
+		return industryType;
+	}
+
+	public void setIndustryType(String industryType) {
+		this.industryType = industryType;
+	}
+
+	public String getCareerType() {
+		return careerType;
+	}
+
+	public void setCareerType(String careerType) {
+		this.careerType = careerType;
+	}
+
+	public String getMonthlyExpenses() {
+		return monthlyExpenses;
+	}
+
+	public void setMonthlyExpenses(String monthlyExpenses) {
+		this.monthlyExpenses = monthlyExpenses;
+	}
+
+	public String getWorkAddressCode() {
+		return workAddressCode;
+	}
+
+	public void setWorkAddressCode(String workAddressCode) {
+		this.workAddressCode = workAddressCode;
+	}
+
+	public String getWorkAddressId() {
+		return workAddressId;
+	}
+
+	public void setWorkAddressId(String workAddressId) {
+		this.workAddressId = workAddressId;
+	}
+
+	public String getLiveAddressCode() {
+		return liveAddressCode;
+	}
+
+	public void setLiveAddressCode(String liveAddressCode) {
+		this.liveAddressCode = liveAddressCode;
+	}
+
+	public String getLiveAddressId() {
+		return liveAddressId;
+	}
+
+	public void setLiveAddressId(String liveAddressId) {
+		this.liveAddressId = liveAddressId;
+	}
+
+	public String getIdAddressCode() {
+		return idAddressCode;
+	}
+
+	public void setIdAddressCode(String idAddressCode) {
+		this.idAddressCode = idAddressCode;
+	}
+
+	public String getMarryType() {
+		return marryType;
+	}
+
+	public void setMarryType(String marryType) {
+		this.marryType = marryType;
+	}
+
+	public String getResidentialStatus() {
+		return residentialStatus;
+	}
+
+	public void setResidentialStatus(String residentialStatus) {
+		this.residentialStatus = residentialStatus;
+	}
+
+	public String getIdAddressId() {
+		return idAddressId;
+	}
+
+	public void setIdAddressId(String idAddressId) {
+		this.idAddressId = idAddressId;
+	}
+
+	public String getChildrensNumber() {
+		return childrensNumber;
+	}
+
+	public void setChildrensNumber(String childrensNumber) {
+		this.childrensNumber = childrensNumber;
+	}
+
+	public String getBirthday() {
+		return birthday;
+	}
+
+	public void setBirthday(String birthday) {
+		this.birthday = birthday;
+	}
+
+	public String getStartIdexpiry() {
+		return startIdexpiry;
+	}
+
+	public void setStartIdexpiry(String startIdexpiry) {
+		this.startIdexpiry = startIdexpiry;
+	}
+
+	public String getIdexpiryType() {
+		return idexpiryType;
+	}
+
+	public void setIdexpiryType(String idexpiryType) {
+		this.idexpiryType = idexpiryType;
+	}
+
 	public String getDistributorCode() {
 		return distributorCode;
 	}
@@ -372,6 +632,30 @@ public class CustomerInfoManage {
 				bo.setAttributeValue("workunit", workunit);
 				bo.setAttributeValue("sex", sex);
 			}
+			if("Y".equals(partner)){
+				System.out.println("开始保存共同申请人配偶信息---------【666】---------->");
+				bo.setAttributeValue("idexpiry",idexpiry);
+				bo.setAttributeValue("nation",nation);
+				bo.setAttributeValue("education_level",educationLevel);
+				bo.setAttributeValue("work_address",workAddress);
+				bo.setAttributeValue("id_address",idAddress);
+				bo.setAttributeValue("enterprise_nature",enterpriseNature);
+				bo.setAttributeValue("industry_type",industryType);
+				bo.setAttributeValue("career_type",careerType);
+				bo.setAttributeValue("monthly_expenses",monthlyExpenses);
+				bo.setAttributeValue("work_address_code",workAddressCode);
+				bo.setAttributeValue("work_address_id",workAddressId);
+				bo.setAttributeValue("live_address_code",liveAddressCode);
+				bo.setAttributeValue("live_address_id",liveAddressId);
+				bo.setAttributeValue("id_address_code",idAddressCode);
+				bo.setAttributeValue("marry_type",marryType);
+				bo.setAttributeValue("residential_status",residentialStatus);
+				bo.setAttributeValue("id_address_id",idAddressId);
+				bo.setAttributeValue("childrens_number",childrensNumber);
+				bo.setAttributeValue("birthday",birthday);
+				bo.setAttributeValue("start_idexpiry",startIdexpiry);
+				bo.setAttributeValue("idexpiry_type",idexpiryType);
+			}
 			bom.saveObject(bo);
 		}catch(Exception e){
 			e.printStackTrace();