From 2bce1a1cc25ab77143b5afa38754ede2d448fb2a Mon Sep 17 00:00:00 2001 From: joyfas.silva Date: Wed, 18 May 2016 18:32:49 -0300 Subject: [PATCH] Redimine #tarefa-3815 --- cit-core/src/main/java/br/com/centralit/framework/controller/ReportController.java | 3 +++ cit-core/src/main/java/br/com/centralit/framework/controller/ReportControllerImpl.java | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cit-core/src/main/java/br/com/centralit/framework/controller/ReportController.java b/cit-core/src/main/java/br/com/centralit/framework/controller/ReportController.java index 2c41fb1..24f94f9 100644 --- a/cit-core/src/main/java/br/com/centralit/framework/controller/ReportController.java +++ b/cit-core/src/main/java/br/com/centralit/framework/controller/ReportController.java @@ -54,4 +54,7 @@ public interface ReportController { * */ public abstract void gerarRelatorio(boolean download, String type, JasperPrint jasperPrint, HttpServletResponse response, ByteArrayOutputStream baos, String reportName); + + public abstract void gerarRelatorio(boolean download, String type, JasperPrint jasperPrint, HttpServletResponse response, + ByteArrayOutputStream baos, String reportName,boolean isVazio); } \ No newline at end of file diff --git a/cit-core/src/main/java/br/com/centralit/framework/controller/ReportControllerImpl.java b/cit-core/src/main/java/br/com/centralit/framework/controller/ReportControllerImpl.java index dcb53d2..714bd54 100644 --- a/cit-core/src/main/java/br/com/centralit/framework/controller/ReportControllerImpl.java +++ b/cit-core/src/main/java/br/com/centralit/framework/controller/ReportControllerImpl.java @@ -239,8 +239,12 @@ public class ReportControllerImpl implements ReportController { * */ @Override public void gerarRelatorio (boolean download, String type, JasperPrint jasperPrint, HttpServletResponse response, ByteArrayOutputStream baos, String reportName){ + gerarRelatorio(download, type, jasperPrint, response, baos, reportName, verificarRelatorioVazio(jasperPrint)); + } + + public void gerarRelatorio (boolean download, String type, JasperPrint jasperPrint, HttpServletResponse response, ByteArrayOutputStream baos, String reportName, boolean isVazio){ - if(verificarRelatorioVazio(jasperPrint)){ + if(isVazio) { // Create an output byte stream where data will be written baos = new ByteArrayOutputStream(); @@ -251,10 +255,7 @@ public class ReportControllerImpl implements ReportController { // Write to reponse stream this.write(response, baos); - } else { - - response.setStatus(HttpServletResponse.SC_PRECONDITION_FAILED); - - } + } else + response.setStatus(HttpServletResponse.SC_PRECONDITION_FAILED); } } -- libgit2 0.21.2