From 493dfaa68dff4f505d2789a1731fe6e0c2fcdd96 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 29 Jan 2021 15:58:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ROA=E7=9A=84=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=97=A5=E5=BF=97=E5=92=8C=E9=99=84=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc/com/tenwa/reckon/help/ConditionHelper.java | 3 ++- src_core/com/tenwa/doc/action/DocListInitAction.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/calc/com/tenwa/reckon/help/ConditionHelper.java b/calc/com/tenwa/reckon/help/ConditionHelper.java index 9f6746e00..4b2e8df20 100644 --- a/calc/com/tenwa/reckon/help/ConditionHelper.java +++ b/calc/com/tenwa/reckon/help/ConditionHelper.java @@ -169,7 +169,8 @@ public class ConditionHelper { .append(",手续费税率：").append(handRate).append(",GPS差额:").append(gpsDifference).append(",GPS差额税率:").append(gpsInstallFee) .append(",租金表里成本和：").append(costMoney).append(",保证金金额:").append(cb.getCautionMoney()).append(",租赁年限:").append(leaseTerm) .append(",成本利率：").append(CostInterestRate).append(",租金税率:").append(rentRate).append(",融资金额:").append(cleanLeaseMoney) - .append(",运营费率：").append(new BigDecimal( operatingRate ).divide( percentage ) ).append(",风险计提比率:").append( new BigDecimal( riskAccrualRatio ).divide( percentage ) ); + .append(",运营费率：").append(new BigDecimal( operatingRate ).divide( percentage ) ).append(",风险计提比率:").append( new BigDecimal( riskAccrualRatio ).divide( percentage ) ) + .append(",收入：").append(in).append(",成本：").append(cost).append(",运营费用：").append(operatingExpenses).append(",风险计提：").append(withdrawalRisk); System.out.println(sb.toString()); if ( roa.compareTo( new BigDecimal( roaValue ).divide( new BigDecimal("100") ) ) < 0 ) { throw new BusinessException( "ROA小于产品配置！" ); diff --git a/src_core/com/tenwa/doc/action/DocListInitAction.java b/src_core/com/tenwa/doc/action/DocListInitAction.java index 3edeadb88..7790924bd 100644 --- a/src_core/com/tenwa/doc/action/DocListInitAction.java +++ b/src_core/com/tenwa/doc/action/DocListInitAction.java @@ -493,6 +493,7 @@ public class DocListInitAction { BizObjectManager bomLDR = JBOFactory.getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME); BizObjectManager bomLDL = JBOFactory.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME); BizObjectManager bomLDA = JBOFactory.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME); + BizObject boLDR = null; List boListLDR = null; if(objecttype!=null){ @@ -503,10 +504,10 @@ public class DocListInitAction { .setParameter("proj_id", fbo==null?"":fbo.getAttribute("proj_id").getString()) .getResultList(false); }else if(objecttype!=""){ - boLDR = bomLDR.createQuery("flow_unid =:flowunid and objecttype=:objecttype") + boListLDR = bomLDR.createQuery("flow_unid =:flowunid and objecttype=:objecttype") .setParameter("flowunid", flowunid) .setParameter("objecttype", objecttype) - .getSingleResult(false); + .getResultList(false); }else{ boLDR = bomLDR.createQuery("flow_unid =:flowunid and objecttype is null") .setParameter("flowunid", flowunid)