diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp index 55f67eebc..f5b0ff1e5 100644 --- a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp +++ b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp @@ -40,7 +40,7 @@ }; if("付款业务分担".equals(soft)){ ros = "false"; - doTemp.appendJboWhere(" O.flow_name='付款申请(汽车)' and O.PHASENAME='运营部初审'"); + doTemp.appendJboWhere(" O.flow_name='付款申请(汽车)' and O.PHASENAME='订单初审'"); }; ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- diff --git a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java index 110161ae1..29f122913 100644 --- a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java +++ b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java @@ -358,12 +358,8 @@ public class FundIncomeMethod { } public String createActualPayment(JBOTransaction tx) throws JBOException{ try{ - //获取深圳本方账户 - BizObject boOAS = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME,tx) - .createQuery("account_purpose='default' and state_='0010' and FbSdk='Y' and own_id='aa740e4111c111eaaa0000163e0e11e6' ").getSingleResult(false); - //获取天津本方账户 - BizObject boOAT = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME,tx) - .createQuery("account_purpose='default' and state_='0010' and FbSdk='Y' and own_id='d989246c11c111eaaa0000163e0e11e6' ").getSingleResult(false); + BizObject boOA = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME,tx) + .createQuery("account_purpose='default' and state_='0010' and FbSdk='Y'").getSingleResult(false); for(String contractId : contractIds.split("@")){ @SuppressWarnings("unchecked") List bos = JBOFactory.getBizObjectManager(LC_FUND_INCOME.CLASS_NAME) @@ -384,15 +380,9 @@ public class FundIncomeMethod { otherProperty.put("FlowUnid", flowunid); otherProperty.put("IS_FLOWING", "0"); otherProperty.put("ACCOUNTING_DATE", StringFunction.getTodayNow().split(" ")[0]); - if(lci != null && "aa740e4111c111eaaa0000163e0e11e6".equals(lci.getAttribute("SUBJECTID").toString())){ - otherProperty.put("BANK", boOAS.getAttribute("ACC_BANK").getString()); - otherProperty.put("ACCOUNT", boOAS.getAttribute("ACC_NAME").getString()); - otherProperty.put("ACC_NUMBER", boOAS.getAttribute("ACC_NUMBER").getString()); - }else if(lci != null && "d989246c11c111eaaa0000163e0e11e6".equals(lci.getAttribute("SUBJECTID").toString())){ - otherProperty.put("BANK", boOAT.getAttribute("ACC_BANK").getString()); - otherProperty.put("ACCOUNT", boOAT.getAttribute("ACC_NAME").getString()); - otherProperty.put("ACC_NUMBER", boOAT.getAttribute("ACC_NUMBER").getString()); - } + otherProperty.put("BANK", boOA.getAttribute("ACC_BANK").getString()); + otherProperty.put("ACCOUNT", boOA.getAttribute("ACC_NAME").getString()); + otherProperty.put("ACC_NUMBER", boOA.getAttribute("ACC_NUMBER").getString()); otherProperty.put("INCOME_ID", bo.getAttribute("ID").getString()); otherProperty.put(LC_FUND_INCOME.EBANK_STATUS, "03"); if("0020".equals(payType)||"0030".equals(payType)){