From 916ff7f3fe19f22cdfc2b305fa74568db5b2fa2e Mon Sep 17 00:00:00 2001 From: celio Date: Fri, 6 Aug 2021 20:43:32 +0000 Subject: [PATCH] fix bug#22299 dev: GLEIMAR qua: Silvania git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@108218 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioMensalDAER.java | 5 +- .../RelatorioMensalDAER_pt_BR.properties | 4 ++ .../templates/RelatorioMensalDAER.jasper | Bin 47997 -> 52423 bytes .../templates/RelatorioMensalDAER.jrxml | 63 +++++++++++++++--- .../RelatorioMensalDAERController.java | 32 ++++++--- 5 files changed, 83 insertions(+), 21 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMensalDAER.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMensalDAER.java index 65f3cd23f..6114c4c09 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMensalDAER.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMensalDAER.java @@ -77,7 +77,10 @@ public class RelatorioMensalDAER extends Relatorio { } stmt.setInt("EMPRESA", empresa.getEmpresaId()); stmt.setString("AGENCIA", agencia); - stmt.setString("TIPOVENTA_ID", tipoVenta); + if(istipoVenta) { + stmt.setString("TIPOVENTA_ID", tipoVenta); + } + rset = stmt.executeQuery(); return rset; } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMensalDAER_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMensalDAER_pt_BR.properties index 636d9be3e..0ffc86030 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMensalDAER_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMensalDAER_pt_BR.properties @@ -6,10 +6,14 @@ msg.a= header.titulo.relatorio=BOLETIM ESTATÍSTICO MENSAL DE ESTAÇÕES RODIVIÁRIAS header.mes=M-S header.ano=ANO +header.periodo=Per\u00EDodo\: +header.data.hora=Data/Hora\: header.tr=TR header.tl=TL header.nl=NL header.estacao=NUM.ESTAC. +cabecalho.impressorPor=Impresso por +header.pagina=P\u00E1gina\: header.filtro.rodoviaria= Rodoviária de: #Labels detail diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMensalDAER.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMensalDAER.jasper index 450b6c1eb06353a5cc92edb612d801b3fcd540a1..c672eaeda10a9fe258116d235edac866b93cab8f 100644 GIT binary patch delta 15207 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 bc>c$)?tM(ZT{rSK^CEfK_M3QJNB92&qO;cZ delta 11304 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMensalDAER.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMensalDAER.jrxml index 3e9208776..40b0096c6 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMensalDAER.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMensalDAER.jrxml @@ -44,9 +44,9 @@ - + - + @@ -56,7 +56,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -248,7 +248,7 @@ - + @@ -481,6 +481,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -513,8 +548,7 @@ - + @@ -663,10 +697,21 @@ - + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMensalDAERController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMensalDAERController.java index 4e4b366b3..6fdbfaf0d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMensalDAERController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMensalDAERController.java @@ -127,15 +127,25 @@ public class RelatorioMensalDAERController extends MyGenericForwardComposer { StringBuilder tipVenta = new StringBuilder(); StringBuilder tipVentaIds = new StringBuilder(); - for (TipoVenta venta : listSelectedTipoVenta) { - tipVenta.append(venta.getDesctipoventa()).append(","); - tipVentaIds.append(venta.getTipoventaId()).append(","); + String todos = "-1"; + + if (!listSelectedTipoVenta.isEmpty()) { + for (TipoVenta venta : listSelectedTipoVenta) { + tipVenta.append(venta.getDesctipoventa()).append(","); + if (todos.equals(venta.getTipoventaId().toString())) { + tipVentaIds = new StringBuilder(); + tipVentaIds.append(""); + break; + } + tipVentaIds.append(venta.getTipoventaId()).append(","); + } + + // removendo ultima virgula + tipVentaIds = tipVentaIds.delete(tipVentaIds.length() -1, tipVentaIds.length()); + tipVenta = tipVenta.delete(tipVenta.length() -1, tipVenta.length()); + } - // removendo ultima virgula - tipVentaIds = tipVentaIds.delete(tipVentaIds.length() -1, tipVentaIds.length()); - tipVenta = tipVenta.delete(tipVenta.length() -1, tipVenta.length()); - parametros.put("TIPOVENTA", tipVenta.append(";").toString()); parametros.put("TIPOVENTA_ID", tipVentaIds.toString()); @@ -274,17 +284,17 @@ public class RelatorioMensalDAERController extends MyGenericForwardComposer { public void onCheck$rdTipoAnexoPDF() { if (rdTipoAnexoPDF.isChecked()) { - tipoRelatorio(true, false); + tipoRelatorio(true); } } - private void tipoRelatorio(boolean PDF, boolean XLS) { - isPDF = (PDF ? PDF : XLS); + private void tipoRelatorio(boolean isPDFSelected) { + isPDF = isPDFSelected; } public void onCheck$rdTipoAnexoXLS() { if (rdTipoAnexoXLS.isChecked()) { - tipoRelatorio(false, true); + tipoRelatorio(false); } }