From 89a6e64b8c90bb201c1c1a68c342096ee58b69c3 Mon Sep 17 00:00:00 2001 From: gleimar Date: Tue, 4 Jul 2017 17:11:00 +0000 Subject: [PATCH] =?UTF-8?q?corre=C3=A7=C3=B5es=20filtro=20relat=C3=B3rio?= =?UTF-8?q?=20demanda?= 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@70976 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioDemandasDetalhado.java | 2 +- .../controladores/relatorios/RelatorioDemandasConsolidado.java | 1 + .../gui/controladores/relatorios/RelatorioDemandasDiario.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhado.java index 2ea0d1c55..00cd32e71 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhado.java @@ -98,7 +98,7 @@ public class RelatorioDemandasDetalhado extends RelatorioDemandas { sql.append(" WHERE "); sql.append(" bol.FECHORVIAJE >= :DATA_INICIAL "); sql.append(" AND bol.FECHORVIAJE <= :DATA_FINAL "); - sql.append(" AND BOL.MOTIVOCANCELACION_ID IS NULL "); + sql.append(" AND BOL.MOTIVOCANCELACION_ID IS NULL "); if (parametros.get("RUTA_ID") != null) { sql.append(" AND r.RUTA_ID = :RUTA_ID "); } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasConsolidado.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasConsolidado.java index bf1f77baa..e8b291d0d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasConsolidado.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasConsolidado.java @@ -77,6 +77,7 @@ public class RelatorioDemandasConsolidado extends RelatorioDemandas { sql.append(" WHERE "); sql.append(" bol.FECHORVIAJE >= :DATA_INICIAL "); sql.append(" AND bol.FECHORVIAJE <= :DATA_FINAL "); + sql.append(" AND bol.MOTIVOCANCELACION_ID is null "); if (parametros.get("RUTA_ID") != null) { sql.append(" AND r.RUTA_ID = :RUTA_ID "); } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasDiario.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasDiario.java index bddd6dbd9..c07abb564 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasDiario.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasDiario.java @@ -69,7 +69,7 @@ public class RelatorioDemandasDiario extends RelatorioDemandas { sql.append(" cs.CLASESERVICIO_ID = bol.CLASESERVICIO_ID "); sql.append(" LEFT JOIN corrida c "); sql.append(" ON "); - sql.append(" c.CORRIDA_ID = bol.CORRIDA_ID "); + sql.append(" c.CORRIDA_ID = bol.CORRIDA_ID and bol.FECCORRIDA = c.FECCORRIDA "); sql.append(" LEFT JOIN TIPO_SERVICIO ts "); sql.append(" ON "); sql.append(" ts.TIPOSERVICIO_ID = c.TIPOSERVICIO_ID "); @@ -86,6 +86,7 @@ public class RelatorioDemandasDiario extends RelatorioDemandas { sql.append(" WHERE "); sql.append(" bol.FECHORVIAJE >= :DATA_INICIAL "); sql.append(" AND bol.FECHORVIAJE <= :DATA_FINAL "); + sql.append(" AND and bol.MOTIVOCANCELACION_ID is null "); if (parametros.get("RUTA_ID") != null) { sql.append(" AND r.RUTA_ID = :RUTA_ID "); }