fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug# 

AL-1223
qua:Filipe
dev:Lucas Taia
Correção realizada para não buscar boletos inativos

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@115527 d1611594-4594-4d17-8e1d-87c2c4800839
master
gleison.cruz 2022-11-18 13:31:55 +00:00
parent 7174094979
commit 68a72ff547
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java
View File

@ -40,7 +40,7 @@ public class RelatorioAproveitamentoFinanceiro extends Relatorio {
sql.append(" FROM "); sql.append(" FROM ");
sql.append(" CORRIDA CR, "); sql.append(" CORRIDA CR, ");
sql.append(" TRAMO TR, "); sql.append(" TRAMO TR, ");
sql.append(" RUTA R, "); sql.append(" RUTA R, ");
sql.append(" RUTA_COMBINACION RC, "); sql.append(" RUTA_COMBINACION RC, ");
sql.append(" TARIFA TF, "); sql.append(" TARIFA TF, ");
sql.append(" VIGENCIA_TARIFA VT "); 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.ORIGEN_ID = CR.ORIGEN_ID ");
sql.append(" AND TR.DESTINO_ID = CR.DESTINO_ID "); sql.append(" AND TR.DESTINO_ID = CR.DESTINO_ID ");
sql.append(" AND TF.VIGENCIATARIFA_ID = VT.VIGENCIATARIFA_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 VT.ACTIVO = 1 ");
sql.append(" AND CR.FECCORRIDA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA "); sql.append(" AND CR.FECCORRIDA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA ");
sql.append(" AND TF.CLASESERVICIO_ID = CR.CLASESERVICIO_ID "); 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(" left join diagrama_autobus da ");
sql.append(" on ro.diagramaautobus_id = da.diagramaautobus_id "); sql.append(" on ro.diagramaautobus_id = da.diagramaautobus_id ");
sql.append(" WHERE co.activo = 1 "); sql.append(" WHERE co.activo = 1 ");
sql.append(" AND c.activo = 1 ");
sql.append(" AND m.EMPRESA_ID = :EMPRESA_ID "); sql.append(" AND m.EMPRESA_ID = :EMPRESA_ID ");
sql.append(" and co.FECCORRIDA >= :DATA_INICIAL "); sql.append(" and co.FECCORRIDA >= :DATA_INICIAL ");
sql.append(" and co.FECCORRIDA <= :DATA_FINAL "); sql.append(" and co.FECCORRIDA <= :DATA_FINAL ");