From e582587412c3169d259e3d56f82db2371307c34b Mon Sep 17 00:00:00 2001 From: julio Date: Tue, 20 Oct 2015 20:10:31 +0000 Subject: [PATCH] bug #6759 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49241 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioLinhasHorario.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java index cd936c73b..b9557da77 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java @@ -82,8 +82,6 @@ public class RelatorioLinhasHorario extends Relatorio { Integer tipoServico = (Integer) parametros.get("TIPOSERVICIO_ID"); String sql = getSql(lsNumLinha, lsNumServico, empresa, tipoServico, grupoRuta); - - log.info(sql); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); ResultSet rset = null; @@ -434,7 +432,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(empresa == null ? "" : " AND C.EMPRESACORRIDA_ID = " + empresa.getEmpresaId()); sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI')) TB2, "); sql.append(" (SELECT C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI') AS HORASALIDA, "); - sql.append(" COUNT(1) AS ABSOL "); + sql.append(" COUNT(B.BOLETO_ID) AS ABSOL "); sql.append(" FROM CORRIDA C "); sql.append(" LEFT JOIN BOLETO B ON (B.CORRIDA_ID = C.CORRIDA_ID AND B.FECCORRIDA = C.FECCORRIDA "); sql.append(" AND B.MOTIVOCANCELACION_ID IS NULL "); @@ -442,8 +440,6 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" WHERE C.ACTIVO = 1 "); sql.append(" AND C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); sql.append(empresa == null ? "" : " AND C.EMPRESACORRIDA_ID = " + empresa.getEmpresaId()); -// sql.append(" AND B.MOTIVOCANCELACION_ID IS NULL "); -// sql.append(" AND B.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA); sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI')) TB4, "); sql.append(" CORRIDA C "); sql.append("LEFT JOIN "); @@ -502,6 +498,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append("SELECT RC.RUTA_ID, T.ORIGEN_ID, T.DESTINO_ID, NVL(T.CANTKMREAL,0) AS EXTENSAO "); sql.append("FROM RUTA_COMBINACION RC "); sql.append("INNER JOIN TRAMO T ON RC.TRAMO_ID = T.TRAMO_ID "); + sql.append("WHERE RC.ACTIVO = 1 "); sql.append(") TB5 ON TB5.RUTA_ID = C.RUTA_ID "); sql.append("AND TB5.ORIGEN_ID = ORIGEM.PARADA_ID ");