diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java index cb5f03b1d..b4cb84183 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.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI') AS HORASALIDA, "); + sql.append(" INNER JOIN (SELECT C.CORRIDA_ID, C.FECCORRIDA, 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(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, "); + sql.append(" GROUP BY C.CORRIDA_ID,C.FECCORRIDA, "); sql.append(" C.ROLOPERATIVO_ID, "); 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.FECCORRIDA = C.FECCORRIDA"); 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, ");