diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResource.java index 0f0c4c5b7..a3dd2e87c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResource.java @@ -105,7 +105,7 @@ public class RunreportsApiResource { // Pass through isSelfServiceUserReport so that ReportingProcessService implementations can use it queryParams.putSingle(IS_SELF_SERVICE_USER_REPORT_PARAMETER, Boolean.toString(isSelfServiceUserReport)); - String reportType = this.readExtraDataAndReportingService.getReportType(reportName, isSelfServiceUserReport); + String reportType = this.readExtraDataAndReportingService.getReportType(reportName, isSelfServiceUserReport, parameterType); ReportingProcessService reportingProcessService = this.reportingProcessServiceProvider.findReportingProcessService(reportType); if (reportingProcessService == null) { throw new PlatformServiceUnavailableException("err.msg.report.service.implementation.missing", diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingService.java index cf4b38314..ab3611326 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingService.java @@ -34,7 +34,7 @@ public interface ReadReportingService { ReportData retrieveReport(Long id); - String getReportType(String reportName, boolean isSelfServiceUserReport); + String getReportType(String reportName, boolean isSelfServiceUserReport, boolean isParameterType); Collection getAllowedParameters(); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java index cd538e33c..c12df8841 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java @@ -212,7 +212,11 @@ public class ReadReportingServiceImpl implements ReadReportingService { } @Override - public String getReportType(final String reportName, final boolean isSelfServiceUserReport) { + public String getReportType(final String reportName, final boolean isSelfServiceUserReport, final boolean isParameterType) { + if (isParameterType) { + return "Table"; + } + final String sql = "SELECT ifNull(report_type,'') AS report_type FROM `stretchy_report` WHERE report_name = ? AND self_service_user_report = ?"; final String sqlWrapped = this.genericDataService.wrapSQL(sql); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java index 1de29e37c..241d0e638 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java @@ -441,7 +441,7 @@ public class ReportMailingJobWritePlatformServiceImpl implements ReportMailingJo try { final boolean isSelfServiceUserReport = false; - final String reportType = this.readReportingService.getReportType(reportName, isSelfServiceUserReport); + final String reportType = this.readReportingService.getReportType(reportName, isSelfServiceUserReport, false); final ReportingProcessService reportingProcessService = this.reportingProcessServiceProvider .findReportingProcessService(reportType);