diff --git a/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp index eabbe3b7a..dda6e585a 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp @@ -90,11 +90,9 @@ } function changePenalty(datelist){ - debugger; var PAYMENT_NUMBER = getCurrentItemValue("PAYMENT_NUMBER"); var PLAN_LIST = getCurrentItemValue("PLAN_LIST"); var HIRE_DATE = datelist; - var penalty = AsControl.RunJsp("/Tenwa/Lease/Flow/Fund/FundCollection/GetPenalty.jsp","PAYMENT_NUMBER="+PAYMENT_NUMBER+"&PLAN_LIST="+PLAN_LIST+"&HIRE_DATE="+HIRE_DATE); setItemValue(0, getRow(0), "PENALTY_ADJUST", penalty); } diff --git a/src_tenwa/com/tenwa/flow/rent/rentincome/VILCRentPlanListHandler.java b/src_tenwa/com/tenwa/flow/rent/rentincome/VILCRentPlanListHandler.java index 130b11ffa..f8512ba65 100644 --- a/src_tenwa/com/tenwa/flow/rent/rentincome/VILCRentPlanListHandler.java +++ b/src_tenwa/com/tenwa/flow/rent/rentincome/VILCRentPlanListHandler.java @@ -31,7 +31,9 @@ public class VILCRentPlanListHandler extends CommonHandler{ } bo.setAttributeValue("fact_date", factDate); bo.setAttributeValue("penalty", new BigDecimal(penalty).setScale(2)); - bo.setAttributeValue("penalty_over", new BigDecimal(penalty).subtract(new BigDecimal(bo.getAttribute("fact_penalty").getString())).subtract(new BigDecimal(bo.getAttribute("penalty_adjust").getString())).setScale(2)); - + BigDecimal penalty_over = new BigDecimal(penalty).subtract(new BigDecimal(bo.getAttribute("fact_penalty").getString())).subtract(new BigDecimal(bo.getAttribute("penalty_adjust").getString())).setScale(2); + bo.setAttributeValue("penalty_over", penalty_over); + BigDecimal all_over = BigDecimal.valueOf(rentOver).add(penalty_over); + bo.setAttributeValue("all_over", all_over); } }