From 683214963fe7ba60698fdcc7591720a53de80fa8 Mon Sep 17 00:00:00 2001 From: tangft <32189@DESKTOP-M6TAG3K> Date: Fri, 28 Dec 2018 20:25:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=B8=9A=E5=8A=A1=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Comm/LBDebitCard/DebitCardInfo.jsp | 22 +++--- .../LBIdentityCheck/LBCarIdentityCheck.jsp | 13 +++- .../LBIdentityCheckResultTemp.jsp | 4 +- .../LBCarCreditRiskShow.jsp | 12 ++-- .../LBCarCreditTempList.jsp | 3 +- .../Flow/Comm/LBTelOnline/LbTelOnlinList.jsp | 2 +- .../BusinessChangeApplyList.jsp | 7 +- .../BusinessProjectTempInfo.jsp | 10 +-- WebContent/WEB-INF/etc/jbo/jbo_customer.xml | 7 +- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 40 ++++++++++- .../comm/credit/CreditBodyGuardAction.java | 6 +- ...yCheckFormalToTempInformationBusiness.java | 54 +++++++++++++++ ...yCheckTempToFormalInformationBusiness.java | 54 +++++++++++++++ ...LBProCustomerRelaTempToFormalBusiness.java | 68 +++++++++++++++++++ .../flow/project/validate/OnlineClient.java | 44 ++++++------ .../impl/McontractServiceImpl.java | 20 ++---- 16 files changed, 302 insertions(+), 64 deletions(-) create mode 100644 src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBIdentityCheckFormalToTempInformationBusiness.java create mode 100644 src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBIdentityCheckTempToFormalInformationBusiness.java create mode 100644 src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProCustomerRelaTempToFormalBusiness.java diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index e04b5096e..9ac67a2e1 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -147,16 +147,18 @@ return; } } - var contract_id= getItemValue(0,0,"contract_id"); - if(null!=contract_id&&contract_id!=""){ - contractid=contract_id; - } - setItemValue(0,0,"customerid",customerid); - setItemValue(0,0,"project_id",projectid); - if(contractid==""||contractid=="null"||contractid==null){ - setItemValue(0,0,"contract_id",""); - }else{ - setItemValue(0,0,"contract_id",contractid); + if("BusinessChangeApply"!="<%=ApplyType%>"){//业务变更，不需要修改customerid、project_id、contract_id + var contract_id= getItemValue(0,0,"contract_id"); + if(null!=contract_id&&contract_id!=""){ + contractid=contract_id; + } + setItemValue(0,0,"customerid",customerid); + setItemValue(0,0,"project_id",projectid); + if(contractid==""||contractid=="null"||contractid==null){ + setItemValue(0,0,"contract_id",""); + }else{ + setItemValue(0,0,"contract_id",contractid); + } } } iV_all("0"); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBIdentityCheck/LBCarIdentityCheck.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBIdentityCheck/LBCarIdentityCheck.jsp index 3a6d71fe5..cecbf4b5d 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBIdentityCheck/LBCarIdentityCheck.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBIdentityCheck/LBCarIdentityCheck.jsp @@ -51,7 +51,18 @@ } function viewAndEdit(){ var sUrl = "/Tenwa/Lease/Flow/Comm/LBIdentityCheck/LBIdentityCheckResultTemp.jsp"; - var sparam="FlowUnid="+'<%=sFlowUnid%>'; + var certids=getItemValueArray(0,"certId"); + var fullNames=getItemValueArray(0,"fullName"); + var certids=getItemValueArray(0,"certId"); + if(certids.length==0){ + alert("请先选择数据！！！"); + return; + }else if(certids.length>1){ + alert("每次只能查询一条数据，请重新选择！"); + reloadSelf(); + return; + } + var sparam="FlowUnid="+'<%=sFlowUnid%>'+"&fullName="+fullNames[0]+"&CertId="+certids[0]; AsControl.OpenView(sUrl,sparam,"_self",""); } diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBIdentityCheck/LBIdentityCheckResultTemp.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBIdentityCheck/LBIdentityCheckResultTemp.jsp index 40d93025b..42b6fec72 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBIdentityCheck/LBIdentityCheckResultTemp.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBIdentityCheck/LBIdentityCheckResultTemp.jsp @@ -6,12 +6,14 @@ History Log: */ String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 + String fullName = CurPage.getParameter("fullName");//流程编号 + String CertId = CurPage.getParameter("CertId");//流程编号 ASObjectModel doTemp = new ASObjectModel("LC_IDENTITY_CHECK_RESULT_TEMP"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 dwTemp.setPageSize(10); - dwTemp.genHTMLObjectWindow(sFlowUnid); + dwTemp.genHTMLObjectWindow(sFlowUnid+","+fullName+","+CertId); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditRiskShow.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditRiskShow.jsp index 89c4153ec..63817e295 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditRiskShow.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditRiskShow.jsp @@ -7,16 +7,18 @@ */ String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 String CertId = CurPage.getParameter("CertId");//查询条件编号 + String name = CurPage.getParameter("name");//查询条件编号 ASObjectModel doTemp = new ASObjectModel("LbCarCreditRiskShow"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 dwTemp.setPageSize(10); - String num = ""; - if(CertId == null){ - num = sFlowUnid; - }else{ - num = sFlowUnid+","+CertId; + String num = sFlowUnid; + if(CertId != null){ + num = sFlowUnid+","+CertId; + } + if(name!=null){ + num = sFlowUnid+","+CertId+","+name; } dwTemp.genHTMLObjectWindow(num); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditTempList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditTempList.jsp index b31b85e6b..a3f511707 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditTempList.jsp @@ -46,6 +46,7 @@ var sUrl = "/Tenwa/Lease/Flow/Comm/LBPreLoanAntiFraud/LBCarCreditRiskShow.jsp"; //var certid = getItemValue(0,getRow(0),"CERTID"); var certids=getItemValueArray(0,"certid"); + var names=getItemValueArray(0,"NAME"); var ids=getItemValueArray(0,"ID").toString(); if(certids.length==0){ alert("请先选择数据！！！"); @@ -61,7 +62,7 @@ return; } } - var sparam="FlowUnid="+"<%=sFlowUnid%>"+"&CertId="+certids[0]; + var sparam="FlowUnid="+"<%=sFlowUnid%>"+"&CertId="+certids[0]+"&name="+names[0]; AsControl.OpenView(sUrl,sparam,"_self",""); } diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp index c89869c72..2a3f5a56d 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp @@ -15,7 +15,7 @@ dwTemp.ReadOnly = "1"; //只读模式 dwTemp.setPageSize(10); dwTemp.MultiSelect = true; //添加多选框 - dwTemp.genHTMLObjectWindow(ProjectId); + dwTemp.genHTMLObjectWindow(ProjectId+","+flowunid); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp index 795c8c2a0..a5dca49fc 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp @@ -16,8 +16,13 @@ var product_id=sReturn[1]; var project_id = sReturn[2]; var project_name = sReturn[3]; + var CustomerType = sReturn[4]; + var carAttributes = sReturn[5]; + var leasehold = sReturn[6]; + var operationType = sReturn[7]; + var certtype = sReturn[8]; var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams =sParams+",ProjectId="+id+",ProductId="+product_id+",FlowKey="+project_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; + sParams =sParams+",certtype="+certtype+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",operationType="+operationType+",ProjectId="+id+",ProductId="+product_id+",FlowKey="+project_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; var sReturnInfos=sReturnInfo.split("@"); diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index aefa58b21..b9c43d69b 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -63,6 +63,7 @@ $(".info_mid_line").css("width","50%"); }) function save(){ + if(!checkinputName()){ return; } @@ -74,22 +75,23 @@ var inputName = getItemValue(0,getRow(),"inputName"); var inputTel = getItemValue(0,getRow(),"inputTel"); var customerType = "<%=custype%>"; + var customerT = "<%=customertype%>"; var projectNo=getItemValue(0,getRow(),"PROJECT_NO"); if(projectNo.length<=0){ alert("请填写业务申请编号！！！"); return; } var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","checkProjectNo","projectNo="+projectNo+",id="+getItemValue(0,getRow(),"ID")); - if("error"==sReturnInfo){ + /* if("error"==sReturnInfo){ alert("业务申请编号已被占用，请重新填写！！！"); return; - } - if(customerType=="01"){//法人 + } */ + if(customerType=="01"||customerT=="01"){//法人 //as_save("myiframe0","frame_list.window.saveCompany();"); frame_list.window.saveCompany(inputName,inputTel,projectNo); //as_save(0); } - if(customerType=="03"){//自然人 + if(customerType=="03"||customerT=="03"){//自然人 frame_list.window.saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo); //as_save("myiframe0","frame_list.window.as_save(0);"); } diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml index 13cf3fb50..a2f750212 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml @@ -2468,6 +2468,7 @@ + @@ -2482,6 +2483,7 @@ + @@ -2494,8 +2496,9 @@ + - + @@ -2721,6 +2724,7 @@ + @@ -2752,6 +2756,7 @@ + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index cd4f5d4e6..f9aba511f 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -4070,7 +4070,8 @@ - + + @@ -4094,7 +4095,8 @@ - + + @@ -4337,7 +4339,7 @@ - + @@ -4366,6 +4368,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java index a6c7ef5af..37c338ee1 100644 --- a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java +++ b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java @@ -124,7 +124,7 @@ public class CreditBodyGuardAction { } //遍历personList,将执行过信贷校验的放入alreadypersonList,没执行过的就放入failedpersonList BizObject queryListObject = bom3 - .createQuery("select FINAL_DECISION from O where certid = '"+personList.get(v).getAttribute("certId")+"' AND flowunid=:FLOWUNID") + .createQuery("select FINAL_DECISION from O where certid = '"+personList.get(v).getAttribute("certId")+"' and fullname='"+personList.get(v).getAttribute("fullName")+"' AND flowunid=:FLOWUNID") .setParameter("FLOWUNID",flowunid).getSingleResult(false); if(queryListObject != null){ alreadypersonList.add(queryListObject); @@ -140,7 +140,7 @@ public class CreditBodyGuardAction { }else{ //遍历failedpersonList并查询Info表,二次校验查看在此次流程阶段是否已经执行信贷校验 for(int m=0;mfromCondtion=new HashMap(); + fromCondtion.put("projectid",this.getAttribute("ProjectId").toString()); + MapotherProperty=new HashMap(); + otherProperty.put("flowunid",this.getAttribute("FlowUnid").toString()); + //身份证校验表从临时到正式表 + DataOperatorUtil.copyJBOSet(LC_IDENTITY_CHECK_RESULT.CLASS_NAME, fromCondtion,LC_IDENTITY_CHECK_RESULT_TEMP.CLASS_NAME, null, otherProperty,null, Sqlca); + DataOperatorUtil.copyJBOSet(LB_CAR_CREDIT_PERSONAL_INFO.CLASS_NAME, fromCondtion,LB_CAR_CREDIT_PERSONAL_INFO_TEMP.CLASS_NAME, null, otherProperty,null, Sqlca); + DataOperatorUtil.copyJBOSet(LB_CAR_CREDIT_RISKITEM.CLASS_NAME, fromCondtion,LB_CAR_CREDIT_RISKITEM_TEMP.CLASS_NAME, null, otherProperty,null, Sqlca); + fromCondtion.clear(); + fromCondtion.put("PROJECT_ID",this.getAttribute("ProjectId").toString()); + DataOperatorUtil.copyJBOSet(LB_TELONLINE.CLASS_NAME, fromCondtion,LB_TELONLINE_TEMP.CLASS_NAME, null, otherProperty,null, Sqlca); + + String sMessage="true"; + return sMessage; + } + +} diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBIdentityCheckTempToFormalInformationBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBIdentityCheckTempToFormalInformationBusiness.java new file mode 100644 index 000000000..269e9929f --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBIdentityCheckTempToFormalInformationBusiness.java @@ -0,0 +1,54 @@ +package com.tenwa.lease.flow.project.commbusiness; + +import java.util.HashMap; +import java.util.Map; + +import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; +import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_TEMP; +import jbo.app.tenwa.customer.CUSTOMER_FAMILY; +import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP; +import jbo.app.tenwa.customer.LB_CAR_CREDIT_PERSONAL_INFO; +import jbo.app.tenwa.customer.LB_CAR_CREDIT_PERSONAL_INFO_TEMP; +import jbo.app.tenwa.customer.LB_CAR_CREDIT_RISKITEM; +import jbo.app.tenwa.customer.LB_CAR_CREDIT_RISKITEM_TEMP; +import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT; +import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_HIS; +import jbo.com.tenwa.lease.comm.LB_TELONLINE; +import jbo.com.tenwa.lease.comm.LB_TELONLINE_TEMP; +import jbo.com.tenwa.lease.comm.LC_IDENTITY_CHECK_RESULT; +import jbo.com.tenwa.lease.comm.LC_IDENTITY_CHECK_RESULT_TEMP; + +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.date.DateAssistant; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.baseBussion.BaseBussiness; +import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService; +import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum; +import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp; + +public class LBIdentityCheckTempToFormalInformationBusiness extends BaseBussiness { + + /** + * 身份校验信息从临时表到正式表 + */ + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + LeaseFlowBaseService service=new LeaseFlowBaseServiceImp(); + MapfromCondtion=new HashMap(); + fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString()); + MapotherProperty=new HashMap(); + otherProperty.put("projectid",this.getAttribute("ProjectId").toString()); + //身份证校验表从临时到正式表 + DataOperatorUtil.copyJBOSet(LC_IDENTITY_CHECK_RESULT_TEMP.CLASS_NAME, fromCondtion,LC_IDENTITY_CHECK_RESULT.CLASS_NAME, null, otherProperty,null, Sqlca); + DataOperatorUtil.copyJBOSet(LB_CAR_CREDIT_PERSONAL_INFO_TEMP.CLASS_NAME, fromCondtion,LB_CAR_CREDIT_PERSONAL_INFO.CLASS_NAME, null, otherProperty,null, Sqlca); + DataOperatorUtil.copyJBOSet(LB_CAR_CREDIT_RISKITEM_TEMP.CLASS_NAME, fromCondtion,LB_CAR_CREDIT_RISKITEM.CLASS_NAME, null, otherProperty,null, Sqlca); + otherProperty.clear(); + otherProperty.put("PROJECT_ID",this.getAttribute("ProjectId").toString()); + DataOperatorUtil.copyJBOSet(LB_TELONLINE_TEMP.CLASS_NAME, fromCondtion,LB_TELONLINE.CLASS_NAME, null, otherProperty,null, Sqlca); + + String sMessage="true"; + return sMessage; + } + +} diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProCustomerRelaTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProCustomerRelaTempToFormalBusiness.java new file mode 100644 index 000000000..a02aeb136 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProCustomerRelaTempToFormalBusiness.java @@ -0,0 +1,68 @@ +package com.tenwa.lease.flow.project.commbusiness; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import jbo.app.tenwa.customer.CUSTOMER_ADDRESS; +import jbo.app.tenwa.customer.CUSTOMER_ADDRESS_TEMP; +import jbo.app.tenwa.customer.CUSTOMER_CERT; +import jbo.app.tenwa.customer.CUSTOMER_CERT_TEMP; +import jbo.app.tenwa.customer.CUSTOMER_COMPANY; +import jbo.app.tenwa.customer.CUSTOMER_COMPANY_TEMP; +import jbo.app.tenwa.customer.CUSTOMER_FAMILY; +import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP; +import jbo.app.tenwa.customer.CUSTOMER_INFO; +import jbo.app.tenwa.customer.CUSTOMER_INFO_TEMP; +import jbo.app.tenwa.customer.CUSTOMER_PERSON; +import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP; +import jbo.app.tenwa.customer.CUSTOMER_TYPE; +import jbo.app.tenwa.customer.CUSTOMER_TYPE_TEMP; +import jbo.com.tenwa.lease.comm.VI_CUST_TENANT; +import jbo.com.tenwa.lease.comm.CUST_PERSON_HIS; +import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT; +import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE; +import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.baseBussion.BaseBussiness; +import com.tenwa.lease.flow.project.businessapply.CustomerCompare; + +public class LBProCustomerRelaTempToFormalBusiness extends BaseBussiness { + + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + MapfromCondtion=new HashMap(); + fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString()); + List lults= DataOperatorUtil.getSetJBO(LB_UNION_LESSEE_TEMP.CLASS_NAME, fromCondtion, Sqlca); + MaptoCondtion=new HashMap(); + CustomerCompare cc=new CustomerCompare(); + MapotherProperty=new HashMap(); + otherProperty.put("customerid", lults.size()>0?lults.get(0).getAttribute("customer_id").toString():UUID.randomUUID().toString().replaceAll("-", "")); + DataOperatorUtil.copyJBOSet(CUSTOMER_INFO_TEMP.CLASS_NAME, fromCondtion,CUSTOMER_INFO.CLASS_NAME, null,otherProperty,cc, Sqlca); + DataOperatorUtil.copyJBOSet(CUSTOMER_TYPE_TEMP.CLASS_NAME, fromCondtion,CUSTOMER_TYPE.CLASS_NAME, null,otherProperty,cc, Sqlca); + for(BizObject union:lults){ + fromCondtion.clear(); + fromCondtion.put("customerid", union.getAttribute("customer_id").getString()); + fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString()); + toCondtion.clear(); + toCondtion.put("customerid", union.getAttribute("customer_id").getString()); + if("03".equals(this.getAttribute("customertype").toString())){ + DataOperatorUtil.copyJBOSet(CUSTOMER_PERSON_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_PERSON.CLASS_NAME, toCondtion, null, cc, Sqlca); + }else{ + DataOperatorUtil.copyJBOSet(CUSTOMER_COMPANY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_COMPANY.CLASS_NAME, toCondtion, null, cc, Sqlca); + } + DataOperatorUtil.copyJBOSet(CUSTOMER_CERT_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_CERT.CLASS_NAME, toCondtion, null, cc, Sqlca); + DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY.CLASS_NAME, toCondtion, null, cc, Sqlca); + DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_ADDRESS.CLASS_NAME, toCondtion, null, cc, Sqlca); + } + String sMessage="true"; + return sMessage; + } +} \ No newline at end of file diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/OnlineClient.java b/src_tenwa/com/tenwa/lease/flow/project/validate/OnlineClient.java index 57a4fd569..77d020e67 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/validate/OnlineClient.java +++ b/src_tenwa/com/tenwa/lease/flow/project/validate/OnlineClient.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import jbo.com.tenwa.lease.comm.LB_TELONLINE; +import jbo.com.tenwa.lease.comm.LB_TELONLINE_TEMP; import org.apache.http.HttpEntity; import org.apache.http.NameValuePair; @@ -141,7 +141,7 @@ public class OnlineClient { Object reason_code = mapTypes.get("reason_code"); Object reason_desc = mapTypes.get("reason_desc"); //更新需要重发的数据 - JBOFactory.getBizObjectManager(LB_TELONLINE.CLASS_NAME, tx).createQuery("update O set success='"+success+"',result_desc='"+result_desc+"'," + JBOFactory.getBizObjectManager(LB_TELONLINE_TEMP.CLASS_NAME, tx).createQuery("update O set success='"+success+"',result_desc='"+result_desc+"'," + "mobile_online_time_info='"+mobile_online_time_info+"',mobile_online_time_consistence='"+mobile_online_time_consistence+"'," + "nextService='"+nextService+"',reason_code='"+reason_code+"',reason_desc='"+reason_desc+"',UPDATEUSERID=:userid,UPDATEORGID=:orgid,UPDATETIME=:uptime where online_id=:id") .setParameter("id", onLineId).setParameter("userid",userId).setParameter("orgid",user.getOrgID()).setParameter("uptime",StringFunction.getTodayNow()) @@ -150,7 +150,7 @@ public class OnlineClient { Object reason_code = mapTypes.get("reason_code"); Object reason_desc = mapTypes.get("reason_desc"); //更新需要重发的数据 - JBOFactory.getBizObjectManager(LB_TELONLINE.CLASS_NAME, tx).createQuery("update O set success='"+success+"'" + JBOFactory.getBizObjectManager(LB_TELONLINE_TEMP.CLASS_NAME, tx).createQuery("update O set success='"+success+"'" + ",reason_code='"+reason_code+"',reason_desc='"+reason_desc+"',UPDATEUSERID=:userid,UPDATEORGID=:orgid,UPDATETIME=:uptime where online_id=:id") .setParameter("id", onLineId).setParameter("userid",userId).setParameter("orgid",user.getOrgID()).setParameter("uptime",StringFunction.getTodayNow()) .executeUpdate(); @@ -181,43 +181,45 @@ public class OnlineClient { String certid = ds.get(i).get("certid"); String name = ds.get(i).get("name"); String phone = ds.get(i).get("phone"); - BizObjectManager ltbom = JBOFactory.getBizObjectManager(LB_TELONLINE.CLASS_NAME, tx); - BizObject lton = ltbom.createQuery("PERSON_ID=:PERSON_ID and PROJECT_ID=:projectid").setParameter(LB_TELONLINE.PERSON_ID, certid).setParameter("projectid", projectId).getSingleResult(true); + BizObjectManager ltbom = JBOFactory.getBizObjectManager(LB_TELONLINE_TEMP.CLASS_NAME, tx); + BizObject lton = ltbom.createQuery("PERSON_ID=:PERSON_ID and PROJECT_ID=:projectid and USER_NAME=:USER_NAME and TELEPHONE=:TELEPHONE").setParameter(LB_TELONLINE_TEMP.PERSON_ID, certid).setParameter("projectid", projectId) + .setParameter(LB_TELONLINE_TEMP.USER_NAME, name).setParameter(LB_TELONLINE_TEMP.TELEPHONE, phone).getSingleResult(true); Map mapTypes =null; //1.不存在则新增 if(lton==null){ String jsonStr = postOnLine(phone,"",""); mapTypes = JSON.parseObject(jsonStr); lton = ltbom.newObject(); - lton.setAttributeValue(LB_TELONLINE.PROJECT_ID, projectId); - lton.setAttributeValue(LB_TELONLINE.PERSON_ID, certid); - lton.setAttributeValue(LB_TELONLINE.USER_NAME, name); - lton.setAttributeValue(LB_TELONLINE.TELEPHONE, phone); + lton.setAttributeValue(LB_TELONLINE_TEMP.PROJECT_ID, projectId); + lton.setAttributeValue(LB_TELONLINE_TEMP.PERSON_ID, certid); + lton.setAttributeValue(LB_TELONLINE_TEMP.USER_NAME, name); + lton.setAttributeValue(LB_TELONLINE_TEMP.TELEPHONE, phone); }else{ //2.存在则重发 - String jsonStr = postOnLine(phone,lton.getAttribute(LB_TELONLINE.nextService).getString(),lton.getAttribute(LB_TELONLINE.online_id).getString()); + String jsonStr = postOnLine(phone,lton.getAttribute(LB_TELONLINE_TEMP.nextService).getString(),lton.getAttribute(LB_TELONLINE_TEMP.online_id).getString()); mapTypes = JSON.parseObject(jsonStr); } //2.1并根据响应回来的结果更新数据 - lton.setAttributeValue(LB_TELONLINE.success, mapTypes.get("success")); + lton.setAttributeValue(LB_TELONLINE_TEMP.success, mapTypes.get("success")); if("true".equals(mapTypes.get("success").toString())){ - lton.setAttributeValue(LB_TELONLINE.online_id, mapTypes.get("id")); - lton.setAttributeValue(LB_TELONLINE.result_desc, mapTypes.get("result_desc")); + lton.setAttributeValue(LB_TELONLINE_TEMP.online_id, mapTypes.get("id")); + lton.setAttributeValue(LB_TELONLINE_TEMP.result_desc, mapTypes.get("result_desc")); String result_desc = mapTypes.get("result_desc").toString(); Map MobileDuration = JSON.parseObject(JSON.parseObject(JSON.parseObject(result_desc).get("AUTHENTICATION_INFOQUERY").toString()).get("MobileDuration").toString()); if(MobileDuration.get("error_info")==null){ - lton.setAttributeValue(LB_TELONLINE.mobile_online_time_info, MobileDuration.get("mobile_online_time_info")); - lton.setAttributeValue(LB_TELONLINE.mobile_online_time_consistence, MobileDuration.get("mobile_online_time_consistence")); + lton.setAttributeValue(LB_TELONLINE_TEMP.mobile_online_time_info, MobileDuration.get("mobile_online_time_info")); + lton.setAttributeValue(LB_TELONLINE_TEMP.mobile_online_time_consistence, MobileDuration.get("mobile_online_time_consistence")); } //失败特有的参数 - lton.setAttributeValue(LB_TELONLINE.nextService, mapTypes.get("nextService")); + lton.setAttributeValue(LB_TELONLINE_TEMP.nextService, mapTypes.get("nextService")); } - lton.setAttributeValue(LB_TELONLINE.reason_code, mapTypes.get("reason_code")); - lton.setAttributeValue(LB_TELONLINE.reason_desc, mapTypes.get("reason_desc")); + lton.setAttributeValue(LB_TELONLINE_TEMP.reason_code, mapTypes.get("reason_code")); + lton.setAttributeValue(LB_TELONLINE_TEMP.reason_desc, mapTypes.get("reason_desc")); ASUser user = new ASUser(userId); - lton.setAttributeValue(LB_TELONLINE.INPUTUSERID, userId); - lton.setAttributeValue(LB_TELONLINE.INPUTORGID, user.getOrgID()); - lton.setAttributeValue(LB_TELONLINE.INPUTTIME, StringFunction.getTodayNow()); + lton.setAttributeValue(LB_TELONLINE_TEMP.INPUTUSERID, userId); + lton.setAttributeValue(LB_TELONLINE_TEMP.INPUTORGID, user.getOrgID()); + lton.setAttributeValue(LB_TELONLINE_TEMP.INPUTTIME, StringFunction.getTodayNow()); + lton.setAttributeValue(LB_TELONLINE_TEMP.FLOWUNID, flowunid); ltbom.saveObject(lton); } tx.commit(); diff --git a/src_tenwa/com/tenwa/makeContract/impl/McontractServiceImpl.java b/src_tenwa/com/tenwa/makeContract/impl/McontractServiceImpl.java index b52b10b82..dba5c2842 100644 --- a/src_tenwa/com/tenwa/makeContract/impl/McontractServiceImpl.java +++ b/src_tenwa/com/tenwa/makeContract/impl/McontractServiceImpl.java @@ -1,20 +1,14 @@ package com.tenwa.makeContract.impl; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.activation.FileDataSource; +import java.io.File; +import java.util.List; + + +import java.util.Map; import jbo.app.tenwa.calc.LC_FUND_INCOME; import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; -import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; import jbo.com.tenwa.entity.comm.flow.FLOW_WORK_FLAG; import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; import jbo.com.tenwa.lease.comm.LB_CONTRACT_STATUS; @@ -39,9 +33,8 @@ import com.tenwa.util.SerialNumberUtil; public class McontractServiceImpl implements McontractService{ - MakeOneCodeAndContractModel modc = new MakeOneCodeAndContractModel(); +// MakeOneCodeAndContractModel modc = new MakeOneCodeAndContractModel(); Configure CurConfig = Configure.getInstance(); - @Override public ReturnMessage Mcontract(String projectNo,String carNumber, String carNo,String Mstatus){ ReturnMessage rMage = new ReturnMessage(); if(projectNo==null||projectNo==""||projectNo.length()<=0){ @@ -196,6 +189,7 @@ public class McontractServiceImpl implements McontractService{ } public ReturnMessage changeContract(String projectNo,String carNumber, String carNo){ + MakeOneCodeAndContractModel modc = new MakeOneCodeAndContractModel(); ReturnMessage rMage = new ReturnMessage(); String tempid="";//模板id String sTemplateParam="{'CurUserId':'8006U00000003','CurOrgId':'8006003'";//生成word需要的参数