From f250597c8d88741639d6d3b447dd72a4f636f389 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 10 Oct 2018 20:00:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BB=98=E6=AC=BE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9SQL=202.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9C=AC=E6=96=B9=E8=B4=A6=E6=88=B7=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=92=8C=E4=BB=98=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SelectCatalog/SelectTraditionContractPayment.xml | 2 +- src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java | 2 +- src_cmb/com/tenwa/sdk/controller/CmbToPayController.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectTraditionContractPayment.xml b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectTraditionContractPayment.xml index d857d69c9..ca4771b8f 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectTraditionContractPayment.xml +++ b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectTraditionContractPayment.xml @@ -99,7 +99,7 @@ WHERE lci.businesstype='#businessType' AND ( WHERE fbo.flow_unid = fo.objectno AND fbo.flow_name = '璧勯噾浠樻' AND fo.phaseno NOT IN ('1000', '8000'))) tab - + where tab.overmoney>0 ]]> diff --git a/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java b/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java index 08f07002d..8f9c08199 100644 --- a/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java +++ b/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java @@ -63,7 +63,7 @@ public class CmbToCallbackController extends BaseFlowStartAction { * 本方放款账户获取######开始 */ BizObjectManager accountManager = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME); - List accountBoList = accountManager.createQuery("select o.acc_number,o.acc_bank,o.acc_name,o.branch_code,oi.OWN_NAME from o join jbo.com.tenwa.entity.comm.own.OWN_INFO oi on o.own_id = oi.OWN_NUMBER where o.money_type='01' and o.state_='0010' and acc_type='0010' and account_type='out_account' ").getResultList(false); + List accountBoList = accountManager.createQuery("select o.acc_number,o.acc_bank,o.acc_name,o.branch_code,oi.OWN_NAME from o join jbo.com.tenwa.entity.comm.own.OWN_INFO oi on o.own_id = oi.OWN_NUMBER where o.money_type='01' and o.state_='0010' and acc_type='0010' and account_type='out_account' or account_type='inAndOut_account' ").getResultList(false); if( accountBoList==null ) { map.put("code", "1") ; map.put("msg", "本方账户不存在,请检查") ; diff --git a/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java b/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java index b00d2e9ed..6bdbec1e4 100644 --- a/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java +++ b/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java @@ -88,7 +88,7 @@ public class CmbToPayController extends BaseFlowStartAction { * 本方放款账户获取######开始 */ BizObjectManager accountManager = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME); - List accountBoList = accountManager.createQuery("select o.id,o.acc_number,o.acc_bank,o.acc_name,o.branch_code,oi.OWN_NAME from o join jbo.com.tenwa.entity.comm.own.OWN_INFO oi on o.own_id = oi.OWN_NUMBER where o.money_type='01' and o.state_='0010' and acc_type='0010' and account_type='out_account' ").getResultList(false); + List accountBoList = accountManager.createQuery("select o.id,o.acc_number,o.acc_bank,o.acc_name,o.branch_code,oi.OWN_NAME from o join jbo.com.tenwa.entity.comm.own.OWN_INFO oi on o.own_id = oi.OWN_NUMBER where o.money_type='01' and o.state_='0010' and acc_type='0010' and (account_type='out_account' or account_type='inAndOut_account') ").getResultList(false); if( accountBoList==null ||accountBoList.size()==0) { map.put("code", "1") ; map.put("msg", "本方账户不存在,请检查") ; @@ -97,7 +97,7 @@ public class CmbToPayController extends BaseFlowStartAction { } if( accountBoList!=null && accountBoList.size()>1 ) { map.put("code", "1") ; - map.put("msg", "启用的汽车类放款账户有多个请检查,请检查") ; + map.put("msg", "启用的汽车类放款账户只能同时存在一个,请在本方账户中检查！") ; JSONObject jsonObj = JSONObject.fromObject(map); return jsonObj.toString(); }