diff --git a/WebContent/Tenwa/Core/SystemConfig/bankCode/BankCodeInfo.jsp b/WebContent/Tenwa/Core/SystemConfig/bankCode/BankCodeInfo.jsp new file mode 100644 index 000000000..f6949b989 --- /dev/null +++ b/WebContent/Tenwa/Core/SystemConfig/bankCode/BankCodeInfo.jsp @@ -0,0 +1,30 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2020-12-14 + Content: 示例详情页面 + History Log: + */ + String id = CurPage.getParameter("id"); + String sTempletNo = "BankCodeInfo";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + if(id!=null&& id.length()>0){ + doTemp.setReadOnly("bank_code", true); + }; + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + //dwTemp.ReadOnly = "-2";//只读模式 + dwTemp.genHTMLObjectWindow(CurPage.getParameter("id")); + + String sButtons[][] = { + {"true","All","Button","保存","保存所有修改","as_save(0,'returnList()')","","","",""}, + {"true","All","Button","返回","返回列表","returnList()","","","",""} + }; + //sButtonPosition = "south"; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Core/SystemConfig/bankCode/BankCodeList.jsp b/WebContent/Tenwa/Core/SystemConfig/bankCode/BankCodeList.jsp new file mode 100644 index 000000000..ab8e16665 --- /dev/null +++ b/WebContent/Tenwa/Core/SystemConfig/bankCode/BankCodeList.jsp @@ -0,0 +1,37 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2020-12-14 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("BankCodeList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""}, + }; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index b14736aa6..ab559b529 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -73,11 +73,10 @@ } sReturn = sReturn.split("@"); var bankCode = getItemValue(0, 0, "bank_code"); - if("<%=flowNo%>"=="BusinessApplyFlow"||(bankCode!=null&&bankCode!="")){ - setItemValue(0,0,'bank_code',sReturn[0]); - } + 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]); },"选择银行名称"); } //根据选择的用户名选择对应的证件号 @@ -209,9 +208,10 @@ var project_id = getItemValue(0,0,"project_id"); // 项目id var contract_id = getItemValue(0,0,"contract_id");// 预留手机号 var sign_status = getItemValue(0,0,"sign_status");// 签约信息 + var collect_type = getItemValue(0,0,"collect_type");// 后去扣款渠道 var flowunid = "<%=FlowUnid%>" ; - var sparams ="FlowUnid="+flowunid+",account="+account+",acc_number="+acc_number+",bank_name="+bank_name+",mobile="+MOBILE+",projectid="+project_id+",contractid="+contract_id+",sign_status="+sign_status+""; + var sparams ="FlowUnid="+flowunid+",account="+account+",acc_number="+acc_number+",bank_name="+bank_name+",mobile="+MOBILE+",projectid="+project_id+",contractid="+contract_id+",sign_status="+sign_status+",collect_type="+collect_type; var result = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "savaCustomerAccountTomiddle", sparams); if("true"==result){ as_save("0","re"); @@ -285,6 +285,7 @@ sflag = i; } } + var bool = true; if (sflag != -1) { var name=bankName[sflag].substring(0,bankName[sflag].indexOf("·")); if(name.indexOf("邮储") != -1 || name.indexOf("邮政") != -1){ @@ -294,17 +295,18 @@ 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_code',res[0]); setItemValue(0,0,'bank_type',res[1]); setItemValue(0,getRow(),"bank_name",res[1]); + setItemValue(0,0,"collect_type",res[2]); + bool = false; } - }else{ + } + if(bool){ setItemValue(0,0,'bank_code',''); setItemValue(0,0,'bank_type',''); - setItemValue(0,getRow(),"bank_name",''); + setItemValue(0,0,"bank_name",''); + setItemValue(0,0,"collect_type",''); } setErrorTips("acc_number",""); return true; diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml index 86dc3256c..72c2810eb 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml @@ -3463,5 +3463,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/com/amarsoft/app/awe/config/customer/BankCodeMaintainHandler.java b/src/com/amarsoft/app/awe/config/customer/BankCodeMaintainHandler.java new file mode 100644 index 000000000..40b6bfcd2 --- /dev/null +++ b/src/com/amarsoft/app/awe/config/customer/BankCodeMaintainHandler.java @@ -0,0 +1,28 @@ +package com.amarsoft.app.awe.config.customer; + +import jbo.app.tenwa.customer.BANK_CODE; + +import com.amarsoft.are.ARE; +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.dw.handler.impl.CommonHandler; + +public class BankCodeMaintainHandler extends CommonHandler { + + @Override + protected boolean validityCheck(BizObject bo, boolean isInsert) { + try { + BizObject bc=JBOFactory.createBizObjectQuery(BANK_CODE.CLASS_NAME," bank_code=:bank_code ").setParameter("bank_code", bo.getAttribute("bank_code").getString()).getSingleResult(false); + if(bc!=null && (isInsert || !bo.getAttribute("id").getString().equals(bc.getAttribute("id").getString()))){ + errors = "该银行编号已存在！！！"; + return false; + } + } catch (JBOException e) { + ARE.getLog().debug(e); + errors = e.getMessage(); + return false; + } + return true; + } +} diff --git a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java index b5a3b3ce5..6dafe2f02 100644 --- a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java +++ b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java @@ -57,6 +57,7 @@ public class DebitCardAction { private String userId; private String orgId; private String applyType; + private String collect_type; public String getCustIdByFlowunid(JBOTransaction tx) throws JBOException{ String s=this.getFlowUnid(); @@ -339,10 +340,10 @@ public class DebitCardAction { selectSql="SELECT PROJECT_ID FROM CUSTOMER_ACCOUNT_MIDDLE WHERE PROJECT_ID='"+projectid+"'"; List> dataList2=DataOperatorUtil.getDataBySql(Sqlca, selectSql, null); if(dataList2 ==null || dataList2.size()==0){ - insertSql="INSERT INTO CUSTOMER_ACCOUNT_MIDDLE(ID,ACC_NUMBER,BANK_NAME,ACCOUNT,PROJECT_ID,CONTRACT_ID,MOBILE,SIGN_STATUS,INSERTTIME,flowunid) VALUES(REPLACE(UUID(),'-',''),'"+acc_number+"','"+bank_name+"','"+account+"','"+projectid+"','"+contractid+"','"+mobile+"','"+sign_status+"','"+date+"','"+FlowUnid+"')"; + insertSql="INSERT INTO CUSTOMER_ACCOUNT_MIDDLE(ID,ACC_NUMBER,BANK_NAME,ACCOUNT,PROJECT_ID,CONTRACT_ID,MOBILE,SIGN_STATUS,INSERTTIME,flowunid,collect_type) VALUES(REPLACE(UUID(),'-',''),'"+acc_number+"','"+bank_name+"','"+account+"','"+projectid+"','"+contractid+"','"+mobile+"','"+sign_status+"','"+date+"','"+FlowUnid+"','"+collect_type+"')"; Sqlca.executeSQL(insertSql); }else{ - updateSql="UPDATE CUSTOMER_ACCOUNT_MIDDLE SET ACC_NUMBER='"+acc_number+"',BANK_NAME='"+bank_name+"',ACCOUNT='"+account+"',MOBILE='"+mobile+"',UPDATETIME='"+date+"',flowunid='"+FlowUnid+"',SIGN_STATUS='"+sign_status+"' WHERE PROJECT_ID='"+projectid+"' "; + updateSql="UPDATE CUSTOMER_ACCOUNT_MIDDLE SET ACC_NUMBER='"+acc_number+"',BANK_NAME='"+bank_name+"',ACCOUNT='"+account+"',MOBILE='"+mobile+"',UPDATETIME='"+date+"',flowunid='"+FlowUnid+"',SIGN_STATUS='"+sign_status+"',collect_type='"+collect_type+"' WHERE PROJECT_ID='"+projectid+"' "; Sqlca.executeSQL(updateSql); } } @@ -447,10 +448,10 @@ public class DebitCardAction { //根据名称显示数据字典的银行名称 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"; + String sql="SELECT bc.bank_code as bank_code ,bc.bank_name as bank_name,case when bctc.collect_type is null or bctc.collect_type='' then 'YLcollect' else bctc.collect_type end as collect_type from bank_code bc left join BANK_COLLECT_TYPE_CONFIG bctc on bc.bank_code=bctc.bank_code where is_use='Y' and LOCATE(bc.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 data.get(0).get("bank_code")+"@"+data.get(0).get("bank_name")+"@"+data.get(0).get("collect_type"); } return "error"; } @@ -572,5 +573,13 @@ public class DebitCardAction { public void setApplyType(String applyType) { this.applyType = applyType; } + + public String getCollect_type() { + return collect_type; + } + + public void setCollect_type(String collect_type) { + this.collect_type = collect_type; + } } diff --git a/src_jbo/jbo/app/tenwa/customer/BANK_CODE.java b/src_jbo/jbo/app/tenwa/customer/BANK_CODE.java new file mode 100644 index 000000000..a7067342e --- /dev/null +++ b/src_jbo/jbo/app/tenwa/customer/BANK_CODE.java @@ -0,0 +1,56 @@ +package jbo.app.tenwa.customer; + +import java.lang.String; + +/** +* 银行编码 - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface BANK_CODE{ + /** + * 银行编码

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.app.tenwa.customer.BANK_CODE"; + /** + * 主键 STRING(32)
+ */ + public static final String id = "id"; + /** + * 银行编码 STRING(10)
+ */ + public static final String bank_code = "bank_code"; + /** + * 银行名称 STRING(20)
+ */ + public static final String bank_name = "bank_name"; + /** + * 是否使用 STRING(1)
+ */ + public static final String is_use = "is_use"; + /** + * 登记人 STRING(32)
+ */ + public static final String inputuserid = "inputuserid"; + /** + * 登记部门 STRING(32)
+ */ + public static final String inputorgid = "inputorgid"; + /** + * 登记时间 STRING(32)
+ */ + public static final String inputtime = "inputtime"; + /** + * 更新人 STRING(32)
+ */ + public static final String updateuserid = "updateuserid"; + /** + * 更新部门 STRING(32)
+ */ + public static final String updateorgid = "updateorgid"; + /** + * 更新时间 STRING(32)
+ */ + public static final String updatetime = "updatetime"; +} \ No newline at end of file diff --git a/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql b/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql index a71bd5c6a..59e2d0d35 100644 --- a/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql +++ b/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql @@ -128,6 +128,9 @@ Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn delete from awe_do_library where dono='LmGpsOrderInfo' and colindex='1290'; Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LmGpsOrderInfo','1290','1290','1','O','SOURCE','SOURCE','String','','GPS来源','','1','Select','1','1','Code','gpsVendor','','10','1','1','0','1','0',0,'','0010','','SYS_Designer','2020/08/20 09:56:12','SYS_Designer','2020/11/23 15:29:15','0','','1','','','',''); +-- 修改放款后督流程风险预警 +delete from SCENARIO_MODEL where scenarioid='放款后督流程' and modelid='000040'; +Insert Into SCENARIO_MODEL (scenarioid,modelid,sortno,modelname,modeldescribe,modeltype,subtypeno,runcondition,status,nopassdeal,passdeal,passmessage,nopassmessage,executescript,remark,inputuser,inputorg,inputtime,updateuser,updatetime,groupid,modelkind,bizviewer) Values ('放款后督流程','000040','0011','车牌号与抵押日期是否填写','车牌号与抵押日期是否填写','20','0010','','1','10','10','通过','请填写车牌号与抵押日期','SELECT CASE WHEN ISNULL(plate_number)=0 and LENGTH(TRIM(plate_number))>0 THEN ''true'' ELSE ''false'' END FROM LB_CAR_LICENSE_PLATE_INFO_TEMP WHERE flowunid=''#{ObjectNo}'';','','administrator','8009001','2019/10/15 09:33:05','administrator','2019/09/03 00:10:33',null,null,null); -- ---------------以上生产环境已执行--------------------------------------- @@ -229,9 +232,51 @@ Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn delete from awe_do_library where dono='BankCollectTypeConfigInfo' and colindex='1030'; Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCollectTypeConfigInfo','1030','1030','1','O','collect_type','collect_type','String','','扣款方式','','1','Select','1','1','Code','DeductionCollect','',null,'1','0','1','1','0',0,'','','','SYS_Designer','2020/10/22 11:42:42','SYS_Designer','2020/12/11 16:37:21','0','','1','','','',''); - - - +-- bank_code表中添加字段 +Alter table bank_code add column id varchar(32) NULL COMMENT '主键' first, add column inputuserid varchar(32) NULL COMMENT '登记人' after is_use, add column inputorgid varchar(32) NULL COMMENT '登记部门' after inputuserid, add column inputtime varchar(32) NULL COMMENT '登记时间' after inputorgid, add column updateuserid varchar(32) NULL COMMENT '更新人' after inputtime, add column updateorgid varchar(32) NULL COMMENT '更新部门' after updateuserid, add column updatetime varchar(32) NULL COMMENT '更新时间' after updateorgid; +-- 更新id +update bank_code set id=REPLACE(MD5(UUID()),'-',''); +-- 添加主键 +Alter table bank_code change id id varchar(32) CHARSET gbk COLLATE gbk_chinese_ci NOT NULL COMMENT '主键', add primary key (id); + +-- 添加银行编码维护菜单 +Insert Into AWE_MENU_INFO (menuid,menuname,displayname,sortno,url,urlparam,target,style,isinuse,remark,inputorgid,inputuserid,inputtime,updateorgid,updateuserid,updatetime,accesstype,icon,appicon) Values ('9901000060','银行信息维护','银行信息维护','9901000060','/Tenwa/Core/SystemConfig/bankCode/BankCodeList.jsp','','_self','','1','',null,'SYS_Designer','2020/12/15 15:19:37',null,'SYS_Designer','2020/12/15 15:19:55','10','',''); +Insert Into AWE_Role_Menu (roleid,menuid) Values ('099','9901000060'); +Insert Into AWE_Role_Menu (roleid,menuid) Values ('299','9901000060'); +Insert Into AWE_Role_Menu (roleid,menuid) Values ('399','9901000060'); + +-- 添加对应的list模板 +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 ('BankCodeList','银行编码',null,'30',null,'1','1','default','jbo.app.tenwa.customer.BANK_CODE','O','','','','','','SYS_Designer','2020/12/14 10:21:31','SYS_Designer','2020/12/14 10:21:31',null,'1',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeList','1000','1000','1','O','id','id','String','','主键','','1','Text','1','1','','','','32','0','0','0','0','0',1,'0','','','SYS_DESIGNER','2020/12/14 10:21:31','SYS_Designer','2020/12/15 15:59:06','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeList','1010','1010','1','O','bank_code','bank_code','String','','银行编码','','1','Text','1','1','','','','10','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/12/14 10:21:31','SYS_Designer','2020/12/15 16:00:41','0','','1','','','','Like'); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeList','1020','1020','1','O','bank_name','bank_name','String','','银行名称','','1','Text','1','1','','','','20','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/12/14 10:21:31','SYS_Designer','2020/12/15 16:01:23','0','','1','','','','Like'); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeList','1030','1030','1','O','is_use','is_use','String','','是否使用','','1','Select','1','1','Code','DeleteFlag','','1','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/12/14 10:21:31','SYS_Designer','2020/12/15 15:31:08','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeList','1040','1040','1','O','inputuserid','inputuserid','String','','登记人','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/12/14 10:21:31','SYS_Designer','2020/12/15 16:00:00','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeList','1050','1050','1','O','inputorgid','inputorgid','String','','登记部门','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/12/14 10:21:31','SYS_Designer','2020/12/15 16:00:00','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeList','1060','1060','1','O','inputtime','inputtime','String','','登记时间','','1','Date','3','2','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/12/14 10:21:31','SYS_Designer','2020/12/15 16:00:00','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeList','1070','1070','1','O','updateuserid','updateuserid','String','','更新人','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/12/14 10:21:31','SYS_Designer','2020/12/15 16:00:00','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeList','1080','1080','1','O','updateorgid','updateorgid','String','','更新部门','','1','Text','1','1','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/12/14 10:21:31','SYS_Designer','2020/12/15 16:00:00','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeList','1090','1090','1','O','updatetime','updatetime','String','','更新时间','','1','Date','3','2','','','','32','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2020/12/14 10:21:31','SYS_Designer','2020/12/15 16:00:00','','','1','','','',''); + +-- 添加对应的info模板 +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 ('BankCodeInfo','银行编码',null,'30',null,'1','1','default','jbo.app.tenwa.customer.BANK_CODE','O','id=:id','','','com.amarsoft.app.awe.config.customer.BankCodeMaintainHandler',null,'SYS_Designer','2020/12/14 10:22:22','SYS_Designer','2020/12/15 16:15:02','','1',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeInfo','1000','1000','1','O','id','id','String','','主键','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2020/12/14 10:22:22','SYS_Designer','2020/12/15 16:15:02','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeInfo','1010','1010','1','O','bank_code','bank_code','Number','','银行编码','','1','Text','5','1','','','','10','1','0','1','1','1',1,'0','','','SYS_Designer','2020/12/14 10:22:22','SYS_Designer','2020/12/15 16:59:00','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeInfo','1020','1020','1','O','bank_name','bank_name','String','','银行名称','','1','Text','1','1','','','','20','1','0','1','1','1',1,'0','','','SYS_Designer','2020/12/14 10:22:22','SYS_Designer','2020/12/15 16:15:02','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeInfo','1030','1030','1','O','is_use','is_use','String','','是否使用','','1','Select','1','1','Code','DeleteFlag','','1','1','0','1','1','1',1,'0','','','SYS_Designer','2020/12/14 10:22:23','SYS_Designer','2020/12/15 16:15:02','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeInfo','1040','1040','1','O','inputuserid','inputuserid','String','','登记人','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2020/12/14 10:22:23','SYS_Designer','2020/12/15 16:15:02','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeInfo','1050','1050','1','O','inputorgid','inputorgid','String','','登记部门','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2020/12/14 10:22:23','SYS_Designer','2020/12/15 16:15:02','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeInfo','1060','1060','1','O','inputtime','inputtime','String','','登记时间','','1','Date','3','2','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2020/12/14 10:22:23','SYS_Designer','2020/12/15 16:15:02','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeInfo','1070','1070','1','O','updateuserid','updateuserid','String','','更新人','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2020/12/14 10:22:23','SYS_Designer','2020/12/15 16:15:02','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeInfo','1080','1080','1','O','updateorgid','updateorgid','String','','更新部门','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2020/12/14 10:22:23','SYS_Designer','2020/12/15 16:15:02','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BankCodeInfo','1090','1090','1','O','updatetime','updatetime','String','','更新时间','','1','Date','3','2','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2020/12/14 10:22:23','SYS_Designer','2020/12/15 16:15:02','','','1','','','',''); + +-- 扣款卡页面添加扣款类型 +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('DebitCardInfo','1280','1280','1','O','collect_type','collect_type','String','','扣款类型','','1','Text','1','1','','','','20','0','0','0','1','0',0,'','','','SYS_Designer','2020/12/17 11:25:58','SYS_Designer','2020/12/17 11:25:58','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('DebitCardInfoMcontract','1280','1280','1','O','collect_type','collect_type','String','','扣款类型','','1','Text','1','1','','','','20','0','0','0','1','0',0,'','','','SYS_Designer','2020/12/17 11:31:36','SYS_Designer','2020/12/17 11:31:46','0','','1','','','',''); + +-- 扣款卡变更表中添加扣款渠道字段 +alter table customer_account_middle add column collect_type varchar(20) null comment '渠道类型' after flowunid; 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 c7e8ab05b..9b2fff0a2 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/check/ContractInfoCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/check/ContractInfoCheck.java @@ -42,32 +42,33 @@ public class ContractInfoCheck { //检查该项目是否进行过签约验证 public String ProjectSignStatus(JBOTransaction tx) throws Exception{ - boolean gzSingStatus = false; BizObjectManager caManage = JBOFactory.getBizObjectManager(CUSTOMER_ACCOUNT.CLASS_NAME, tx); BizObject ca = caManage.createQuery("PROJECT_ID=:projectid").setParameter("projectid", projectid).getSingleResult(false); - //List cas = caManage.createQuery("acc_number=:accnumber").setParameter("accnumber", acc_number).getResultList(false); - if (ca != null) { - if("Y".equals(ca.getAttribute("SIGN_STATUS").getString())){ - gzSingStatus = true; - //break; + if(ca==null){ + return "未查询到扣款信息，请联系管理员！" ; + }else{ + 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()))){ + 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()))){ + return "请提醒客户查看手机短信，完成邮储扣款卡的签约验证！"; + } + }else{ + return "未查询到对应的扣款渠道，请联系管理员！" ; } } - BizObjectManager lctManage = JBOFactory.getBizObjectManager(LC_CARD_TLSIGN.CLASS_NAME, tx); - BizObject lct = lctManage.createQuery(" project_id=:project_id ").setParameter("project_id", projectid).getSingleResult(false); - boolean tlSingStatus = false; - if( lct!=null && "sign_status2".equals(lct.getAttribute("sign_status").getString())){ - tlSingStatus = true; - } - if(tlSingStatus && gzSingStatus){ - return "success"; - }else if (tlSingStatus==false && gzSingStatus==false){ - return "请提醒客户查看手机短信，首先完成扣款卡的签约验证！"; - }else if (tlSingStatus==false ){ - return "请提醒客户查看手机短信，完成通联银联扣款卡的签约验证！"; - }else if(gzSingStatus==false){ - return "请提醒客户查看手机短信，完成广州银联扣款卡的签约验证！"; - } - return "未查询到扣款信息，请联系管理员！" ; + return "success" ; } //保存付款申请GPS是否安装状态 diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusiness.java index e89fbf78a..6892f03fe 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusiness.java @@ -171,9 +171,10 @@ public class LBCustomerRelaTempToFormalBusiness extends BaseBussiness { //配偶信息不考虑存量客户 fromCondtion.clear(); fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString()); - //fromCondtion.put("project_id",this.getAttribute("ProjectId").toString()); + otherProperty.clear(); + otherProperty.put("project_id",this.getAttribute("ProjectId").toString()); - DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY.CLASS_NAME, null, null, null, Sqlca); + DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY.CLASS_NAME, null, otherProperty, null, Sqlca); String sMessage="true"; return sMessage; }