diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index d1dd2cac8..b227e9104 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -199,6 +199,9 @@ }else if("ZCfalse" == meassge){ alert("该扣款卡信息没有签约，无法保存！"); return ; + }else if("NotFalse" == meassge){ + alert("没有匹配到对应的扣款渠道，无法保存！"); + return ; }else{ setItemValue(0,0,"sign_status",""); } diff --git a/src_app_fresh/apx/com/amarsoft/als/user/sys/service/impl/VersionServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/sys/service/impl/VersionServiceImpl.java index f4e66f042..272756c01 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/sys/service/impl/VersionServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/sys/service/impl/VersionServiceImpl.java @@ -27,7 +27,7 @@ public class VersionServiceImpl implements VersionService { // } // } - String sVersionCode = request.getParameter("versioncode"); + String sVersionCode = request.getParameter("versioncode").replace(".",""); if (null == sDevOs) sDevOs = ""; if (null == sVersionCode) @@ -46,6 +46,7 @@ public class VersionServiceImpl implements VersionService { String oVersionCode = versionMap.get("VERSION_CODE".toLowerCase()).toString(); oVersionCode = oVersionCode.replace(".",""); + System.out.println("app传入的版本号"+sVersionCode +"=======系统配置版本号："+ oVersionCode); if (Integer.valueOf(sVersionCode)>=Integer.valueOf(oVersionCode)) { // 当前意见最新版本 // 没有数据 当前最新版本 diff --git a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java index 21d804f53..4dec3f2a4 100644 --- a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java +++ b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java @@ -280,15 +280,29 @@ public class DebitCardAction { return "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("ZC".equals(channel)){ - String sql = "select id from customer_account_input where collect_type='"+collect_type+"' and acc_number='"+acc_number+"' and account='"+account+"' and certid='"+certId+"' and tel='"+mobile+"' and subjectid='"+subjectId+"' and sign_status='Y' "; + String sql = "select id,agrmno,inputtime from customer_account_input where collect_type='"+collect_type+"' and acc_number='"+acc_number+"' and account='"+account+"' and certid='"+certId+"' and tel='"+mobile+"' and subjectid='"+subjectId+"' and sign_status='Y' "; List> dataBySql = DataOperatorUtil.getDataBySql(sql); if( dataBySql == null || dataBySql.size() == 0){ return "ZCfalse"; }else if("YLcollect".equals(collect_type)){ return "Y"; + }else if("TLcollect".equals(collect_type)){ + 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", dataBySql.get(0).get("agrmno")); + lct.setAttributeValue("SIGN_TIME", dataBySql.get(0).get("inputtime")); + lcthManage.saveObject(lct); }else{ - + return "NotFalse"; } return "N"; } @@ -297,10 +311,6 @@ public class DebitCardAction { 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); diff --git a/src_sql/棰勬姇SQL/v20210415/tft20210415.sql b/src_sql/棰勬姇SQL/v20210415/tft20210415.sql index 7de25f93d..fa7f38297 100644 --- a/src_sql/棰勬姇SQL/v20210415/tft20210415.sql +++ b/src_sql/棰勬姇SQL/v20210415/tft20210415.sql @@ -7,11 +7,6 @@ Alter table lb_project_info_temp add column CHANNEL varchar(32) NULL COMMENT ' Alter table lb_contract_info add column CHANNEL varchar(32) NULL COMMENT '渠道' after SUBJECTNAME, add column ZC_PROJECT_NUMBER varchar(32) NULL COMMENT '中车申请号' after CHANNEL, add column ZC_CONTRACT_NUMBER varchar(32) NULL COMMENT '中车合同号' after ZC_PROJECT_NUMBER; Alter table lb_contract_info_temp add column CHANNEL varchar(32) NULL COMMENT '渠道' after SUBJECTNAME, add column ZC_PROJECT_NUMBER varchar(32) NULL COMMENT '中车申请号' after CHANNEL, add column ZC_CONTRACT_NUMBER varchar(32) NULL COMMENT '中车合同号' after ZC_PROJECT_NUMBER; Alter table lb_contract_info_his add column CHANNEL varchar(32) NULL COMMENT '渠道' after SUBJECTNAME, add column ZC_PROJECT_NUMBER varchar(32) NULL COMMENT '中车申请号' after CHANNEL, add column ZC_CONTRACT_NUMBER varchar(32) NULL COMMENT '中车合同号' after ZC_PROJECT_NUMBER; -update lb_project_info set channel='CG'; -update lb_project_info_temp set channel='CG'; -update lb_contract_info set channel='CG'; -update lb_contract_info_temp set channel='CG'; -update lb_contract_info_his set channel='CG'; -- 业务申请详情页面添加中车申请号和中车合同编号 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 ('BusinessProjectTempInfo','0074','0074','1','O','ZC_PROJECT_NUMBER','ZC_PROJECT_NUMBER','String','','中车申请号','','1','Text','1','1','','','','32','0','0','0','1','0',0,'','0010','','SYS_Designer','2021/03/20 14:48:55','SYS_Designer','2021/03/20 15:01:12','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 ('BusinessProjectTempInfo','0078','0078','1','O','ZC_CONTRACT_NUMBER','ZC_CONTRACT_NUMBER','String','','中车合同号','','1','Text','1','1','','','','32','0','0','0','1','0',0,'','0010','','SYS_Designer','2021/03/20 14:48:55','SYS_Designer','2021/03/20 15:01:12','0','','1','','','','');