diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp index 50fc35e50..1a2acae15 100644 --- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp +++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp @@ -86,12 +86,13 @@ alert(result); return; } + var ownId = getItemValue(0, 0, "own_id"); var accountType = getItemValue(0, 0, "account_type"); var accType = getItemValue(0, 0, "acc_type"); var state = getItemValue(0, 0, "state_"); var FbSdk = getItemValue(0,0,"FbSdk"); var id="<%=id%>"; - var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk; + 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){ as_save("myiframe0","parent.AsDialog.ClosePage()"); @@ -102,8 +103,9 @@ //请选择出租人 function selectLessor(){ - AsDialog.OpenSelector("SelectLessor","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ - if(!sReturn||sReturn=="_CANCEL_"){ + //AsDialog.OpenSelector("SelectLessor","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + AsDialog.OpenSelector("selectManySubject","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + if(!sReturn||sReturn=="_CANCEL_"){ alert(getHtmlMessage('1'));//请选择一条信息！ return; } diff --git a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java index 56a3dfeef..7361222d2 100644 --- a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java +++ b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java @@ -19,6 +19,7 @@ public class CalcRentCompare implements BizObjectCompare{ private String ownName; private String ownNumber; private String accNumber; + private String ownId; @Override public boolean ObjectCompare(BizObject cObject, BizObject toObject) @@ -81,9 +82,18 @@ public class CalcRentCompare implements BizObjectCompare{ public void setAccNumber(String accNumber) { this.accNumber = accNumber; } + + public String getOwnId() { + return ownId; + } + + public void setOwnId(String ownId) { + this.ownId = ownId; + } + 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')"; - BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql).getSingleResult(false); + 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); if(bo==null||"".equals(bo)){ return "null"; } diff --git a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java index 612fddbc5..110161ae1 100644 --- a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java +++ b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java @@ -13,6 +13,7 @@ import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP; import jbo.app.tenwa.calc.LC_FUND_PLAN; import jbo.app.tenwa.calc.VI_LC_FUND_PLAN; import jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; import com.amarsoft.are.jbo.BizObject; @@ -357,9 +358,12 @@ public class FundIncomeMethod { } public String createActualPayment(JBOTransaction tx) throws JBOException{ try{ - //获取本方账户 - BizObject boOA = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME,tx) - .createQuery("account_purpose='default' and state_='0010' and FbSdk='Y'").getSingleResult(false); + //获取深圳本方账户 + 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); for(String contractId : contractIds.split("@")){ @SuppressWarnings("unchecked") List bos = JBOFactory.getBizObjectManager(LC_FUND_INCOME.CLASS_NAME) @@ -368,6 +372,8 @@ public class FundIncomeMethod { BigDecimal totalMoney = new BigDecimal("0"); int contractCount = 0; if(bos.size() > 0){ + BizObject lci = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME,tx) + .createQuery(" id=:id ").setParameter("id", contractId).getSingleResult(false); Map fromCondition = new HashMap(); Map otherProperty = new HashMap(); for(BizObject bo:bos){ @@ -378,9 +384,15 @@ public class FundIncomeMethod { otherProperty.put("FlowUnid", flowunid); otherProperty.put("IS_FLOWING", "0"); otherProperty.put("ACCOUNTING_DATE", StringFunction.getTodayNow().split(" ")[0]); - 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()); + 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("INCOME_ID", bo.getAttribute("ID").getString()); otherProperty.put(LC_FUND_INCOME.EBANK_STATUS, "03"); if("0020".equals(payType)||"0030".equals(payType)){