From 9430040c945fa554a153c0c15e9f7feb0f718303 Mon Sep 17 00:00:00 2001 From: valdevir Date: Sun, 24 Jan 2021 01:53:03 +0000 Subject: [PATCH] fixes bug#21462 qua: dev:Valdevir git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@105130 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioAproveitamentoFinanceiro.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java index 03c01bda6..4d1d6e979 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java @@ -40,6 +40,7 @@ public class RelatorioAproveitamentoFinanceiro extends Relatorio { sql.append(" FROM "); sql.append(" CORRIDA CR, "); sql.append(" TRAMO TR, "); + sql.append(" RUTA R, "); sql.append(" RUTA_COMBINACION RC, "); sql.append(" TARIFA TF, "); sql.append(" VIGENCIA_TARIFA VT "); @@ -47,6 +48,7 @@ public class RelatorioAproveitamentoFinanceiro extends Relatorio { sql.append(" CR.CORRIDA_ID = TB.SERVICO "); sql.append(" AND CR.FECCORRIDA BETWEEN :DATA_INICIAL and :DATA_FINAL "); sql.append(" AND CR.RUTA_ID = TB.RUTAID "); + sql.append(" AND CR.RUTA_ID = R.RUTA_ID AND R.ACTIVO = 1 "); sql.append(" AND CR.RUTA_ID = RC.RUTA_ID AND RC.ACTIVO = 1 "); sql.append(" AND RC.TRAMO_ID = TR.TRAMO_ID "); sql.append(" AND TF.TRAMO_ID = TR.TRAMO_ID "); @@ -58,6 +60,7 @@ public class RelatorioAproveitamentoFinanceiro extends Relatorio { sql.append(" AND TR.ORIGEN_ID = CR.ORIGEN_ID "); sql.append(" AND TR.DESTINO_ID = CR.DESTINO_ID "); sql.append(" AND TF.VIGENCIATARIFA_ID = VT.VIGENCIATARIFA_ID "); + sql.append(" AND TF.ORGAOCONCEDENTE_ID = R.ORGAOCONCEDENTE_ID "); sql.append(" AND VT.ACTIVO = 1 "); sql.append(" AND CR.FECCORRIDA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA "); sql.append(" AND TF.CLASESERVICIO_ID = CR.CLASESERVICIO_ID ");