From 1b715d4456b0e1f4aacd5545717d150c6b43424f Mon Sep 17 00:00:00 2001 From: emerson Date: Thu, 4 Oct 2018 20:42:23 +0000 Subject: [PATCH] fixes bug#0012295 dev: fabricio qua: renato git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@85932 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/relatorios/impl/RelatorioLinhasHorario.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java index bb6940186..0a66bb6d0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java @@ -428,7 +428,8 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" COUNT(CASE WHEN C.TIPOSERVICIO_ID = 2 THEN 1 ELSE NULL END) AS EXTRA "); sql.append(" FROM CORRIDA C INNER JOIN PARADA ORIGEM ON C.Origen_Id = ORIGEM.PARADA_ID INNER JOIN PARADA DESTINO ON C.DESTINO_ID = DESTINO.PARADA_ID "); sql.append(empresa == null ? "" : " INNER JOIN MARCA M ON (C.MARCA_ID = M.MARCA_ID AND M.EMPRESA_ID=" + empresa.getEmpresaId() + ")"); - sql.append(" WHERE C.ACTIVO = 1 AND C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); + sql.append(" WHERE EXISTS (SELECT * FROM CAJA CA WHERE CA.CORRIDA_ID = C.CORRIDA_ID AND CA.FECCORRIDA = C.FECCORRIDA AND CA.MOTIVOCANCELACION_ID IS NULL) "); + sql.append(" AND C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); sql.append(" GROUP BY C.CORRIDA_ID, "); sql.append(" C.ROLOPERATIVO_ID, Destino.Cveparada, ORIGEM.CVEPARADA, "); sql.append(" TO_CHAR(C.FECHORSALIDA, 'HH24:MI') ");