diff --git a/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/InvoiceLeasebackTJListHasInvoiced.jsp b/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/InvoiceLeasebackTJListHasInvoiced.jsp index ebf4dc745..73c90c503 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/InvoiceLeasebackTJListHasInvoiced.jsp +++ b/WebContent/Tenwa/Core/InvoiceManager/InvoiceTJ/InvoiceLeasebackTJListHasInvoiced.jsp @@ -3,7 +3,7 @@ CurPage.setAttribute("leaseForm", "02"); ASObjectModel doTemp = new ASObjectModel("Invoice_TJ_Leaseback"); doTemp.appendJboWhere("li.status='Y'"); - doTemp.setColumnAttribute("plan_list,tax_no,fpdm,fphm,hztzdh,tax_code", "colvisible", "1"); + doTemp.setColumnAttribute("plan_list,fpdm,fphm,hztzdh,tax_code", "colvisible", "1"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/AccountChangeFlowDebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/AccountChangeFlowDebitCardInfo.jsp index b672c0674..f3e85536b 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/AccountChangeFlowDebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/AccountChangeFlowDebitCardInfo.jsp @@ -7,6 +7,8 @@ Content: 示例详情页面 History Log: */ + String userId = CurUser.getUserID(); + String orgId = CurUser.getOrgID(); String projectId = CurPage.getParameter("ProjectId"); String RightType=CurPage.getParameter("RightType"); String ishistory=CurPage.getParameter("IsHistory"); @@ -15,7 +17,8 @@ String customerId = CurPage.getParameter("customerId"); String FlowUnid=CurPage.getParameter("FlowUnid"); String contractId = CurPage.getParameter("ContractId"); - + String subjectId=CurPage.getParameter("SubjectId");//获取主体信息，用于是否签约查询 + String sTempletNo = "DebitCardInfoMcontract";//--模板号-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); doTemp.setHtmlEvent("acc_number", "onchange", "getNameOfBank"); @@ -101,7 +104,11 @@ } setErrorTips("acc_number",""); setItemValue(0,0,"acc_type","Debit"); - var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>,certId="+getItemValue(0,getRow(),"CERTID")+",applyType=<%=ApplyType%>"; + + //查询该申请号的扣款卡是否签约，如果已签约将对应的数据存入对应的记录表中 + RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "checkAccountSignStatus", "projectid=<%=projectId%>,userId=<%=userId%>,orgId=<%=orgId%>,applyType=<%=ApplyType%>"); + + var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>,certId="+getItemValue(0,getRow(),"CERTID")+",applyType=<%=ApplyType%>,subjectId=<%=subjectId%>,collect_type="+getItemValue(0,getRow(),"collect_type"); var meassge = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "checkSign", sparams); if("Y"==meassge){ setItemValue(0,0,"sign_status","Y"); @@ -127,13 +134,45 @@ sflag = i; } } + var bool = true; 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"); + setItemValue(0,0,'bank_code',res[0]); + setItemValue(0,0,'bank_type',res[1]); + setItemValue(0,0,"bank_name",res[1]); + setItemValue(0,0,"collect_type",res[2]); + bool = false; + } } + if(bool){ + setItemValue(0,0,'bank_code',''); + setItemValue(0,0,'bank_type',''); + setItemValue(0,0,"bank_name",''); + setItemValue(0,0,"collect_type",''); + } setErrorTips("acc_number",""); return true; } + + function selectBankType(){ + AsDialog.OpenSelector("selectBankType","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + if(!sReturn||sReturn=="_CANCEL_"){ + return; + } + sReturn = sReturn.split("@"); + setItemValue(0,0,'bank_code',sReturn[0]); + setItemValue(0,0,'bank_type',sReturn[1]); + setItemValue(0,0,"bank_name",sReturn[1]); + setItemValue(0,0,"collect_type",sReturn[2]); + },"选择银行名称"); + } <%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index ab559b529..0396eb093 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -22,6 +22,7 @@ String CustomerType=CurPage.getParameter("CustomerType"); String ApplyType=CurPage.getParameter("ApplyType"); String PhaseNo=CurPage.getParameter("PhaseNo"); + String subjectId=CurPage.getParameter("SubjectId");//获取主体信息，用于是否签约查询 BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); BizObject ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and ( flow_unid=:flowunid or contract_id=:contractid ) ").setParameter("flowunid", FlowUnid).setParameter("contractid", contractId).getSingleResult(false); System.out.print("=========="+ldcls+"=========="); @@ -72,7 +73,7 @@ return; } sReturn = sReturn.split("@"); - var bankCode = getItemValue(0, 0, "bank_code"); + //var bankCode = getItemValue(0, 0, "bank_code"); setItemValue(0,0,'bank_code',sReturn[0]); setItemValue(0,0,'bank_type',sReturn[1]); setItemValue(0,0,"bank_name",sReturn[1]); @@ -181,19 +182,22 @@ } } var project_id = getItemValue(0,0,"project_id"); - //校验对应的扣款卡是否签约，如果签约 - RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "checkAccountSignStatus", "projectid="+project_id+",userId=<%=userId%>,orgId=<%=orgId%>"); + if("BusinessApplyApply"!="<%=ApplyType%>"){//业务申请不用校验是否签约，因为业务申请没有办法签约。如果是签约状态也是从别的表拷贝的。 + //查询该申请号的扣款卡是否签约，如果已签约将对应的数据存入对应的记录表中 + RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "checkAccountSignStatus", "projectid="+project_id+",userId=<%=userId%>,orgId=<%=orgId%>,applyType=<%=ApplyType%>"); + } + if("BusinessApplyApply"=="<%=ApplyType%>"||"BusinessChangeApply"=="<%=ApplyType%>"||"BContractApproveApply"=="<%=ApplyType%>"||"BContractChangeApply"=="<%=ApplyType%>"){ - var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>,certId="+getItemValue(0,getRow(),"CERTID")+",applyType=<%=ApplyType%>"; - var meassge = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "checkSign", sparams); - if("false"==meassge){ - alert("合同已生成，请先删除合同再修改扣款卡信息！"); - return ; - }else if("Y"==meassge){ - setItemValue(0,0,"sign_status","Y"); - }else if("N"==meassge){ - setItemValue(0,0,"sign_status",""); - } + var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>,certId="+getItemValue(0,getRow(),"CERTID")+",applyType=<%=ApplyType%>,subjectId=<%=subjectId%>,collect_type="+getItemValue(0,getRow(),"collect_type"); + var meassge = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "checkSign", sparams); + if("false"==meassge){ + alert("合同已生成，请先删除合同再修改扣款卡信息！"); + return ; + }else if("Y"==meassge){ + setItemValue(0,0,"sign_status","Y"); + }else if("N"==meassge){ + setItemValue(0,0,"sign_status",""); + } } iV_all("0"); diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml index 72c2810eb..120c163c9 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml @@ -14,6 +14,7 @@ + @@ -3019,6 +3020,9 @@ + + + diff --git a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java index 6dafe2f02..8950ea9de 100644 --- a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java +++ b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java @@ -58,6 +58,7 @@ public class DebitCardAction { private String orgId; private String applyType; private String collect_type; + private String subjectId; public String getCustIdByFlowunid(JBOTransaction tx) throws JBOException{ String s=this.getFlowUnid(); @@ -277,41 +278,46 @@ public class DebitCardAction { return "false"; } } - //校验通联卡扣 - if("BContractApproveApply".equals(applyType) || "BContractChangeApply".equals(applyType)||"AccountChangeApply".equals(applyType)){ - BizObjectManager lcsshManage = JBOFactory.getFactory().getManager(LB_CARD_SIGN_STATUS_HIS.CLASS_NAME); - BizObject lcss = lcsshManage.createQuery(" tl_status='sign_status2' and account=:account and acc_number=:acc_number and certid=:certid and mobile=:mobile ") - .setParameter("account", account).setParameter("acc_number", acc_number).setParameter("certid", certId).setParameter("mobile", mobile).getSingleResult(false); - - BizObjectManager lcthManage = JBOFactory.getFactory().getManager(LC_CARD_TLSIGN.CLASS_NAME,tx); - BizObject lct = lcthManage.createQuery("PROJECT_ID=:project_id ").setParameter("project_id", projectid).getSingleResult(true); - if(lcss!=null){ - if(lct == null){ - lct = lcthManage.newObject(); - lct.setAttributeValue("PROJECT_ID", projectid); - } - lct.setAttributeValue("SIGN_STATUS", "sign_status2"); - lct.setAttributeValue("AGRMNO", lcss.getAttribute("AGRMNO").getString()); + //查询历史是否签约 + BizObjectManager lcsshManage = JBOFactory.getFactory().getManager(LB_CARD_SIGN_STATUS_HIS.CLASS_NAME); + BizObject lcss = lcsshManage.createQuery("select O.AGRMNO from O left join jbo.com.tenwa.lease.comm.LB_PROJECT_INFO lpi on lpi.id=O.project_id where O.tl_status='sign_status2' and O.account=:account and O.acc_number=:acc_number and O.certid=:certid and O.mobile=:mobile and O.sign_type=:sign_type and lpi.subjectid=:subjectId ") + .setParameter("account", account).setParameter("acc_number", acc_number).setParameter("certid", certId).setParameter("mobile", mobile).setParameter("sign_type", collect_type).setParameter("subjectId", subjectId).getSingleResult(false); + + //查询当前项目是否有对应的签约记录 + BizObjectManager lcthManage = JBOFactory.getFactory().getManager(LC_CARD_TLSIGN.CLASS_NAME,tx); + BizObject lct = lcthManage.createQuery("PROJECT_ID=:project_id ").setParameter("project_id", projectid).getSingleResult(true); + + //查看现有卡是否签约 + BizObject caAgrmno = lcthManage.createQuery("select O.AGRMNO from O left join jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca on ca.project_id=O.project_id left join jbo.com.tenwa.lease.comm.LB_PROJECT_INFO lpi on lpi.id=O.project_id where O.sign_status='sign_status2' and lpi.subjectid=:subjectid and O.sign_type=:sign_type and ca.acc_number=:acc_number and ca.certid=:certid and ca.mobile=:mobile ") + .setParameter("subjectId", subjectId).setParameter("sign_type", collect_type).setParameter("account", account).setParameter("acc_number", acc_number).setParameter("certid", certId).setParameter("mobile", mobile).getSingleResult(false); + + if(lcss!=null || caAgrmno!= null){ + if(lct == null){ + lct = lcthManage.newObject(); + lct.setAttributeValue("PROJECT_ID", projectid); + } + lct.setAttributeValue("SIGN_STATUS", "sign_status2"); + lct.setAttributeValue("sign_type", collect_type); + lct.setAttributeValue("AGRMNO", lcss!=null ? lcss.getAttribute("agrmno").getString(): caAgrmno.getAttribute("agrmno").getString()); + lcthManage.saveObject(lct); + }else{ + if(lct != null){ + lct.setAttributeValue("SIGN_STATUS", "sign_status4"); lcthManage.saveObject(lct); - }else{ - if(lct != null){ - lct.setAttributeValue("SIGN_STATUS", "sign_status4"); - lcthManage.saveObject(lct); - } } } - - 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); - if(cahs != null && cahs.size() > 0){ - return "Y"; - } - BizObjectManager caManage = JBOFactory.getFactory().getManager(CUSTOMER_ACCOUNT.CLASS_NAME); - List cas = caManage.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); - if(cas != null && cas.size() > 0){ - return "Y"; + if("YLcollect".equals(collect_type)){ + BizObjectManager cahManage = JBOFactory.getFactory().getManager(CUSTOMER_ACCOUNT_HIS.CLASS_NAME); + String sql ="select O.id from O left join jbo.com.tenwa.lease.comm.LB_PROJECT_INFO lpi on lpi.id=O.project_id where O.sign_status='Y' and O.account=:account and O.acc_number=:acc_number and O.certid=:certid and O.collect_type='YLcollect' and lpi.subjectid=:subjectid"; + List cahs = cahManage.createQuery(sql).setParameter("account", account).setParameter("acc_number", acc_number).setParameter("certid", certId).setParameter("subjectid", subjectId).getResultList(false); + if(cahs != null && cahs.size() > 0){ + return "Y"; + } + BizObjectManager caManage = JBOFactory.getFactory().getManager(CUSTOMER_ACCOUNT.CLASS_NAME); + List cas = caManage.createQuery(sql).setParameter("account", account).setParameter("acc_number", acc_number).setParameter("certid", certId).setParameter("subjectid", subjectId).getResultList(false); + if(cas != null && cas.size() > 0){ + return "Y"; + } } return "N"; } @@ -333,7 +339,7 @@ public class DebitCardAction { String date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); try { Sqlca =Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - selectSql="SELECT PROJECT_ID FROM CUSTOMER_ACCOUNT WHERE PROJECT_ID='"+projectid+"' AND ACC_NUMBER='"+acc_number+"' AND ACCOUNT='"+account+"' AND MOBILE='"+mobile+"' "; + selectSql="SELECT PROJECT_ID FROM CUSTOMER_ACCOUNT WHERE PROJECT_ID='"+projectid+"' AND ACC_NUMBER='"+acc_number+"' AND ACCOUNT='"+account+"' AND MOBILE='"+mobile+"' and bank_name='"+bank_name+"'"; List> dataList = DataOperatorUtil.getDataBySql(Sqlca, selectSql, null); if(dataList ==null || dataList.size()==0){ //查询中间表中是否有数据,CUSTOMER_ACCOUNT_MIDDLE表用户扣款卡信息变更后，签约短信发送用的 @@ -390,26 +396,20 @@ public class DebitCardAction { String account = cca.getAttribute("account").getString(); String mobile = cca.getAttribute("MOBILE").getString(); String certid = cca.getAttribute("certid").getString(); - BizObject lcssh = lcsshManager.createQuery(" acc_number=:acc_number and account=:account and mobile=:mobile and certid=:certid ") - .setParameter("acc_number", accNumber).setParameter("account", account).setParameter("mobile", mobile).setParameter("certid", certid).getSingleResult(true); - if(lcssh == null){ - lcssh = lcsshManager.newObject(); - lcssh.setAttributeValue("project_id", projectid); - lcssh.setAttributeValue("acc_number", accNumber); - lcssh.setAttributeValue("account", account); - lcssh.setAttributeValue("mobile", mobile); - lcssh.setAttributeValue("certid", certid); - lcssh.setAttributeValue("inputuserid", userId); - lcssh.setAttributeValue("inputorgid", orgId); - lcssh.setAttributeValue("inputtime", DateUtil.getSystemTimeByFormat("yyyy/MM/dd HH:mm:ss.SSS ")); - }else{ - lcssh.setAttributeValue("updateuserid", account); - lcssh.setAttributeValue("updateorgid", orgId); - lcssh.setAttributeValue("updatetime", DateUtil.getSystemTimeByFormat("yyyy/MM/dd HH:mm:ss.SSS ")); - } + BizObject lcssh = lcsshManager.newObject(); + lcssh.setAttributeValue("project_id", projectid); + lcssh.setAttributeValue("acc_number", accNumber); + lcssh.setAttributeValue("account", account); + lcssh.setAttributeValue("mobile", mobile); + lcssh.setAttributeValue("certid", certid); + lcssh.setAttributeValue("inputuserid", userId); + lcssh.setAttributeValue("inputorgid", orgId); + lcssh.setAttributeValue("inputtime", DateUtil.getSystemTimeByFormat("yyyy/MM/dd HH:mm:ss.SSS ")); + lcssh.setAttributeValue("gz_status", gzStatus); if(lct!=null ){ lcssh.setAttributeValue("tl_status", "sign_status2"); + lcssh.setAttributeValue("sign_type", lct.getAttribute("sign_type")); lcssh.setAttributeValue("agrmno", lct.getAttribute("AGRMNO")); } lcsshManager.saveObject(lcssh); @@ -581,5 +581,13 @@ public class DebitCardAction { public void setCollect_type(String collect_type) { this.collect_type = collect_type; } + + public String getSubjectId() { + return subjectId; + } + + public void setSubjectId(String subjectId) { + this.subjectId = subjectId; + } } diff --git a/src_jbo/jbo/app/tenwa/customer/LB_CARD_SIGN_STATUS_HIS.java b/src_jbo/jbo/app/tenwa/customer/LB_CARD_SIGN_STATUS_HIS.java index adf2443c2..1effa77e9 100644 --- a/src_jbo/jbo/app/tenwa/customer/LB_CARD_SIGN_STATUS_HIS.java +++ b/src_jbo/jbo/app/tenwa/customer/LB_CARD_SIGN_STATUS_HIS.java @@ -58,6 +58,10 @@ public interface LB_CARD_SIGN_STATUS_HIS{ */ public static final String agrmno = "agrmno"; /** + * 签约方式 STRING(10)
+ */ + public static final String sign_type = "sign_type"; + /** * 录入人 STRING(32)
*/ public static final String inputuserid = "inputuserid"; diff --git a/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql b/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql index b1ef9935f..8765b9ed1 100644 --- a/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql +++ b/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql @@ -136,6 +136,22 @@ Insert Into SCENARIO_MODEL (scenarioid,modelid,sortno,modelname,modeldescribe,mo 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 (O.batch_status<>''process'' or O.batch_status is null) and v.DATE_FORMAT(O.plan_date,''%Y%m'') <= v.DATE_FORMAT(v.SYSDATE(),''%Y%m'') and rent_over>0','','contract_number,plan_list','com.tenwa.flow.rent.rentincome.VILCRentPlanListHandler',null,'SYS_Designer','2017/06/04 20:29:52','SYS_Designer','2020/12/24 11:01:55','','1',''); + +-- 修改合同审批出租人选择对话框 +delete from SELECT_CATALOG where selname='SelectOwnInfo'; +Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('SelectOwnInfo','Sql','查询本方信息','','','Grid','','OWN_NUMBER','select OWN_NUMBER,OWN_NAME,LEASE_CONSIGNER,LEASE_REGISTER_ADDR,LEASE_ADDR,LEASE_PERSON,LEASE_POSTCODE,LEASE_LINKMAN,LEASE_TEL,LEASE_FAX,LEASE_EMAIL from own_info oi left join OWN_ACCOUNT oa on oi.own_number=oa.own_id where oa.acc_type=''#acc_type'' and state_=''0010''','客户编号,出租人,委托代理人,注册地址,通讯地址,法定代表人,邮编,联系人,电话,传真,电子邮件','','OWN_NUMBER@OWN_NAME@LEASE_CONSIGNER@LEASE_REGISTER_ADDR@LEASE_ADDR@LEASE_PERSON@LEASE_POSTCODE@LEASE_LINKMAN@LEASE_TEL@LEASE_FAX@LEASE_EMAIL','OWN_NAME','1','Single','','','','','','SYS_Designer','','2017/05/11 18:41:49','SYS_Designer','2020/12/30 14:06:44',''); + + +-- 修改法人客户的list页面条件 +delete from AWE_DO_CATALOG where dono='CustomerCompanyList'; +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 ('CustomerCompanyList','法人客户列表',null,'30010',null,'1','1','default','jbo.app.tenwa.customer.CUSTOMER_INFO','O left join jbo.app.tenwa.customer.CUSTOMER_TYPE ct on O.customerid=ct.customerid left join jbo.app.tenwa.customer.CUSTOMER_ATTRIBUTION ca on ca.customerid=O.customerid','O.customertype =:sCustomerType and ct.custtype=''cust_type.cust'' and ct.status=''valid'' and ca.status=''yes''','','inputtime desc','',null,'SYS_Designer','2017/03/15 11:52:03','SYS_Designer','2020/12/30 15:09:56','','1',''); +-- 修改项目立项选客户根据归属设置显示 +delete from SELECT_CATALOG where selname='SelectCustomerForProjectApprove'; +Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('SelectCustomerForProjectApprove','Sql','查询客户项目立项','customer_info','customerid','Grid','String userid','','SELECT O.customerid,O.customername,getItemName(''CertType'',O.certtype) AS certtype,O.certid,O.CUSTKIND,getItemName(''CustomerType'',O.customertype) AS customertype,getUserName(O.inputuserid) AS inputusername,getOrgName(O.inputorgid) AS inputorgid ,O.inputtime FROM CUSTOMER_INFO O LEFT JOIN CUSTOMER_TYPE ct ON O.customerid=ct.customerid LEFT JOIN CUSTOMER_COMPANY cc ON cc.customerid=O.customerid LEFT JOIN CUSTOMER_ATTRIBUTION ca ON ca.customerid=O.customerid WHERE O.customertype=''01'' AND ct.custtype=''cust_type.cust'' AND ct.custstatus=''status02'' AND ct.status=''valid'' AND cc.status=''status02'' AND ca.status=''yes'' AND ca.userid=''#userid'' AND NOT EXISTS (SELECT 1 FROM CUSTOMER_BLANK_LIST cbl WHERE cbl.customer_id=O.customerid AND (cbl.blank_level =''stop'' AND cbl.blank_status=''no'')) {O,cust}','客户编号,客户名称,证件类型,证件编号,内部行业,客户类别,登记人,登记机构,登记时间','','customerid@customername','customername,custkind,certid','1','Single','','','','','customername@ @ @EqualsString,Contains@certid@ @ @EqualsString,Contains@custkind@sql@SELECT itemno,itemname FROM code_library WHERE codeno=''cust_kind'' ORDER BY sortno@EqualsString','SYS_Designer','','2017/07/06 15:38:06','SYS_Designer','2020/12/30 15:17:05',''); + + + + -- ---------------以上生产环境已执行--------------------------------------- -- 添加通联卡扣短信发送数据字典 @@ -285,16 +301,6 @@ alter table customer_account_middle add column collect_type varchar(20) null com -- 签约历史表添加签约类型 alter table LB_CARD_SIGN_STATUS_HIS add column sign_type varchar(10) null comment '签约方式' after agrmno; --- 修改合同审批出租人选择对话框 -delete from SELECT_CATALOG where selname='SelectOwnInfo'; -Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('SelectOwnInfo','Sql','查询本方信息','','','Grid','','OWN_NUMBER','select OWN_NUMBER,OWN_NAME,LEASE_CONSIGNER,LEASE_REGISTER_ADDR,LEASE_ADDR,LEASE_PERSON,LEASE_POSTCODE,LEASE_LINKMAN,LEASE_TEL,LEASE_FAX,LEASE_EMAIL from own_info oi left join OWN_ACCOUNT oa on oi.own_number=oa.own_id where oa.acc_type=''#acc_type'' and state_=''0010''','客户编号,出租人,委托代理人,注册地址,通讯地址,法定代表人,邮编,联系人,电话,传真,电子邮件','','OWN_NUMBER@OWN_NAME@LEASE_CONSIGNER@LEASE_REGISTER_ADDR@LEASE_ADDR@LEASE_PERSON@LEASE_POSTCODE@LEASE_LINKMAN@LEASE_TEL@LEASE_FAX@LEASE_EMAIL','OWN_NAME','1','Single','','','','','','SYS_Designer','','2017/05/11 18:41:49','SYS_Designer','2020/12/30 14:06:44',''); - - --- 修改法人客户的list页面条件 -delete from AWE_DO_CATALOG where dono='CustomerCompanyList'; -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 ('CustomerCompanyList','法人客户列表',null,'30010',null,'1','1','default','jbo.app.tenwa.customer.CUSTOMER_INFO','O left join jbo.app.tenwa.customer.CUSTOMER_TYPE ct on O.customerid=ct.customerid left join jbo.app.tenwa.customer.CUSTOMER_ATTRIBUTION ca on ca.customerid=O.customerid','O.customertype =:sCustomerType and ct.custtype=''cust_type.cust'' and ct.status=''valid'' and ca.status=''yes''','','inputtime desc','',null,'SYS_Designer','2017/03/15 11:52:03','SYS_Designer','2020/12/30 15:09:56','','1',''); --- 修改项目立项选客户根据归属设置显示 -delete from SELECT_CATALOG where selname='SelectCustomerForProjectApprove'; -Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('SelectCustomerForProjectApprove','Sql','查询客户项目立项','customer_info','customerid','Grid','String userid','','SELECT O.customerid,O.customername,getItemName(''CertType'',O.certtype) AS certtype,O.certid,O.CUSTKIND,getItemName(''CustomerType'',O.customertype) AS customertype,getUserName(O.inputuserid) AS inputusername,getOrgName(O.inputorgid) AS inputorgid ,O.inputtime FROM CUSTOMER_INFO O LEFT JOIN CUSTOMER_TYPE ct ON O.customerid=ct.customerid LEFT JOIN CUSTOMER_COMPANY cc ON cc.customerid=O.customerid LEFT JOIN CUSTOMER_ATTRIBUTION ca ON ca.customerid=O.customerid WHERE O.customertype=''01'' AND ct.custtype=''cust_type.cust'' AND ct.custstatus=''status02'' AND ct.status=''valid'' AND cc.status=''status02'' AND ca.status=''yes'' AND ca.userid=''#userid'' AND NOT EXISTS (SELECT 1 FROM CUSTOMER_BLANK_LIST cbl WHERE cbl.customer_id=O.customerid AND (cbl.blank_level =''stop'' AND cbl.blank_status=''no'')) {O,cust}','客户编号,客户名称,证件类型,证件编号,内部行业,客户类别,登记人,登记机构,登记时间','','customerid@customername','customername,custkind,certid','1','Single','','','','','customername@ @ @EqualsString,Contains@certid@ @ @EqualsString,Contains@custkind@sql@SELECT itemno,itemname FROM code_library WHERE codeno=''cust_kind'' ORDER BY sortno@EqualsString','SYS_Designer','','2017/07/06 15:38:06','SYS_Designer','2020/12/30 15:17:05',''); - +-- 扣款历史表添加字段 +alter table customer_account_his add collect_type varchar(10),add bank_type varchar(10),add bank_code varchar(10); diff --git a/src_tenwa/com/tenwa/lease/flow/contract/check/ContractInfoCheck.java b/src_tenwa/com/tenwa/lease/flow/contract/check/ContractInfoCheck.java index 9b2fff0a2..48dda1f0e 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/check/ContractInfoCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/check/ContractInfoCheck.java @@ -47,21 +47,20 @@ public class ContractInfoCheck { if(ca==null){ return "未查询到扣款信息，请联系管理员！" ; }else{ + BizObjectManager lctManage = JBOFactory.getBizObjectManager(LC_CARD_TLSIGN.CLASS_NAME, tx); String collect_type = ca.getAttribute("collect_type").getString(); if(collect_type.equals("YLcollect")){//广州银联 if(!"Y".equals(ca.getAttribute("SIGN_STATUS").getString())){ return "请提醒客户查看手机短信，完成广州银联扣款卡的签约验证！"; } }else if(collect_type.equals("TLcollect")){//通联 - BizObjectManager lctManage = JBOFactory.getBizObjectManager(LC_CARD_TLSIGN.CLASS_NAME, tx); - BizObject lct = lctManage.createQuery(" project_id=:project_id and sign_type='TL' ").setParameter("project_id", projectid).getSingleResult(false); - if( lct==null || (!"sign_status2".equals(lct.getAttribute("sign_status").getString()))){ + BizObject lct = lctManage.createQuery(" project_id=:project_id and sign_type='TLcollect' and sign_status='sign_status2' ").setParameter("project_id", projectid).getSingleResult(false); + if( lct==null ){ return "请提醒客户查看手机短信，完成通联扣款卡的签约验证！"; } }else if(collect_type.equals("YCcollect")){//邮储判断 - BizObjectManager lctManage = JBOFactory.getBizObjectManager(LC_CARD_TLSIGN.CLASS_NAME, tx); - BizObject lct = lctManage.createQuery(" project_id=:project_id and sign_type='YC' ").setParameter("project_id", projectid).getSingleResult(false); - if( lct==null || (!"sign_status2".equals(lct.getAttribute("sign_status").getString()))){ + BizObject lct = lctManage.createQuery(" project_id=:project_id and sign_type='YCcollect' and sign_status='sign_status2' ").setParameter("project_id", projectid).getSingleResult(false); + if( lct==null ){ return "请提醒客户查看手机短信，完成邮储扣款卡的签约验证！"; } }else{