diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccountList.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccountList.jsp index cff41ea5d..cca26588f 100644 --- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccountList.jsp +++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccountList.jsp @@ -62,7 +62,7 @@ /*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/ function newRecord(){ var sUrl = "/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp"; - AsDialog.PopView(sUrl,'',"resizable=yes;dialogWidth=800px;dialogHeight=300px;center:yes;status:no;statusbar:no",function(){ + AsDialog.PopView(sUrl,'',"resizable=yes;dialogWidth=800px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){ reloadSelf(); },"新增本方信息"); } @@ -76,7 +76,7 @@ function view(){ alert("请选择一条信息!"); return ; } - AsDialog.PopView(sUrl,'id='+id+'&rightType=ReadOnly',"resizable=yes;dialogWidth=800px;dialogHeight=300px;center:yes;status:no;statusbar:no",function(){ + AsDialog.PopView(sUrl,'id='+id+'&rightType=ReadOnly',"resizable=yes;dialogWidth=800px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){ reloadSelf(); },"本方信息详情"); } @@ -89,7 +89,7 @@ function edit(){ alert("请选择一条信息!"); return ; } - AsDialog.PopView(sUrl,'id='+id,"resizable=yes;dialogWidth=800px;dialogHeight=300px;center:yes;status:no;statusbar:no",function(){ + AsDialog.PopView(sUrl,'id='+id,"resizable=yes;dialogWidth=800px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){ reloadSelf(); },"修改本方信息"); } diff --git a/WebContent/Tenwa/Core/Voucher/VoucherConfig/LvVoucherLoanInfo.jsp b/WebContent/Tenwa/Core/Voucher/VoucherConfig/LvVoucherLoanInfo.jsp index fd68c3b06..403953833 100644 --- a/WebContent/Tenwa/Core/Voucher/VoucherConfig/LvVoucherLoanInfo.jsp +++ b/WebContent/Tenwa/Core/Voucher/VoucherConfig/LvVoucherLoanInfo.jsp @@ -27,7 +27,7 @@ AsControl.OpenView(pUrl, "vouid=<%=vouid%>&owned=<%=owned%>","_self",""); } function selectLoanSubject(){ - AsDialog.OpenSelector("SelectLoanSubject","","dialogWidth=" + parseInt(window.screen.width * 0.5) + "px dialogHeight=" + parseInt(window.screen.height * 0.3) + "px",function(sReturn){ + AsDialog.OpenSelector("SelectLoanSubject","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn || sReturn == "_CANCEL_"||sReturn=="_NONE_"||sReturn=="_CLEAR_"){ return; } diff --git a/WebContent/Tenwa/Lease/FamilyVisit/fieldSurvey/FieldSurveyInfo.jsp b/WebContent/Tenwa/Lease/FamilyVisit/fieldSurvey/FieldSurveyInfo.jsp index 3288031a7..29ba6f0c4 100644 --- a/WebContent/Tenwa/Lease/FamilyVisit/fieldSurvey/FieldSurveyInfo.jsp +++ b/WebContent/Tenwa/Lease/FamilyVisit/fieldSurvey/FieldSurveyInfo.jsp @@ -33,6 +33,7 @@ setItemValue(0,getRow(),"UPDATEUSERID","<%=inputusername%>"); setItemValue(0,getRow(),"INPUTORGID","<%=inputorgname%>"); setItemValue(0,getRow(),"UPDATEORGID","<%=inputorgname%>"); + setItemValue(0,getRow(),"SERVER","<%=inputusername%>"); var date = new Date(); var updatetime = date.toJSON().substring(0,10).replace(/-/g,"/")+" "+date.getHours()+":"+date.getMinutes()+":"+date.getSeconds(); var inputtime = date.toJSON().substring(0,10).replace(/-/g,"/")+" "+date.getHours()+":"+date.getMinutes()+":"+date.getSeconds(); diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp index 76ae89b46..1fc807882 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp @@ -1,435 +1,444 @@ -<%@page import="com.sun.org.apache.xalan.internal.xsltc.compiler.sym"%> -<%@page import="jbo.app.tenwa.customer.CUSTOMER_TYPE"%> -<%@page import="jbo.app.tenwa.customer.CUSTOMER_INFO"%> -<%@page import="java.util.Date"%> -<%@page import="java.text.SimpleDateFormat"%> -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% - - Date curdate = new Date(); - SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd"); - String dateString = formatter.format(curdate); - - String flowunid = CurPage.getParameter("FlowUnid"); - String customerid = Sqlca.getString("select customer_id from lb_union_lessee_temp where flowunid='"+flowunid+"'"); - String sTempletNo = "BusinessCustomerInfo";//--模板号-- - ASObjectModel doTemp = new ASObjectModel(sTempletNo); - String custname=CurPage.getParameter("custname"); - doTemp.setHtmlEvent("CERTID","onChange","changeCertid"); - doTemp.setHtmlEvent("MARRIAGE","onChange","changeChildrensNumber"); - String rightType = CurPage.getParameter("RightType");//页面只读与否 - if(rightType==null)rightType=""; - ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); - doTemp.setDefaultValue("CERTTYPE", "Ind01"); - if(rightType.equals("ReadOnly")){ - doTemp.setColInnerBtEvent("fulladdress", "");//设置地址按钮 - } - dwTemp.Style = "2";//freeform - dwTemp.genHTMLObjectWindow(flowunid + "," + customerid); - CurPage.getCurComp().setAttribute("RightType", rightType); - if(rightType.equals("ReadOnly")){ - dwTemp.ReadOnly = "1";//只读模式 - } - String customerType = "03"; - String compClientID = request.getParameter("CompClientID"); - //自然人标识 - String person = "person"; - dwTemp.replaceColumn("family", "", CurPage.getObjectWindowOutput()); - String sButtons[][] = { - }; -%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> - -<%@ include file="/Frame/resources/include/include_end.jspf"%> +<%@page import="com.sun.org.apache.xalan.internal.xsltc.compiler.sym"%> +<%@page import="jbo.app.tenwa.customer.CUSTOMER_TYPE"%> +<%@page import="jbo.app.tenwa.customer.CUSTOMER_INFO"%> +<%@page import="java.util.Date"%> +<%@page import="java.text.SimpleDateFormat"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + + Date curdate = new Date(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd"); + String dateString = formatter.format(curdate); + + String flowunid = CurPage.getParameter("FlowUnid"); + String customerid = Sqlca.getString("select customer_id from lb_union_lessee_temp where flowunid='"+flowunid+"'"); + String sTempletNo = "BusinessCustomerInfo";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + String custname=CurPage.getParameter("custname"); + System.out.print(custname+"====================="); + doTemp.setHtmlEvent("CERTID","onChange","changeCertid"); + doTemp.setHtmlEvent("MARRIAGE","onChange","changeChildrensNumber"); + String rightType = CurPage.getParameter("RightType");//页面只读与否 + if(rightType==null)rightType=""; + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + doTemp.setDefaultValue("CERTTYPE", "Ind01"); + if(rightType.equals("ReadOnly")){ + doTemp.setColInnerBtEvent("fulladdress", "");//设置地址按钮 + } + dwTemp.Style = "2";//freeform + dwTemp.genHTMLObjectWindow(flowunid + "," + customerid); + CurPage.getCurComp().setAttribute("RightType", rightType); + if(rightType.equals("ReadOnly")){ + dwTemp.ReadOnly = "1";//只读模式 + } + String customerType = "03"; + String compClientID = request.getParameter("CompClientID"); + //自然人标识 + String person = "person"; + dwTemp.replaceColumn("family", "", CurPage.getObjectWindowOutput()); + String sButtons[][] = { + {"true","","Button","身份校验","身份校验","identityVerification()","","","","btn_icon_check",""} + }; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 2aab17627..d7742ceb3 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -3480,6 +3480,7 @@ + @@ -3557,6 +3558,7 @@ + diff --git a/WebContent/WEB-INF/lib/commons-discovery-0.2.jar b/WebContent/WEB-INF/lib/commons-discovery-0.2.jar new file mode 100644 index 000000000..b88554847 Binary files /dev/null and b/WebContent/WEB-INF/lib/commons-discovery-0.2.jar differ diff --git a/WebContent/WEB-INF/lib/jaxen-1.1-beta-9.jar b/WebContent/WEB-INF/lib/jaxen-1.1-beta-9.jar new file mode 100644 index 000000000..6402d3273 Binary files /dev/null and b/WebContent/WEB-INF/lib/jaxen-1.1-beta-9.jar differ diff --git a/WebContent/WEB-INF/lib/wsdl4j.jar b/WebContent/WEB-INF/lib/wsdl4j.jar new file mode 100644 index 000000000..67a35fcba Binary files /dev/null and b/WebContent/WEB-INF/lib/wsdl4j.jar differ diff --git a/WebContent/WEB-INF/lib/wstx-asl-3.2.0.jar b/WebContent/WEB-INF/lib/wstx-asl-3.2.0.jar new file mode 100644 index 000000000..24c895ca7 Binary files /dev/null and b/WebContent/WEB-INF/lib/wstx-asl-3.2.0.jar differ diff --git a/WebContent/WEB-INF/lib/xfire-all-1.2.6.jar b/WebContent/WEB-INF/lib/xfire-all-1.2.6.jar new file mode 100644 index 000000000..828b6805a Binary files /dev/null and b/WebContent/WEB-INF/lib/xfire-all-1.2.6.jar differ diff --git a/WebContent/WEB-INF/lib/xfire-ws-security-1.2.6.jar b/WebContent/WEB-INF/lib/xfire-ws-security-1.2.6.jar new file mode 100644 index 000000000..b45f25b42 Binary files /dev/null and b/WebContent/WEB-INF/lib/xfire-ws-security-1.2.6.jar differ diff --git a/WebContent/WEB-INF/lib/xml-apis.jar b/WebContent/WEB-INF/lib/xml-apis.jar new file mode 100644 index 000000000..243eaeaeb Binary files /dev/null and b/WebContent/WEB-INF/lib/xml-apis.jar differ diff --git a/config/license.properties b/config/license.properties new file mode 100644 index 000000000..151da6f9c --- /dev/null +++ b/config/license.properties @@ -0,0 +1 @@ +key=JTNGdiUzRnpVJTNEJTVDWCU1Q1olM0YlNUIlNUM5ZHgrJTI0JTVDJTIwMyUyM0IlM0RLNCUzRmMlM0ZvJTNGZyUzRmslM0ZoJTNGb2JTN19SS0gwY2Q3JTI5MSUyNUQ5RyU1RCUzRmMlM0ZvYjRLL1J0ZEUlM0Z6JTNGeCUyNi0lM0Z2JTVDakAvUmthM0piJTYwVkR4JTNGeCUzRnZNciU1Q2glNUJwR3FVaSU1QnFFdkBoJTNGeCUzRnYlNUR3Tm1PbU0vL2slM0ZnKnklM0ZkJTNBcyUzRnM2ZyUzRnYlMjYvJTVCaiU1QiUzQkdnQm0lM0Z4JTNGdk93Tm1JekpnJTNGeDViKnklM0ZkJTNGZiUzRmQyYSUzRnYyb1h4RWZPbU9zJTNGeCUzRnZKal9lTWJjNiUzRnhVQiUzQVVBNSU1QlhGLSU1RCUyMFQlNjAvQS9yJTNGZCUzRC4lM0ZnJTNEZjluMm9VaFRpYjBacCUyNnIlM0Z2TnAlNjAlNUNZYSU1RGdUdk1jT29EeiUzRnhNdiUzRmclM0ZnJTNGZyUzRmclM0ZnJTNGdi54TnBPZyU1RGclNUVmVnhQJTVCTmklNjAzJTNGeCUzRnZJelkvNnQlM0Z4JTNGdiUzRmpOdWNaJTVCcCU1Qi8lNUNxTnpJaCU1RWslM0Z4JTNGdmNaJTYwNCU1Q2dWeiU1Q3FBY0tnVWlZZVNxJTYwJTIwMWglM0Z2RnpIJTVCQS5HdiUzRng3diUzRG4lM0YvJTNGcyUzRnYlM0ZqJTVCb015ViU1QmI1JTNGeCUzRnYlM0ZqQCUzQmI2UXZHa0ZoQHZfeVolM0JUeUJiUCU1QiUzRnhkJTI1JTNGaiU2MC0lNUVlTGhWJTNCQ2ZhQ2I2JTNGeA== \ No newline at end of file diff --git a/src_cmb/com/tenwa/sdk/controller/PayController.java b/src_cmb/com/tenwa/sdk/controller/PayController.java index 9a30ab3b8..7441177d0 100644 --- a/src_cmb/com/tenwa/sdk/controller/PayController.java +++ b/src_cmb/com/tenwa/sdk/controller/PayController.java @@ -339,7 +339,7 @@ public class PayController extends BaseFlowStartAction { for (String income_id : income_ids) { String date = df.format(new Date()); pay_detail = new SDKDcPayReqxVO(); - infoOne = bankBo.createQuery("select o.PROJECT_ID,o.FEE_TYPE,o.PAY_TYPE,o.BANK_SQRNBR,o.BANK_PAY_ID,o.BANK_REQNBR,o.FACT_MONEY,o.memo,o.CONTRACT_ID,o.PAYMENT_NUMBER,o.PLAN_LIST,FLOWUNID,contract_info.CONTRACT_NO,distributor.acc_number,distributor.open_bank,distributor.account,distributor.district,distributor.provinceInfo from o left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO contract_info on o.CONTRACT_ID = contract_info.id left join jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT distributor on contract_info.distributor_id = distributor.distributor_id and distributor.is_main='Y' where o.id=:id and o.PAY_TYPE = 'pay_type_out' ").setParameter("id", income_id).getSingleResult(false); + infoOne = bankBo.createQuery("select o.PROJECT_ID,o.FEE_TYPE,o.PLAN_ID,o.PAY_TYPE,o.BANK_SQRNBR,o.BANK_PAY_ID,o.BANK_REQNBR,o.FACT_MONEY,o.memo,o.CONTRACT_ID,o.PAYMENT_NUMBER,o.PLAN_LIST,FLOWUNID,contract_info.CONTRACT_NO,distributor.acc_number,distributor.open_bank,distributor.account,distributor.district,distributor.provinceInfo from o left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO contract_info on o.CONTRACT_ID = contract_info.id left join jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT distributor on contract_info.distributor_id = distributor.distributor_id and distributor.is_main='Y' where o.id=:id and o.PAY_TYPE = 'pay_type_out' ").setParameter("id", income_id).getSingleResult(false); if(infoOne==null) { map.put("code", "1") ; map.put("msg", "第["+index+"]笔数据不存在,请检查") ; @@ -353,6 +353,7 @@ public class PayController extends BaseFlowStartAction { String PLAN_LIST = infoOne.getAttribute("PLAN_LIST").toString(); String FLOWUNID = this.FLOWUNID ; String FEE_TYPE = infoOne.getAttribute("FEE_TYPE").toString(); + String PLAN_ID = infoOne.getAttribute("PLAN_ID").toString(); String PAY_TYPE = infoOne.getAttribute("PAY_TYPE").toString(); String CONTRACT_NO = infoOne.getAttribute("CONTRACT_NO").toString(); String CRTACC = infoOne.getAttribute("acc_number").toString(); @@ -369,7 +370,7 @@ public class PayController extends BaseFlowStartAction { * 检查 当前付款信息 是否存在 开始 */ if(BANK_PAY_ID!=null && BANK_PAY_ID!="" && !"".equals(BANK_PAY_ID)) { - String temp_sql = "select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE =:FEE_TYPE " ; + String temp_sql = "select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE =:FEE_TYPE and PLAN_ID=:PLAN_ID " ; if(BANK_YURREF!=null && BANK_YURREF!="" && !"".equals(BANK_YURREF)) temp_sql = temp_sql + " and YURREF=:BANK_YURREF"; if(BANK_SQRNBR!=null && BANK_SQRNBR!="" && !"".equals(BANK_SQRNBR)) @@ -386,6 +387,7 @@ public class PayController extends BaseFlowStartAction { call_back_detail_boo.setParameter("FLOWUNID",FLOWUNID) ; call_back_detail_boo.setParameter("PAY_TYPE",PAY_TYPE) ; call_back_detail_boo.setParameter("FEE_TYPE",FEE_TYPE) ; + call_back_detail_boo.setParameter("PLAN_ID",PLAN_ID) ; if(BANK_YURREF!=null && BANK_YURREF!="" && !"".equals(BANK_YURREF)) call_back_detail_boo.setParameter("BANK_YURREF",BANK_YURREF) ; @@ -421,6 +423,7 @@ public class PayController extends BaseFlowStartAction { || BANK_NAME==null || "".equals( BANK_NAME ) || PAY_TYPE==null || "".equals( PAY_TYPE ) || FEE_TYPE==null || "".equals( FEE_TYPE ) + || PLAN_ID==null || "".equals( PLAN_ID ) || CRTNAM==null || "".equals( CRTNAM ) || CRTPVC==null || "".equals( CRTPVC ) || CRTCTY==null || "".equals( CRTCTY ) @@ -472,6 +475,7 @@ public class PayController extends BaseFlowStartAction { pay_detail_bo.setAttributeValue("CONTRACT_ID", CONTRACT_ID); pay_detail_bo.setAttributeValue("PAYMENT_NUMBER", PAYMENT_NUMBER); pay_detail_bo.setAttributeValue("PLAN_LIST", PLAN_LIST); + pay_detail_bo.setAttributeValue("PLAN_ID", PLAN_ID); pay_detail_bo.setAttributeValue("FLOWUNID", FLOWUNID); pay_detail_bo.setAttributeValue("PAY_TYPE", PAY_TYPE); pay_detail_bo.setAttributeValue("FEE_TYPE", FEE_TYPE); @@ -546,13 +550,14 @@ public class PayController extends BaseFlowStartAction { if(pay_detail_list!=null && pay_detail_list.size()>0) for (BizObject pay_detail_one : pay_detail_list) { - BizObjectQuery income_boo= income_bom.createQuery("select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE=:FEE_TYPE "); + BizObjectQuery income_boo= income_bom.createQuery("select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE=:FEE_TYPE and PLAN_ID=:PLAN_ID "); income_boo.setParameter("CONTRACT_ID",pay_detail_one.getAttribute("CONTRACT_ID").toString()) ; income_boo.setParameter("PAYMENT_NUMBER",pay_detail_one.getAttribute("PAYMENT_NUMBER").toString()) ; income_boo.setParameter("PLAN_LIST",pay_detail_one.getAttribute("PLAN_LIST").toString()) ; income_boo.setParameter("FLOWUNID",pay_detail_one.getAttribute("FLOWUNID").toString()) ; income_boo.setParameter("PAY_TYPE",pay_detail_one.getAttribute("PAY_TYPE").toString()) ; income_boo.setParameter("FEE_TYPE",pay_detail_one.getAttribute("FEE_TYPE").toString()) ; + income_boo.setParameter("PLAN_ID",pay_detail_one.getAttribute("PLAN_ID").toString()) ; income_bo = income_boo.getSingleResult(true) ; income_bo.setAttributeValue("BANK_PAY_ID",pay_detail_one.getAttribute("PAY_ID").toString()); income_bo.setAttributeValue("BANK_YURREF",pay_detail_one.getAttribute("YURREF").toString()); @@ -640,7 +645,7 @@ public class PayController extends BaseFlowStartAction { BizObjectManager income_bom = JBOFactory.getBizObjectManager(LC_FUND_INCOME_TEMP.CLASS_NAME); BizObject income_bo = null ; tx.join(income_bom); - BizObjectQuery income_boo= income_bom.createQuery("select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE=:FEE_TYPE "); + BizObjectQuery income_boo= income_bom.createQuery("select * from o where CONTRACT_ID=:CONTRACT_ID and PAYMENT_NUMBER=:PAYMENT_NUMBER and PLAN_LIST=:PLAN_LIST and FLOWUNID=:FLOWUNID and PAY_TYPE=:PAY_TYPE and FEE_TYPE=:FEE_TYPE and PLAN_ID=:PLAN_ID "); for (BizObject pay_detail_one : pay_detail_list) { if(DETAIL_YURREF.equals( pay_detail_one.getAttribute("YURREF").toString() )) { @@ -650,6 +655,7 @@ public class PayController extends BaseFlowStartAction { income_boo.setParameter("FLOWUNID",pay_detail_one.getAttribute("FLOWUNID").toString()) ; income_boo.setParameter("PAY_TYPE",pay_detail_one.getAttribute("PAY_TYPE").toString()) ; income_boo.setParameter("FEE_TYPE",pay_detail_one.getAttribute("FEE_TYPE").toString()) ; + income_boo.setParameter("PLAN_ID",pay_detail_one.getAttribute("PLAN_ID").toString()) ; income_bo = income_boo.getSingleResult(true) ; income_bo.setAttributeValue("BANK_SQRNBR",detail.getSQRNBR()); income_bo.setAttributeValue("BANK_REQNBR",detail.getREQNBR()); @@ -662,6 +668,7 @@ public class PayController extends BaseFlowStartAction { callback_detail_bo.setAttributeValue("FLOWUNID",pay_detail_one.getAttribute("FLOWUNID").toString()); callback_detail_bo.setAttributeValue("PAY_TYPE",pay_detail_one.getAttribute("PAY_TYPE").toString()); callback_detail_bo.setAttributeValue("FEE_TYPE",pay_detail_one.getAttribute("FEE_TYPE").toString()); + callback_detail_bo.setAttributeValue("PLAN_ID",pay_detail_one.getAttribute("PLAN_ID").toString()); } } } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerTempToFormalBusiness.java index 722687041..bdf847888 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerTempToFormalBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerTempToFormalBusiness.java @@ -196,7 +196,7 @@ public class LBCustomerTempToFormalBusiness extends BaseBussiness { DataOperatorUtil.copyJBOSet(CUSTOMER_CERT.CLASS_NAME, fromCondition, CUSTOMER_CERT_HIS.CLASS_NAME, null, other, null, Sqlca); DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondition, CUSTOMER_FAMILY_HIS.CLASS_NAME, null, other, null, Sqlca); DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS.CLASS_NAME, fromCondition, CUSTOMER_ADDRESS_HIS.CLASS_NAME, null, other, null, Sqlca); - other.put("proj_id", union.getAttribute("PROJECT_ID").getString()); + //other.put("proj_id", union.getAttribute("PROJECT_ID").getString()); DataOperatorUtil.copyJBOSet(CUSTOMER_INFO.CLASS_NAME, fromCondition, CUSTOMER_INFO_HIS.CLASS_NAME, null, other, null, Sqlca); } @@ -218,7 +218,7 @@ public class LBCustomerTempToFormalBusiness extends BaseBussiness { DataOperatorUtil.copyJBOSet(CUSTOMER_CERT.CLASS_NAME, fromCondition, CUSTOMER_CERT_HIS.CLASS_NAME, null, other, null, Sqlca); DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondition, CUSTOMER_FAMILY_HIS.CLASS_NAME, null, other, null, Sqlca); DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS.CLASS_NAME, fromCondition, CUSTOMER_ADDRESS_HIS.CLASS_NAME, null, other, null, Sqlca); - other.put("proj_id", unit.getAttribute("PROJECT_ID").getString()); + //other.put("proj_id", unit.getAttribute("PROJECT_ID").getString()); DataOperatorUtil.copyJBOSet(CUSTOMER_INFO.CLASS_NAME, fromCondition, CUSTOMER_INFO_HIS.CLASS_NAME, null, other, null, Sqlca); } diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/FileObjectSetPhone.java b/src_tenwa/com/tenwa/lease/flow/project/validate/FileObjectSetPhone.java new file mode 100644 index 000000000..c2c97c7f4 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/validate/FileObjectSetPhone.java @@ -0,0 +1,52 @@ +package com.tenwa.lease.flow.project.validate; + + +import java.io.Serializable; + +public class FileObjectSetPhone implements Serializable { + + //授权文件内容 + private String license=null; + //上传的条件excel文件 + private byte[] file=null; + //接收信息 + private String info=null; + //文件类型:xls + private String type=null; + + public FileObjectSetPhone() { + super(); + } + + public String getLicense() { + return license; + } + + public void setLicense(String license) { + this.license = license; + } + + public byte[] getFile() { + return file; + } + + public void setFile(byte[] file) { + this.file = file; + } + + + public String getInfo() { + return info; + } + + public void setInfo(String info) { + this.info = info; + } + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } +} diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java b/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java new file mode 100644 index 000000000..cafa628f7 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java @@ -0,0 +1,80 @@ +package com.tenwa.lease.flow.project.validate; + +import java.io.InputStream; +import java.net.URLDecoder; +import java.util.List; +import java.util.Properties; +import org.apache.commons.codec.binary.Base64; +import org.dom4j.Document; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP; +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; + +public class IdentityVerification { + + private String id; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String doIdentityVerification(JBOTransaction tx){ + try { + BizObjectManager bom1 = JBOFactory.getBizObjectManager(CUSTOMER_PERSON_TEMP.CLASS_NAME,tx); + BizObject identityObject = bom1.createQuery("ID=:id").setParameter("id", id).getSingleResult(false); + //读取授权文件,因为其他方法都读取不到,只能通过此方法 + Properties prop = new Properties(); + InputStream in= IdentityVerification.class.getClassLoader().getResourceAsStream("license.properties"); + prop.load(in); + String property = prop.getProperty("key"); + Base64 base64 = new Base64(); + String msg = new String(base64.decode(property.getBytes("utf-8")),"utf-8"); + String decode = URLDecoder.decode(msg,"utf-8"); + char[] charArray = decode.toCharArray(); + charArray[16]='+'; + decode = new String(charArray); + String inConditions = SoapRequest.XMLConfiguration(identityObject.getAttribute("CERTID").getString(),identityObject.getAttribute("FULLNAME").getString()); + String result = NciicClient.executeClient("NciicServices",decode,inConditions); + Document document = DocumentHelper.parseText(result); + Element rootElement = document.getRootElement(); + String finalResult = ""; + StringBuffer sb = new StringBuffer(); + if("RESPONSE".equals(rootElement.getName())){ + Element rowElement = rootElement.element("ROWS").element("ROW"); + @SuppressWarnings("unchecked") + List elements = rowElement.elements(); + for(Element element:elements){ + sb.append(element.getText()+","); + } + String message = sb.toString().split(",")[1]; + finalResult = "验证失败:"+message; + }else if("ROWS".equals(rootElement.getName())){ + @SuppressWarnings("unchecked") + List itemElement = rootElement.element("ROW").element("OUTPUT").elements("ITEM"); + @SuppressWarnings("unchecked") + List resultElement1 = itemElement.get(0).elements(); + @SuppressWarnings("unchecked") + List resultElement2= itemElement.get(1).elements(); + if("errormesage".equals(resultElement1.get(0).getName())){ + finalResult = "错误信息:"+ resultElement1.get(0).getText()+",错误字段:" + + resultElement2.get(0).getText(); + }else if("gmsfhm".equals(resultElement1.get(0).getName())){ + finalResult = "身份证号码对比结果:"+ resultElement1.get(1).getText()+",姓名对比结果:" + + resultElement2.get(1).getText(); + } + } + return finalResult; + } catch (Exception e) { + e.printStackTrace(); + return "ERROR"; + } + } +} diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/NciicClient.java b/src_tenwa/com/tenwa/lease/flow/project/validate/NciicClient.java new file mode 100644 index 000000000..cfcc9fa97 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/validate/NciicClient.java @@ -0,0 +1,80 @@ +package com.tenwa.lease.flow.project.validate; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.lang.reflect.Proxy; +import java.net.MalformedURLException; + +import org.apache.commons.httpclient.protocol.Protocol; +import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; +import org.codehaus.xfire.client.Client; +import org.codehaus.xfire.client.XFireProxy; +import org.codehaus.xfire.client.XFireProxyFactory; +import org.codehaus.xfire.service.Service; +import org.codehaus.xfire.service.binding.ObjectServiceFactory; +import org.codehaus.xfire.transport.http.CommonsHttpMessageSender; +import org.codehaus.xfire.transport.http.EasySSLProtocolSocketFactory; +import org.codehaus.xfire.util.dom.DOMOutHandler; + +public class NciicClient { + + public static final String SERVICE_URL = "https://ws.nciic.org.cn/nciic_ws/services/"; + /*public NciicClient() { + }*/ + public static void main(String[] args) throws MalformedURLException { + + try{ + + String IDNo = "140225199408171330"; + + String username = "张磊"; + + String license = ReadFile.ReadLine("D://app//license.txt"); + System.out.println(license); + String inConditions = SoapRequest.XMLConfiguration(IDNo, username); + + new NciicClient().executeClient("NciicServices", license , inConditions); + + }catch(Exception e){ + e.printStackTrace(); + } + } + public static String executeClient(String serviceName, String license, String condition) + throws MalformedURLException { + long time = System.currentTimeMillis(); + //调用生产环境接口时,需要采用https + ProtocolSocketFactory easy = new EasySSLProtocolSocketFactory(); + Protocol protocol = new Protocol("https", easy, 443); + Protocol.registerProtocol("https", protocol); + //--核心服务NciicServices + Service serviceModel = new ObjectServiceFactory().create(ServiceInf.class, serviceName, null, null); + ServiceInf service = (ServiceInf) new XFireProxyFactory().create(serviceModel, SERVICE_URL + serviceName); + Client client = ((XFireProxy) Proxy.getInvocationHandler(service)).getClient(); + client.addOutHandler(new DOMOutHandler()); + client.setProperty(CommonsHttpMessageSender.GZIP_ENABLED, Boolean.TRUE); + // 忽略超时 + client.setProperty(CommonsHttpMessageSender.HTTP_TIMEOUT, "0"); + String result = null; + try { + + /** + * 调用方法,针对不同的方法记得修改此处。否则报错 + */ + result = service.nciicCheck(license, condition); + + System.out.println( result); + } catch (FileNotFoundException e){ + e.printStackTrace(); + } catch (IOException e){ + e.printStackTrace(); + } catch (Exception e){ + e.printStackTrace(); + } + time = System.currentTimeMillis() - time; + System.out.println("------out time -----"+time); + return result; + } +} diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/ServLtVO.java b/src_tenwa/com/tenwa/lease/flow/project/validate/ServLtVO.java new file mode 100644 index 000000000..2403e6527 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/validate/ServLtVO.java @@ -0,0 +1,112 @@ +package com.tenwa.lease.flow.project.validate; +/** + * + * 属性类 + * @author zhangjieying + * + */ +public class ServLtVO { + /** + * 任务序列号 + */ + private String xlh; + /** + * 条件文件或结果文件 + */ + private byte[] fileBytes; + /** + * 文件状态 + */ + private String wjzt; + + String bh = null;//原编号 + String mc = null;//原单位名称 + String dz = null;//原地址 + String dh = null;//原电话 + String dwmc = null;//单位名称 + String dwdz = null;//单位地址 + String ppbz = null;//匹配标志 + String dhbz = null;//电话标志 + String xltbz = null;//小灵通标志 + String xsmc = null;//显示名称 + + public byte[] getFileBytes() { + return fileBytes; + } + public void setFileBytes(byte[] fileBytes) { + this.fileBytes = fileBytes; + } + public String getWjzt() { + return wjzt; + } + public void setWjzt(String wjzt) { + this.wjzt = wjzt; + } + public String getXlh() { + return xlh; + } + public void setXlh(String xlh) { + this.xlh = xlh; + } + public String getBh() { + return bh; + } + public void setBh(String bh) { + this.bh = bh; + } + public String getMc() { + return mc; + } + public void setMc(String mc) { + this.mc = mc; + } + public String getDz() { + return dz; + } + public void setDz(String dz) { + this.dz = dz; + } + public String getDh() { + return dh; + } + public void setDh(String dh) { + this.dh = dh; + } + public String getDwmc() { + return dwmc; + } + public void setDwmc(String dwmc) { + this.dwmc = dwmc; + } + public String getDwdz() { + return dwdz; + } + public void setDwdz(String dwdz) { + this.dwdz = dwdz; + } + public String getPpbz() { + return ppbz; + } + public void setPpbz(String ppbz) { + this.ppbz = ppbz; + } + public String getDhbz() { + return dhbz; + } + public void setDhbz(String dhbz) { + this.dhbz = dhbz; + } + public String getXltbz() { + return xltbz; + } + public void setXltbz(String xltbz) { + this.xltbz = xltbz; + } + public String getXsmc() { + return xsmc; + } + public void setXsmc(String xsmc) { + this.xsmc = xsmc; + } + +} diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/ServiceInf.java b/src_tenwa/com/tenwa/lease/flow/project/validate/ServiceInf.java new file mode 100644 index 000000000..50ec4ca05 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/validate/ServiceInf.java @@ -0,0 +1,90 @@ +package com.tenwa.lease.flow.project.validate; + +import javax.tools.FileObject; +/** + *

+ * Title: 核心服务web service 接口 + *

+ *

+ * Description: 升级改造项目 + *

+ *

+ * Copyright: 2008-2010 + *

+ *

+ * Company: NCIIC + *

+ * + * + * @author ZJS + * @version 2008年 + */ +public interface ServiceInf { + //住址模糊截取 + public String nciicAddrExactSearch(String inLicense, String inConditions)throws Exception; + + // 核查 + public String nciicCheck(String inLicense, String inConditions)throws Exception; + + // 比对 + public String nciicCompare(String inLicense, String inConditions)throws Exception; + + // 组合查询 + public String nciicExactSearch(String inLicense, String inConditions)throws Exception; + /*“nciicCourt” 组合多项核查方法,主要是高法院的姓名批量查询,根据需要的查询年限范围,大于1年时,则调用此方法。 + *目前未使用此方法,因为高法院的协议查询年限范围是1年,年限范围可以登录nciic系统【服务管理】——>【系统参数】——>【姓名多项核查出生日期年限范围】代码07 + */ + public String nciicCourt(String inLicense,String inConditions) throws Exception; + // 精确查询 + public String nciicCombineSearch(String inLicense, String inConditions)throws Exception; + + // 统计分析 + public String nciicStat(String inLicense, String inConditions)throws Exception; + + // 二代证读卡器调用方法 + public String nciicDiscern(String inLicense, String inConditions)throws Exception; + + // 取得条件文件模板 + public String nciicGetCondition(String inLicense) throws Exception; + + //中国银行--流水号 + public String nciicCheckChina(String inLicense, String inConditions)throws Exception; + + // 天创旅客身份核查 + public String nciicCheckHotel(String inLicense, String inConditions)throws Exception; + + //籍贯比对 + public String nciicBirthplaceCompare(String inLicense, String inConditions) throws Exception; + + // 网闸特殊接口 + public String nciicCheckFile(FileObject fileObject) throws Exception; + // 网闸特殊接口获取结果文件接口 + public FileObject nciicGetFile(String inLicense, String id) throws Exception; + + //同名同性 + public String tmtx(java.lang.String licensecode, java.lang.String condition) throws Exception; + + //--天创便携式手机核查 + public String nciicCheckMobile(String inLicense, String inConditions)throws Exception; + + //网民认证 + public String wmrzCheck(String inLicense, String inConditions)throws Exception; + + // 联通数据特殊接口 + public FileObjectSetPhone nciicCheckSetPhone(FileObjectSetPhone fileObject) throws Exception; + public FileObjectSetPhone nciicCheckGetPhone(String inLicense, String id) throws Exception; + + //扫描仪 + public String nciicCheckScan(String inLicense, String inConditions,String keys)throws Exception; + + public ServLtVO chinaUnicomGetPhone(ServLtVO vo) throws Exception; + + public String faceProxy(int compressFlag,String galleryBase64Image, + int galleryMaxHeight,int galleryMaxSize, + String probeBase64Image,int probeImgType, + int probeMaxHeight,int probeMaxSize)throws Exception; + + public String nciicDateCollection(String inLicense, String inConditions)throws Exception; + + +} diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java b/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java new file mode 100644 index 000000000..2c250744f --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java @@ -0,0 +1,53 @@ +package com.tenwa.lease.flow.project.validate; + +public class SoapRequest { + + public static String XMLConfiguration(String IDNo,String username) throws Exception { + //WebService接口地址? + //String wsdl = "https://ws.nciic.org.cn/nciic_ws/services/NciicServices"; + //int timeout = 10000; + StringBuffer sb = new StringBuffer(""); + //拼接soap请求的xml + //sb.append(""); + /*sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append("");*/ + //sb.append(""); + sb.append(""); + sb.append(""); + sb.append("安鹏国际融资租赁有限公司"); + sb.append(""); + sb.append(""); + sb.append("公民身份号码"); + sb.append("姓名"); + sb.append(""); + sb.append(""); + //入参身份证号码 + sb.append(""+IDNo+""); + //入参姓名 + sb.append(""+username+""); + sb.append(""); + sb.append(""); + //sb.append("]]>"); + /* sb.append(""); + sb.append(""); + sb.append("");*/ + + //System.out.println(sb); + //HttpClient发送SOAP请求 + System.out.println("HttpClient 发送SOAP请求"); + + String xmldata = sb.toString(); + //System.out.println(xmldata); + return xmldata; + } +}