From 08f1c2a5473ea10bd5d692d4d415b5a4c3b51c9b Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei>
Date: Fri, 20 Jul 2018 14:27:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../validate/IdentityVerification.java        |  3 -
 .../flow/project/validate/SoapRequest.java    | 86 +++++++++++++------
 2 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java b/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java
index 572948604..3dedef60e 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java
@@ -90,9 +90,6 @@ public class IdentityVerification {
 								//读取授权文件
 								String license =ValidatePropertiesUtil.get("key");
 								String decode = new String(new BASE64Decoder().decodeBuffer(license));
-								if(coborrowerResult == null || guarantorResultList == null){
-										return "请完善共同申请人与担保人信息!";
-								}
 								//将申请人,共同申请人,担保人等信息传入该类构建xml入参参数
 								String  inConditions = SoapRequest.XMLConfiguration(borrowerResult,coborrowerResult,guarantorResultList);
 								String result  = NciicClient.executeClient("NciicServices",decode,inConditions);
diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java b/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java
index 1d24b4eb7..b06de9bed 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java
@@ -7,39 +7,73 @@ public class SoapRequest {
 			
 			public static String XMLConfiguration(BizObject biz1,BizObject biz2,List<BizObject> bizList) throws Exception {
 			        StringBuffer sb = new StringBuffer("");
-			        sb.append("<?xml version='1.0' encoding='UTF-8'?>");
-			        sb.append("<ROWS>");
-			        sb.append("<INFO>");
-			        sb.append("<SBM>安鹏国际融资租赁有限公司</SBM>");
-			        sb.append("</INFO>");
-			        sb.append("<ROW>");
-			        sb.append("<GMSFHM>公民身份号码</GMSFHM>");
-			        sb.append("<XM>姓名</XM>");
-			        sb.append("</ROW>");
-			        sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
-			        //入参申请人身份证号码
-			        sb.append("<GMSFHM>"+biz1.getAttribute("CERTID").getString()+"</GMSFHM>");
-			        //入参申请人姓名
-			        sb.append("<XM>"+biz1.getAttribute("FULLNAME").getString()+"</XM>");		        
-			        sb.append("</ROW>");
-			        sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
-			        //入参共同申请人身份证号码
-			        sb.append("<GMSFHM>"+biz2.getAttribute("certid").getString()+"</GMSFHM>");
-			        //入参共同申请人姓名
-			        sb.append("<XM>"+biz2.getAttribute("name").getString()+"</XM>");	
-			        sb.append("</ROW>");
-			        for(int i=0;i<bizList.size();i++){
-			        	sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
+			        if(bizList.size()>0 && biz2 != null){
+			        	sb.append(BaseXMLConfiguration(biz1));
+				        sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
 				        //入参共同申请人身份证号码
-				        sb.append("<GMSFHM>"+bizList.get(i).getAttribute("CERTID").getString()+"</GMSFHM>");
+				        sb.append("<GMSFHM>"+biz2.getAttribute("certid").getString()+"</GMSFHM>");
 				        //入参共同申请人姓名
-				        sb.append("<XM>"+bizList.get(i).getAttribute("FULLNAME").getString()+"</XM>");	
+				        sb.append("<XM>"+biz2.getAttribute("name").getString()+"</XM>");	
 				        sb.append("</ROW>");
+				        for(int i=0;i<bizList.size();i++){
+				        	sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
+					        //入参共同申请人身份证号码
+					        sb.append("<GMSFHM>"+bizList.get(i).getAttribute("CERTID").getString()+"</GMSFHM>");
+					        //入参共同申请人姓名
+					        sb.append("<XM>"+bizList.get(i).getAttribute("FULLNAME").getString()+"</XM>");	
+					        sb.append("</ROW>");
+				        }
+				        sb.append("</ROWS>");
+			        }else if(biz2 == null && bizList.size()>0){
+			        	sb.append(BaseXMLConfiguration(biz1));
+				        for(int i=0;i<bizList.size();i++){
+				        	sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
+					        //入参共同申请人身份证号码
+					        sb.append("<GMSFHM>"+bizList.get(i).getAttribute("CERTID").getString()+"</GMSFHM>");
+					        //入参共同申请人姓名
+					        sb.append("<XM>"+bizList.get(i).getAttribute("FULLNAME").getString()+"</XM>");	
+					        sb.append("</ROW>");
+				        }
+				        sb.append("</ROWS>");
+			        }else if(biz2 != null && bizList.size()<=0){
+			        	sb.append(BaseXMLConfiguration(biz1));
+				        sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
+				        //入参共同申请人身份证号码
+				        sb.append("<GMSFHM>"+biz2.getAttribute("certid").getString()+"</GMSFHM>");
+				        //入参共同申请人姓名
+				        sb.append("<XM>"+biz2.getAttribute("name").getString()+"</XM>");	
+				        sb.append("</ROW>");
+				        sb.append("</ROWS>");
+			        }else{
+			        	sb.append(BaseXMLConfiguration(biz1));
 			        }
-			        sb.append("</ROWS>");
 			        System.out.println("HttpClient 发送SOAP请求");
 			        String xmldata = sb.toString();
 			        System.out.println(xmldata);
 			        return xmldata;
 			}
+			public static String BaseXMLConfiguration(BizObject biz1){
+					try {
+							StringBuffer sb = new StringBuffer("");
+						   	sb.append("<?xml version='1.0' encoding='UTF-8'?>");
+					        sb.append("<ROWS>");
+					        sb.append("<INFO>");
+					        sb.append("<SBM>安鹏国际融资租赁有限公司</SBM>");
+					        sb.append("</INFO>");
+					        sb.append("<ROW>");
+					        sb.append("<GMSFHM>公民身份号码</GMSFHM>");
+					        sb.append("<XM>姓名</XM>");
+					        sb.append("</ROW>");
+					        sb.append("<ROW FSD='000001' YWLX='安鹏国际'>");
+					        //入参申请人身份证号码
+					        sb.append("<GMSFHM>"+biz1.getAttribute("CERTID").getString()+"</GMSFHM>");
+					        //入参申请人姓名
+					        sb.append("<XM>"+biz1.getAttribute("FULLNAME").getString()+"</XM>");		        
+					        sb.append("</ROW>");
+							return sb.toString();
+					} catch (Exception e) {
+							e.printStackTrace();
+					}
+					return null;
+			}
 }