From 943c55e04f7fd1b3aa648932cc1f46eb0ab7b09e Mon Sep 17 00:00:00 2001 From: frederico Date: Fri, 6 Oct 2017 20:54:58 +0000 Subject: [PATCH] fixed bug #9835 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@74591 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioLinhasHorario.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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, ");