diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp index 73c4e5113..61bff98f7 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp @@ -48,6 +48,7 @@ sButtonPosition = "north"; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml index bdb9462b6..d1bf1a8ac 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml @@ -1013,6 +1013,7 @@ + @@ -1304,6 +1305,7 @@ + @@ -2680,90 +2682,93 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java index b2add608e..03ae15046 100644 --- a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java +++ b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java @@ -88,10 +88,14 @@ public class CreditBodyGuardAction { //将查询到的结果放入一个List中 List personList = new ArrayList<>(); personList.add(borrowerResult); - personList.add(coborrowerResult); - for(BizObject biz : guarantorResultList){ - personList.add(biz); + if(coborrowerResult != null){ + personList.add(coborrowerResult); } + if(guarantorResultList.size()>0){ + for(BizObject biz : guarantorResultList){ + personList.add(biz); + } + } //遍历这个List并组装成字符串 for(int r = 0;r brandList = JSON.parseArray(JSON.toJSONString(dataObject.get("brand")), HashMap.class); + System.out.println("品牌大小:"+brandList.size()); + @SuppressWarnings("rawtypes") + List seriesList = JSON.parseArray(JSON.toJSONString(dataObject.get("series")), HashMap.class); + System.out.println("车系大小:"+seriesList.size()); + @SuppressWarnings("rawtypes") + List modelList = JSON.parseArray(JSON.toJSONString(dataObject.get("model")), HashMap.class); + System.out.println("车型大小:"+modelList.size()); + + JSONObject versionListObject = (JSONObject) dataObject.get("version"); + //判断解析出的brandList是否为空,若不为空则执行 + if(!brandList.isEmpty()){ + for(int i=0;i bos = bm.createQuery("flowunid=:flowunid").setParameter("flowunid",this.flowunid).getResultList(false); @@ -48,5 +67,17 @@ public class AccountInfoManage { public void setFlowunid(String flowunid) { this.flowunid = flowunid; } + //带值 + public String Checkbasicinfo(JBOTransaction tx) throws JBOException{ + BizObjectManager bs = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME,tx); + BizObject dgc = bs.createQuery("flowunid=:flowunid").setParameter("flowunid", this.getFlowunid()).getSingleResult(false); + String distributorName = dgc.getAttribute("DISTRIBUTOR_NAME").toString(); + /*BizObjectManager bms = JBOFactory.getBizObjectManager(DISTRIBUTOR_ACCOUNT_TEMP.CLASS_NAME,tx); + BizObject account = bms.newObject(); + account.setAttributeValue("ACCOUNT", distributorName); + bms.saveObject(account);*/ + return distributorName; + + } } 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 9a737d6ec..639ed10b7 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java @@ -5,10 +5,13 @@ import jbo.app.tenwa.customer.CUSTOMER_CERT_TEMP; import jbo.app.tenwa.customer.CUSTOMER_FAMILY; import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP; import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP; +import jbo.app.tenwa.customer.DISTRIBUTOR_INFO; import jbo.app.tenwa.customer.DISTRIBUTOR_INFO_TEMP; import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP; +import org.bouncycastle.crypto.tls.AlertDescription; + import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.JBOException; @@ -17,6 +20,8 @@ import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.are.util.StringFunction; public class CustomerInfoManage { + private String F_I_TYPE; + private String DISTRIBUTOR_STATUS; private String flowunid; private String status; private String relative; @@ -37,14 +42,21 @@ public class CustomerInfoManage { private String smincome; private String shukou; private String projectId; - private String workunit; - public String getWorkunit() { - return workunit; + public String getF_I_TYPE() { + return F_I_TYPE; } - public void setWorkunit(String workunit) { - this.workunit = workunit; + public void setF_I_TYPE(String f_I_TYPE) { + F_I_TYPE = f_I_TYPE; + } + + public String getDISTRIBUTOR_STATUS() { + return DISTRIBUTOR_STATUS; + } + + public void setDISTRIBUTOR_STATUS(String dISTRIBUTOR_STATUS) { + DISTRIBUTOR_STATUS = dISTRIBUTOR_STATUS; } public String getProjectId() { @@ -249,7 +261,6 @@ public class CustomerInfoManage { bo.setAttributeValue("shukou", shukou); bo.setAttributeValue("Spouse_", "Y"); bo.setAttributeValue("PROJECT_ID", projectId); - bo.setAttributeValue("workunit", workunit); }else{ bo = bom.newObject(); bo.setAttributeValue("flowunid", flowunid); @@ -268,7 +279,6 @@ public class CustomerInfoManage { bo.setAttributeValue("shukou", shukou); bo.setAttributeValue("Spouse_", "Y"); bo.setAttributeValue("PROJECT_ID", projectId); - bo.setAttributeValue("workunit", workunit); } bom.saveObject(bo); }catch(Exception e){ @@ -367,4 +377,14 @@ public class CustomerInfoManage { return "SUCCESS"; } +/* public String SelectGroup(JBOTransaction tx){ + if(this.F_I_TYPE=="f_i_type02" && this.DISTRIBUTOR_STATUS=="distributor_status04"){ + return "true"; + } + + return "false"; + }*/ + + + } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaFormalToTempBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaFormalToTempBusiness.java index 7aa907e21..b4c5f9256 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaFormalToTempBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaFormalToTempBusiness.java @@ -13,6 +13,7 @@ import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP; import jbo.app.tenwa.customer.CUSTOMER_PERSON; import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP; import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT; +import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP; import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE; import com.amarsoft.are.jbo.BizObject; @@ -43,6 +44,11 @@ public class LBCustomerRelaFormalToTempBusiness extends BaseBussiness { DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS.CLASS_NAME, fromCondtion, CUSTOMER_ADDRESS_TEMP.CLASS_NAME, null, other, null, Sqlca); } for(BizObject unit:unitList){ + //担保人从正式表到临时表 + fromCondtion.clear(); + fromCondtion.put("id", unit.getAttribute("id").getString()); + DataOperatorUtil.copySingleJBO(LB_GUARANTEE_UNIT.CLASS_NAME, fromCondtion, LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, null, other, Sqlca); + fromCondtion.clear(); fromCondtion.put("customerid", unit.getAttribute("ASSUROR").getString()); DataOperatorUtil.copyJBOSet(CUSTOMER_PERSON.CLASS_NAME, fromCondtion, CUSTOMER_PERSON_TEMP.CLASS_NAME, null, other, null, Sqlca); 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 bizList) throws Exception { StringBuffer sb = new StringBuffer(""); - sb.append(""); - sb.append(""); - sb.append(""); - sb.append("安鹏国际融资租赁有限公司"); - sb.append(""); - sb.append(""); - sb.append("公民身份号码"); - sb.append("姓名"); - sb.append(""); - sb.append(""); - //入参申请人身份证号码 - sb.append(""+biz1.getAttribute("CERTID").getString()+""); - //入参申请人姓名 - sb.append(""+biz1.getAttribute("FULLNAME").getString()+""); - sb.append(""); - sb.append(""); - //入参共同申请人身份证号码 - sb.append(""+biz2.getAttribute("certid").getString()+""); - //入参共同申请人姓名 - sb.append(""+biz2.getAttribute("name").getString()+""); - sb.append(""); - for(int i=0;i"); + if(bizList.size()>0 && biz2 != null){ + sb.append(BaseXMLConfiguration(biz1)); + sb.append(""); //入参共同申请人身份证号码 - sb.append(""+bizList.get(i).getAttribute("CERTID").getString()+""); + sb.append(""+biz2.getAttribute("certid").getString()+""); //入参共同申请人姓名 - sb.append(""+bizList.get(i).getAttribute("FULLNAME").getString()+""); + sb.append(""+biz2.getAttribute("name").getString()+""); sb.append(""); + for(int i=0;i"); + //入参共同申请人身份证号码 + sb.append(""+bizList.get(i).getAttribute("CERTID").getString()+""); + //入参共同申请人姓名 + sb.append(""+bizList.get(i).getAttribute("FULLNAME").getString()+""); + sb.append(""); + } + sb.append(""); + }else if(biz2 == null && bizList.size()>0){ + sb.append(BaseXMLConfiguration(biz1)); + for(int i=0;i"); + //入参共同申请人身份证号码 + sb.append(""+bizList.get(i).getAttribute("CERTID").getString()+""); + //入参共同申请人姓名 + sb.append(""+bizList.get(i).getAttribute("FULLNAME").getString()+""); + sb.append(""); + } + sb.append(""); + }else if(biz2 != null && bizList.size()<=0){ + sb.append(BaseXMLConfiguration(biz1)); + sb.append(""); + //入参共同申请人身份证号码 + sb.append(""+biz2.getAttribute("certid").getString()+""); + //入参共同申请人姓名 + sb.append(""+biz2.getAttribute("name").getString()+""); + sb.append(""); + sb.append(""); + }else{ + sb.append(BaseXMLConfiguration(biz1)); } - sb.append(""); 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(""); + sb.append(""); + sb.append(""); + sb.append("安鹏国际融资租赁有限公司"); + sb.append(""); + sb.append(""); + sb.append("公民身份号码"); + sb.append("姓名"); + sb.append(""); + sb.append(""); + //入参申请人身份证号码 + sb.append(""+biz1.getAttribute("CERTID").getString()+""); + //入参申请人姓名 + sb.append(""+biz1.getAttribute("FULLNAME").getString()+""); + sb.append(""); + return sb.toString(); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } }