From e74bbba875cbff3bdc9c6726dd106c7cc02f76f7 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Fri, 27 Mar 2020 18:36:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=BD=91=E9=93=B6=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E6=97=B6=EF=BC=8C=E5=BC=B9=E5=87=BA=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96=EF=BC=8C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=8C=89=E6=9C=80=E6=96=B0=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=BD=9A=E6=81=AF=E9=87=91=E9=A2=9D=E9=94=99?= =?UTF-8?q?=E8=AF=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tenwa/flow/rent/rentincome/RentIncomeMethod.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java b/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java index 5e9d09fe7..ffe37f12b 100644 --- a/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java +++ b/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java @@ -336,7 +336,13 @@ public class RentIncomeMethod { BizObject bo = JBOFactory.getBizObjectManager(VI_LC_RENT_PLAN.CLASS_NAME).createQuery("id=:planID").setParameter("planID", ids[i]).getSingleResult(false); String corpusOver = bo.getAttribute("corpus_over").getString(); String interestOver = bo.getAttribute("interest_over").getString(); - String penaltyOver = bo.getAttribute("penalty_over").getString(); + // String penaltyOver = bo.getAttribute("penalty_over").getString(); + String factPenalty = bo.getAttribute("fact_penalty").getString(); + String penaltyAdjust = bo.getAttribute("penalty_adjust").getString(); + String penalty = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME) + .createQuery("select v.round(v.getRentPenalty('"+bo.getAttribute("payment_number").getString()+"','"+bo.getAttribute("plan_list").getString()+"','"+factDate+"'),2) as v.penalty from O").getSingleResult(false).getAttribute("penalty").getString(); + String penaltyOver = new BigDecimal(penalty).subtract(new BigDecimal(factPenalty)).subtract(new BigDecimal(penaltyAdjust)).toString(); + if("penalty_income".equals(penaltyRule)){ penaltyOver = "0.00"; }else{