From e5b189bec845f271bd32706f15de4c2c4dff9acb Mon Sep 17 00:00:00 2001 From: "daniel.zauli" Date: Tue, 11 Dec 2018 13:01:13 +0000 Subject: [PATCH] =?UTF-8?q?------------------------=20---Evid=C3=AAncia=20?= =?UTF-8?q?Anexa---=20------------------------?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 0012849: 383943; Inconsistência no relatório Linho por Horário. fixes bug#0012849 dev:leo qua:Victor git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@87834 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 0a66bb6d0..b966c3ae3 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java @@ -423,7 +423,7 @@ 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, Destino.Cveparada AS DESTINO, ORIGEM.CVEPARADA AS ORIGEM, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI') AS HORASALIDA, "); + sql.append(" INNER JOIN (SELECT C.CORRIDA_ID, c.ruta_id as c_ruta_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 INNER JOIN PARADA ORIGEM ON C.Origen_Id = ORIGEM.PARADA_ID INNER JOIN PARADA DESTINO ON C.DESTINO_ID = DESTINO.PARADA_ID "); @@ -431,20 +431,20 @@ public class RelatorioLinhasHorario extends Relatorio { 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(" C.ROLOPERATIVO_ID, c.ruta_id, Destino.Cveparada, ORIGEM.CVEPARADA, "); sql.append(" TO_CHAR(C.FECHORSALIDA, 'HH24:MI') "); - sql.append(" ) TB2 ON TB2.CORRIDA_ID = C.CORRIDA_ID "); + sql.append(" ) TB2 ON (TB2.CORRIDA_ID = C.CORRIDA_ID and tb2.c_ruta_id = c.ruta_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, "); + sql.append(" INNER JOIN (SELECT C.CORRIDA_ID,c.ruta_id as c_ruta_id, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI') AS HORASALIDA, "); sql.append(" COUNT(B.BOLETO_ID) AS ABSOL "); sql.append(" FROM CORRIDA C "); sql.append(empresa == null ? "" : " INNER JOIN MARCA M ON (C.MARCA_ID = M.MARCA_ID AND M.EMPRESA_ID=" + empresa.getEmpresaId() + ")"); sql.append(" LEFT JOIN BOLETO B ON (B.CORRIDA_ID = C.CORRIDA_ID AND B.FECCORRIDA = C.FECCORRIDA AND B.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND B.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA).append(") "); sql.append(" WHERE C.ACTIVO = 1 AND C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); - sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI') "); - sql.append(" ) TB4 ON TB4.CORRIDA_ID = C.CORRIDA_ID "); + sql.append(" GROUP BY C.CORRIDA_ID, c.ruta_id, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI') "); + sql.append(" ) TB4 ON (TB4.CORRIDA_ID = C.CORRIDA_ID and tb4.c_ruta_id = c.ruta_id) "); sql.append(" AND TB4.ROLOPERATIVO_ID = C.ROLOPERATIVO_ID "); sql.append(" AND TB4.HORASALIDA = TO_CHAR(C.FECHORSALIDA, 'HH24:MI') ");