From 15ce38cf7be40092044bc5be43d5ed4d6dea69b0 Mon Sep 17 00:00:00 2001 From: frederico Date: Mon, 9 Oct 2017 18:26:35 +0000 Subject: [PATCH] fixed bug #9835 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@74636 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioLinhasHorario.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java index b4cb84183..4ca4c4d3b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java @@ -423,16 +423,16 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" ABSOL, "); sql.append(" CJ.KM_REAL AS KM_REAL "); sql.append(" FROM CORRIDA C "); - sql.append(" INNER JOIN (SELECT C.CORRIDA_ID, C.FECCORRIDA, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI') AS HORASALIDA, "); + sql.append(" INNER JOIN (SELECT C.CORRIDA_ID, Destino.Cveparada AS DESTINO, ORIGEM.CVEPARADA AS ORIGEM, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI') AS HORASALIDA, "); sql.append(" COUNT(CASE WHEN C.TIPOSERVICIO_ID = 1 THEN 1 ELSE NULL END) AS ORD, "); sql.append(" COUNT(CASE WHEN C.TIPOSERVICIO_ID = 2 THEN 1 ELSE NULL END) AS EXTRA "); - sql.append(" FROM CORRIDA C "); + 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(" GROUP BY C.CORRIDA_ID,C.FECCORRIDA, "); - sql.append(" C.ROLOPERATIVO_ID, "); + sql.append(" GROUP BY C.CORRIDA_ID, "); + sql.append(" C.ROLOPERATIVO_ID, Destino.Cveparada, ORIGEM.CVEPARADA, "); sql.append(" TO_CHAR(C.FECHORSALIDA, 'HH24:MI') "); - sql.append(" ) TB2 ON TB2.CORRIDA_ID = C.CORRIDA_ID AND TB2.FECCORRIDA = C.FECCORRIDA"); + sql.append(" ) TB2 ON TB2.CORRIDA_ID = C.CORRIDA_ID "); sql.append(" AND TB2.ROLOPERATIVO_ID = C.ROLOPERATIVO_ID "); sql.append(" AND TB2.HORASALIDA = TO_CHAR(C.FECHORSALIDA, 'HH24:MI') "); sql.append(" INNER JOIN (SELECT C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI') AS HORASALIDA, "); @@ -541,7 +541,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(tipoServico > 0 ? " AND C.TIPOSERVICIO_ID = " + tipoServico + " " : ""); - sql.append(" AND C.ACTIVO <> 0 AND ORIGEM.ACTIVO = 1 AND DESTINO.ACTIVO = 1 "); + sql.append(" AND C.ACTIVO <> 0 AND ORIGEM.ACTIVO = 1 AND DESTINO.ACTIVO = 1 AND TB2.ORIGEM = ORIGEM.CVEPARADA AND TB2.DESTINO = DESTINO.CVEPARADA "); sql.append("AND R.ACTIVO = 1 AND RO.ACTIVO = 1 AND DA.ACTIVO = 1 AND CS.ACTIVO = 1 "); sql.append("GROUP BY R.RUTA_ID, NVL(GR.DESCGRUPO, 'Não Definido'), TO_CHAR(C.FECHORSALIDA, 'HH24:MI'), C.CORRIDA_ID, R.INDSENTIDOIDA, "); sql.append(" DA.CANTASIENTOS, CS.DESCCLASE, TB5.EXTENSAO, TB2.ORD, TB2.EXTRA, ABSOL, ");