From a83747822beb691b4f92f4ba6d7af044a25e4bb7 Mon Sep 17 00:00:00 2001 From: sachinkulkarni12 Date: Fri, 8 Apr 2016 12:00:59 +0530 Subject: [PATCH] changes for fees --- .../service/LoanChargeReadPlatformServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java index f38d87eeb..c2a908cfd 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java @@ -271,7 +271,7 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform + " order by lc.charge_time_enum ASC, lc.due_for_collection_as_of_date ASC, lc.is_penalty ASC"; Collection charges = this.jdbcTemplate.query(sql, rm, - new Object[] { LoanTransactionType.ACCRUAL.getValue(), loanId }); + new Object[] { LoanTransactionType.ACCRUAL.getValue(), loanId, loanId }); charges = updateLoanChargesWithUnrecognizedIncome(loanId, charges); Collection removeCharges = new ArrayList<>(); @@ -311,7 +311,7 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform sb.append("select lcp.loan_charge_id, lcp.amount"); sb.append(" from m_loan_charge_paid_by lcp "); sb.append( - "inner join m_loan_transaction lt on lt.id = lcp.loan_transaction_id and lt.is_reversed = 0 and lt.transaction_type_enum = ?"); + "inner join m_loan_transaction lt on lt.id = lcp.loan_transaction_id and lt.is_reversed = 0 and lt.transaction_type_enum = ? and lt.loan_id = ?"); sb.append(") cp on cp.loan_charge_id= lc.id "); schemaSql = sb.toString(); @@ -348,7 +348,7 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform final String sql = "select " + rm.schema() + " where lc.loan_id=? AND lc.is_active = 1 group by lc.id " + " order by lc.charge_time_enum ASC, lc.due_for_collection_as_of_date ASC, lc.is_penalty ASC"; - return this.jdbcTemplate.query(sql, rm, new Object[] { LoanTransactionType.WAIVE_CHARGES.getValue(), loanId }); + return this.jdbcTemplate.query(sql, rm, new Object[] { LoanTransactionType.WAIVE_CHARGES.getValue(), loanId, loanId }); } @@ -371,7 +371,7 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform sb.append("select cpb.loan_charge_id, lt.unrecognized_income_portion"); sb.append(" from m_loan_charge_paid_by cpb "); sb.append( - "inner join m_loan_transaction lt on lt.id = cpb.loan_transaction_id and lt.is_reversed = 0 and lt.transaction_type_enum = ?"); + "inner join m_loan_transaction lt on lt.id = cpb.loan_transaction_id and lt.is_reversed = 0 and lt.transaction_type_enum = ? and lt.loan_id = ? "); sb.append(") wt on wt.loan_charge_id= lc.id "); schemaSql = sb.toString();