diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index a213c5511..b14736aa6 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -77,6 +77,7 @@ setItemValue(0,0,'bank_code',sReturn[0]); } setItemValue(0,0,'bank_type',sReturn[1]); + setItemValue(0,0,"bank_name",sReturn[1]); },"选择银行名称"); } //根据选择的用户名选择对应的证件号 @@ -286,8 +287,25 @@ } if (sflag != -1) { var name=bankName[sflag].substring(0,bankName[sflag].indexOf("·")); - setItemValue(0,getRow(),"bank_name",name); - } + if(name.indexOf("邮储") != -1 || name.indexOf("邮政") != -1){ + name = "邮政银行"; + } + var res = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "selectBankName", "bank_name="+name); + if("error"!= res){ + res = res.split("@"); + var bankCode = getItemValue(0, 0, "bank_code"); + if("<%=flowNo%>"=="BusinessApplyFlow"||(bankCode!=null&&bankCode!="")){ + setItemValue(0,0,'bank_code',res[0]); + } + + setItemValue(0,0,'bank_type',res[1]); + setItemValue(0,getRow(),"bank_name",res[1]); + } + }else{ + setItemValue(0,0,'bank_code',''); + setItemValue(0,0,'bank_type',''); + setItemValue(0,getRow(),"bank_name",''); + } setErrorTips("acc_number",""); return true; } diff --git a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java index dd0528664..b5a3b3ce5 100644 --- a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java +++ b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java @@ -268,6 +268,14 @@ public class DebitCardAction { //业务变更是否需要重新签约验证 public String checkSign(JBOTransaction tx) throws JBOException{ + //校验合同文件是否生成的，扣款卡不需要校验是否生成合同文件 + if(!"AccountChangeApply".equals(applyType)){ + BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); + List ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and ( flow_unid=:flowunid or contract_id=:contractid ) ").setParameter("flowunid", FlowUnid).setParameter("contractid", contractid).getResultList(false); + if(ldcls.size()>0){ + return "false"; + } + } //校验通联卡扣 if("BContractApproveApply".equals(applyType) || "BContractChangeApply".equals(applyType)||"AccountChangeApply".equals(applyType)){ BizObjectManager lcsshManage = JBOFactory.getFactory().getManager(LB_CARD_SIGN_STATUS_HIS.CLASS_NAME); @@ -291,14 +299,7 @@ public class DebitCardAction { } } } - //校验合同文件是否生成的，扣款卡不需要校验是否生成合同文件 - if(!"AccountChangeApply".equals(applyType)){ - BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); - List ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and ( flow_unid=:flowunid or contract_id=:contractid ) ").setParameter("flowunid", FlowUnid).setParameter("contractid", contractid).getResultList(false); - if(ldcls.size()>0){ - return "false"; - } - } + BizObjectManager cahManage = JBOFactory.getFactory().getManager(CUSTOMER_ACCOUNT_HIS.CLASS_NAME); List cahs = cahManage.createQuery(" sign_status='Y' and account=:account and acc_number=:acc_number and certid=:certid ") .setParameter("account", account).setParameter("acc_number", acc_number).setParameter("certid", certId).getResultList(false); @@ -444,6 +445,16 @@ public class DebitCardAction { return "获取状态失败！"; } + //根据名称显示数据字典的银行名称 + public String selectBankName(JBOTransaction tx) throws Exception{ + String sql="SELECT bank_code,bank_name from bank_code where is_use='Y' and LOCATE(bank_name,'"+bank_name+"')>0"; + List> data = DataOperatorUtil.getDataBySql(tx, sql, null); + if(data!=null&& data.size()>0){ + return data.get(0).get("bank_code")+"@"+data.get(0).get("bank_name"); + } + return "error"; + } + public String getMobile() { return mobile; } diff --git a/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql b/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql index 912823e6d..0884f9f05 100644 --- a/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql +++ b/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql @@ -181,8 +181,12 @@ Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescr delete from AWE_DO_CATALOG where dono='VILCRentPlanList'; Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('VILCRentPlanList','租金计划视图表',null,'30120',null,'1','1','default','jbo.loan.VI_RENT_COLLECT_4_EBANK','O left join jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR lec on O.contract_id=lec.contract_id and lec.car_attribute=''head'' left join jbo.com.tenwa.lease.comm.LB_CAR_LICENSE_PLATE_INFO lcl on lec.contract_id=lcl.contract_id and lec.frame_number=lcl.frame_number','O.businesstype=:businessType and O.subjectid=:subjectId and v.DATE_FORMAT(O.plan_date,''%Y%m'') <= v.DATE_FORMAT(v.SYSDATE(),''%Y%m'') and rent_over>0','','','com.tenwa.flow.rent.rentincome.VILCRentPlanListHandler',null,'SYS_Designer','2017/06/04 20:29:52','SYS_Designer','2020/11/18 10:15:22','','1',''); +-- 扣款渠道收取费费率维护添加通联扣款 +Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('charge_channel','tl','通联扣款','','0040','1','','','','','','','','','','','','SYS_Designer',null,'2020/11/30 16:10:37','SYS_Designer','2020/11/30 16:10:37','',''); +Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('charge_way','AutoBuckle_tl','通联卡扣','','0060','1','','','','tl','','','','','','','','SYS_Designer',null,'2020/11/30 16:17:14','SYS_Designer','2020/11/30 16:17:14','',''); - - +-- 需要在贝贝的代码后面执行 +-- 银行名称中添加是否启用字段 +Alter table bank_code add column is_use varchar(1) NULL COMMENT '是否使用' after bank_name;