From 68a72ff547483b15e8fc1792492f1fc5d18693ea Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Fri, 18 Nov 2022 13:31:55 +0000 Subject: [PATCH] =?UTF-8?q?fixes=20bug#=20AL-1223=20qua:Filipe=20dev:Lucas?= =?UTF-8?q?=20Taia=20Corre=C3=A7=C3=A3o=20realizada=20para=20n=C3=A3o=20bu?= =?UTF-8?q?scar=20boletos=20inativos?= 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@115527 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioAproveitamentoFinanceiro.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java index 4f5922a87..3ef7930b5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java @@ -40,7 +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 R, "); sql.append(" RUTA_COMBINACION RC, "); sql.append(" TARIFA TF, "); sql.append(" VIGENCIA_TARIFA VT "); @@ -60,7 +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 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 "); @@ -98,6 +98,7 @@ public class RelatorioAproveitamentoFinanceiro extends Relatorio { sql.append(" left join diagrama_autobus da "); sql.append(" on ro.diagramaautobus_id = da.diagramaautobus_id "); sql.append(" WHERE co.activo = 1 "); + sql.append(" AND c.activo = 1 "); sql.append(" AND m.EMPRESA_ID = :EMPRESA_ID "); sql.append(" and co.FECCORRIDA >= :DATA_INICIAL "); sql.append(" and co.FECCORRIDA <= :DATA_FINAL ");