This is an automated email from the ASF dual-hosted git repository. arnold pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 69083de9498749fb3eb96439473751cacc4d473c Author: Adam Saghy <[email protected]> AuthorDate: Wed Aug 3 18:33:32 2022 +0200 Fix floating rate and floating rate period native queries --- .../service/FloatingRatesReadPlatformServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java index 9d8bcea3a..3fb1af249 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java @@ -110,8 +110,8 @@ public class FloatingRatesReadPlatformServiceImpl implements FloatingRatesReadPl .append("crappu.username as createdBy, ").append("rate.created_date as createdOn, ") .append("rate.created_on_utc as createdOnUTC, ").append("moappu.username as modifiedBy, ") .append("rate.lastmodified_date as modifiedOn, ").append("rate.last_modified_on_utc as modifiedOnUTC ") - .append("FROM m_floating_rates as rate ").append("LEFT JOIN m_appuser as crappu on rate.createdby_id = crappu.id ") - .append("LEFT JOIN m_appuser as moappu on rate.lastmodifiedby_id = moappu.id "); + .append("FROM m_floating_rates as rate ").append("LEFT JOIN m_appuser as crappu on rate.created_by = crappu.id ") + .append("LEFT JOIN m_appuser as moappu on rate.last_modified_by = moappu.id "); FloatingRateRowMapper(final boolean addRatePeriods) { this.addRatePeriods = addRatePeriods; @@ -155,11 +155,11 @@ public class FloatingRatesReadPlatformServiceImpl implements FloatingRatesReadPl .append("period.interest_rate as interestRate, ") .append("period.is_differential_to_base_lending_rate as isDifferentialToBaseLendingRate, ") .append("period.is_active as isActive, ").append("crappu.username as createdBy, ") - .append("period.created_date as createdOn, ").append("rate.created_on_utc as createdOnUTC, ") + .append("period.created_date as createdOn, ").append("period.created_on_utc as createdOnUTC, ") .append("moappu.username as modifiedBy, ").append("period.lastmodified_date as modifiedOn, ") - .append("rate.last_modified_on_utc as modifiedOnUTC ").append("FROM m_floating_rates_periods as period ") - .append("LEFT JOIN m_appuser as crappu on period.createdby_id = crappu.id ") - .append("LEFT JOIN m_appuser as moappu on period.lastmodifiedby_id = moappu.id "); + .append("period.last_modified_on_utc as modifiedOnUTC ").append("FROM m_floating_rates_periods as period ") + .append("LEFT JOIN m_appuser as crappu on period.created_by = crappu.id ") + .append("LEFT JOIN m_appuser as moappu on period.last_modified_by = moappu.id "); @Override public FloatingRatePeriodData mapRow(final ResultSet rs, @SuppressWarnings("unused") final int rowNum) throws SQLException {
