From 6b1f0f494d2596197046e2fde8644a15ae95f95a Mon Sep 17 00:00:00 2001 From: "fabricio.oliveira" Date: Mon, 29 Apr 2019 13:13:02 +0000 Subject: [PATCH] =?UTF-8?q?0014009:=20Chamado=2065277=20-=20Relat=C3=B3rio?= =?UTF-8?q?=20fechamento=20por=20banco=20fixes=20bug#14009=20dev:Silverio?= =?UTF-8?q?=20qua:Juliane?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@92483 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../templates/RelatorioDepositos.jasper | Bin 42766 -> 43460 bytes .../templates/RelatorioDepositos.jrxml | 16 ++++++++++------ .../RelatorioDepositosController.java | 3 +++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper index 5a46affa1676fb6da0780f22d653a24818a797ce..4953131984c580ad82d4854afd710695740bc343 100644 GIT binary patch delta 10892 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 Opw#NDt*3t~a{Ui)dX97e delta 10307 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml index 55bb414f7..2b88a2c40 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml @@ -1,13 +1,14 @@ - - + + + @@ -24,8 +25,8 @@ - - + + @@ -40,7 +41,10 @@ - + + + + @@ -169,7 +173,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/contacorrente/RelatorioDepositosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/contacorrente/RelatorioDepositosController.java index 45ae53fdc..7366047ac 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/contacorrente/RelatorioDepositosController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/contacorrente/RelatorioDepositosController.java @@ -60,7 +60,10 @@ public class RelatorioDepositosController extends MyGenericForwardComposer { if (chkClassificarBanco.isChecked()) { parametros.put("isClassificaPorBanco", true); + }else { + parametros.put("isClassificaPorBanco", false); } + int dias = DateUtil.diferencaEntreDatasEmdias(this.datInicial.getValue(), this.datFinal.getValue()); // Período maior que 360 dias (1 ano), para não deixar um range de daods muito grande e não "travar" o relatório. if (dias > 360) {