From a448fbc581676b29e29e553d9672b945c9777ac1 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Thu, 9 Jan 2020 18:13:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E6=96=B9=E8=B4=A6=E6=88=B7=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp | 4 ++-- calc/com/tenwa/reckon/copydata/CalcRentCompare.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp index 00e5beb97..7d523ea3f 100644 --- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp +++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp @@ -94,10 +94,10 @@ var id="<%=id%>"; var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk+",ownId="+ownId; var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams ); - if(sReturn=="null"||(sReturn!="null"&&state!="0010")||(sReturn!="null"&&state=="0010"&&FbSdk!="Y")||(sReturn!="null"&&state=="0010"&&FbSdk=="Y"&&accountType!="out_account"&&accountType!="inAndOut_account")||sReturn==id){ + if(sReturn=="null"||sReturn==id){ as_save("myiframe0","parent.AsDialog.ClosePage()"); }else{ - alert("启用状态下的银企直连账户只能存在一个，请检查！"); + alert("相同类型的账户只能存在一个，请检查（银行账号类型 ，是否为企银直连，银行账户用途，状态等字段）！"); } } diff --git a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java index 7cfc93d59..ed082b6f2 100644 --- a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java +++ b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java @@ -42,6 +42,7 @@ public class CalcRentCompare implements BizObjectCompare{ public void setAccType(String accType) { this.accType = accType; } + public String getState() { return state; } @@ -92,8 +93,13 @@ public class CalcRentCompare implements BizObjectCompare{ } public String compare(JBOTransaction tx) throws JBOException{ - String sql ="select id from O where O.state_='0010' and O.ACC_TYPE='0010' and O.FbSdk='Y' and (O.account_type='out_account' or O.account_type='inAndOut_account') and own_id=:ownId "; - BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql).setParameter("ownId", ownId).getSingleResult(false); + String sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and O.FbSdk='Y' and (O.account_type='out_account' or O.account_type='inAndOut_account')"; + if("in_account".equals(accountType)){ + sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and (O.account_type='in_account' or O.account_type='inAndOut_account') and account_purpose='default'"; + }else if("inAndOut_account".equals(accountType)){ + sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and (account_purpose='default' or O.FbSdk='Y')"; + } + BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql).getSingleResult(false); if(bo==null||"".equals(bo)){ return "null"; }