From 47eb07ab76b471638e25337be11b17f3494a3beb Mon Sep 17 00:00:00 2001 From: valdevir Date: Thu, 13 May 2021 21:34:26 +0000 Subject: [PATCH] fixes bug#22115 qua: dev:Valdir git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@106701 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/relatorios/impl/RelatorioIndiceIRK.java | 1 + .../controladores/relatorios/RelatorioIndiceIRKController.java | 2 +- web/gui/relatorios/filtroRelatorioIRK.zul | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java index 80f121779..b6e97ef08 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java @@ -195,6 +195,7 @@ public class RelatorioIndiceIRK extends Relatorio { sql.append(" indiceirkminimo, "); sql.append(" hora, "); sql.append(" extensao "); + sql.append(" order by hora "); return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioIndiceIRKController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioIndiceIRKController.java index d7f08ef02..ca0080449 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioIndiceIRKController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioIndiceIRKController.java @@ -154,7 +154,7 @@ public class RelatorioIndiceIRKController extends MyGenericForwardComposer { StringBuilder rutasIds = new StringBuilder(); for (int i =0; i< lsNumLinha.size() ; i++) { rutasIds.append(lsNumLinha.get(i).getRutaId()); - if(lsNumServico.size() > 1 && i < lsNumLinha.size() -1) { + if(lsNumLinha.size() > 1 && i < lsNumLinha.size() -1) { rutasIds.append(", "); } } diff --git a/web/gui/relatorios/filtroRelatorioIRK.zul b/web/gui/relatorios/filtroRelatorioIRK.zul index c119166b0..9150dd0b8 100644 --- a/web/gui/relatorios/filtroRelatorioIRK.zul +++ b/web/gui/relatorios/filtroRelatorioIRK.zul @@ -189,7 +189,8 @@ + model="@{winFiltroRelatorioIndiceIRK$composer.lsEmpresa}" + constraint="no empty" />