[fineract] branch develop updated: FINERACT-1054 fixed sql grammar at loan repayment

[vo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vorburger pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new b4621b2  FINERACT-1054 fixed sql grammar at loan repayment
b4621b2 is described below

commit b4621b2a71cf9854f7a7b34a62ae67792777a601
Author: francisguchie <fr...@gmail.com>
AuthorDate: Thu Jul 9 23:00:55 2020 +0000

    FINERACT-1054 fixed sql grammar at loan repayment
---
 .../loanaccount/service/LoanReadPlatformServiceImpl.java          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
index 325e69b..45ff8f9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
@@ -2197,6 +2197,14 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
             sqlBuilder.append(" (select min(ls.duedate) datedue,ls.loan_id from m_loan_repayment_schedule ls  ");
             sqlBuilder.append(" where ls.loan_id = ? and  ls.completed_derived = 0)");
             sqlBuilder.append(" )asq on asq.loan_id = ls.loan_id and asq.datedue = ls.duedate");
+            sqlBuilder.append(" GROUP BY ls.duedate");
+            sqlBuilder.append(",ls.principal_amount,ls.principal_completed_derived,ls.principal_writtenoff_derived");
+            sqlBuilder
+                    .append(",ls.interest_amount,ls.interest_completed_derived,ls.interest_waived_derived,ls.interest_writtenoff_derived");
+            sqlBuilder.append(
+                    ",ls.fee_charges_amount,ls.fee_charges_completed_derived, ls.fee_charges_writtenoff_derived, ls.fee_charges_waived_derived");
+            sqlBuilder.append(
+                    ",ls.penalty_charges_amount, ls.penalty_charges_completed_derived, ls.penalty_charges_writtenoff_derived, ls.penalty_charges_waived_derived");
             return sqlBuilder.toString();
 
         }