@@ -431,7 +431,7 @@ public LoanTransactionData retrieveLoanTransactionTemplate(final Long loanId) {
431
431
this .context .authenticatedUser ();
432
432
433
433
RepaymentTransactionTemplateMapper mapper = new RepaymentTransactionTemplateMapper ();
434
- String sql = "select " + mapper .schema () + " where l.id =?" ;
434
+ String sql = "select " + mapper .schema ();
435
435
LoanTransactionData loanTransactionData = this .jdbcTemplate .queryForObject (sql , mapper , LoanTransactionType .REPAYMENT .getValue (),
436
436
loanId , loanId );
437
437
final Collection <PaymentTypeData > paymentOptions = this .paymentTypeReadPlatformService .retrieveAllPaymentTypes ();
@@ -2176,35 +2176,36 @@ private static final class RepaymentTransactionTemplateMapper implements RowMapp
2176
2176
public String schema () {
2177
2177
StringBuilder sqlBuilder = new StringBuilder ();
2178
2178
2179
- sqlBuilder .append ("if(max(tr.transaction_date)>ls.dueDate,max(tr.transaction_date),ls.dueDate) as transactionDate," );
2179
+ sqlBuilder .append ("if(max(tr.transaction_date)>ls.dueDate,max(tr.transaction_date),ls.dueDate) as transactionDate, " );
2180
2180
sqlBuilder .append (
2181
- "ls.principal_amount - IFNULL(ls.principal_writtenoff_derived,0) - IFNULL(ls.principal_completed_derived,0) as principalDue," );
2181
+ "ls.principal_amount - IFNULL(ls.principal_writtenoff_derived,0) - IFNULL(ls.principal_completed_derived,0) as principalDue, " );
2182
2182
sqlBuilder .append (
2183
- "ls.interest_amount - IFNULL(ls.interest_completed_derived,0) - IFNULL(ls.interest_waived_derived,0) - IFNULL(ls.interest_writtenoff_derived,0) as interestDue," );
2183
+ "ls.interest_amount - IFNULL(ls.interest_completed_derived,0) - IFNULL(ls.interest_waived_derived,0) - IFNULL(ls.interest_writtenoff_derived,0) as interestDue, " );
2184
2184
sqlBuilder .append (
2185
- "ls.fee_charges_amount - IFNULL(ls.fee_charges_completed_derived,0) - IFNULL(ls.fee_charges_writtenoff_derived,0) - IFNULL(ls.fee_charges_waived_derived,0) as feeDue," );
2185
+ "ls.fee_charges_amount - IFNULL(ls.fee_charges_completed_derived,0) - IFNULL(ls.fee_charges_writtenoff_derived,0) - IFNULL(ls.fee_charges_waived_derived,0) as feeDue, " );
2186
2186
sqlBuilder .append (
2187
- "ls.penalty_charges_amount - IFNULL(ls.penalty_charges_completed_derived,0) - IFNULL(ls.penalty_charges_writtenoff_derived,0) - IFNULL(ls.penalty_charges_waived_derived,0) as penaltyDue," );
2187
+ "ls.penalty_charges_amount - IFNULL(ls.penalty_charges_completed_derived,0) - IFNULL(ls.penalty_charges_writtenoff_derived,0) - IFNULL(ls.penalty_charges_waived_derived,0) as penaltyDue, " );
2188
2188
sqlBuilder .append (
2189
- " l.currency_code as currencyCode, l.currency_digits as currencyDigits, l.currency_multiplesof as inMultiplesOf, rc.`name` as currencyName, " );
2190
- sqlBuilder .append (" rc.display_symbol as currencyDisplaySymbol, rc.internationalized_name_code as currencyNameCode " );
2191
- sqlBuilder .append (" FROM m_loan l" );
2189
+ "l.currency_code as currencyCode, l.currency_digits as currencyDigits, l.currency_multiplesof as inMultiplesOf, rc.`name` as currencyName, " );
2190
+ sqlBuilder .append ("rc.display_symbol as currencyDisplaySymbol, rc.internationalized_name_code as currencyNameCode " );
2191
+ sqlBuilder .append ("FROM m_loan l " );
2192
2192
sqlBuilder .append (
2193
- " LEFT JOIN m_loan_transaction tr ON tr.loan_id = l.id AND tr.transaction_type_enum = ? and tr.is_reversed = 0" );
2194
- sqlBuilder .append (" join m_currency rc on rc.`code` = l.currency_code " );
2195
- sqlBuilder .append (" JOIN m_loan_repayment_schedule ls ON ls.loan_id = l.id AND ls.completed_derived = 0 " );
2196
- sqlBuilder .append (" join( " );
2197
- sqlBuilder .append (" (select min(ls.duedate) datedue,ls.loan_id from m_loan_repayment_schedule ls " );
2198
- sqlBuilder .append (" where ls.loan_id = ? and ls.completed_derived = 0)" );
2199
- sqlBuilder .append (" )asq on asq.loan_id = ls.loan_id and asq.datedue = ls.duedate" );
2200
- sqlBuilder .append (" GROUP BY ls.duedate" );
2201
- sqlBuilder .append (",ls.principal_amount,ls.principal_completed_derived,ls.principal_writtenoff_derived" );
2193
+ "LEFT JOIN m_loan_transaction tr ON tr.loan_id = l.id AND tr.transaction_type_enum = ? and tr.is_reversed = 0 " );
2194
+ sqlBuilder .append ("join m_currency rc on rc.`code` = l.currency_code " );
2195
+ sqlBuilder .append ("JOIN m_loan_repayment_schedule ls ON ls.loan_id = l.id AND ls.completed_derived = 0 " );
2196
+ sqlBuilder .append ("join( " );
2197
+ sqlBuilder .append ("(select min(ls.duedate) datedue,ls.loan_id from m_loan_repayment_schedule ls " );
2198
+ sqlBuilder .append ("where ls.loan_id = ? and ls.completed_derived = 0) )asq " );
2199
+ sqlBuilder .append ("on asq.loan_id = ls.loan_id and asq.datedue = ls.duedate " );
2200
+ sqlBuilder .append ("WHERE l.id = ? " );
2201
+ sqlBuilder .append ("GROUP BY ls.duedate, " );
2202
+ sqlBuilder .append ("ls.principal_amount,ls.principal_completed_derived,ls.principal_writtenoff_derived, " );
2202
2203
sqlBuilder
2203
- .append (", ls.interest_amount,ls.interest_completed_derived,ls.interest_waived_derived,ls.interest_writtenoff_derived" );
2204
+ .append ("ls.interest_amount,ls.interest_completed_derived,ls.interest_waived_derived,ls.interest_writtenoff_derived, " );
2204
2205
sqlBuilder .append (
2205
- ", ls.fee_charges_amount,ls.fee_charges_completed_derived, ls.fee_charges_writtenoff_derived, ls.fee_charges_waived_derived" );
2206
+ "ls.fee_charges_amount,ls.fee_charges_completed_derived, ls.fee_charges_writtenoff_derived, ls.fee_charges_waived_derived, " );
2206
2207
sqlBuilder .append (
2207
- ", ls.penalty_charges_amount, ls.penalty_charges_completed_derived, ls.penalty_charges_writtenoff_derived, ls.penalty_charges_waived_derived" );
2208
+ "ls.penalty_charges_amount, ls.penalty_charges_completed_derived, ls.penalty_charges_writtenoff_derived, ls.penalty_charges_waived_derived " );
2208
2209
return sqlBuilder .toString ();
2209
2210
2210
2211
}
0 commit comments