diff --git a/pom.xml b/pom.xml index 47d33b40d..60fceb71b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.79.2 + 1.79.3 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java index 2f4a88b24..27cb14fd8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java @@ -170,7 +170,8 @@ public class RelatorioIndiceIRK extends Relatorio { sb.append("( WITH corridas AS ( "); sb.append(" SELECT "); sb.append(" coi.fechorsalida AS feccorrida, "); - sb.append(" cjj.corrida_id "); + sb.append(" cjj.corrida_id, "); + sb.append(" cjj.tiposervicio_id "); sb.append(" FROM "); sb.append(" caja cjj "); sb.append(" INNER JOIN ruta r ON ( cjj.ruta_id = r.ruta_id ) "); @@ -190,16 +191,19 @@ public class RelatorioIndiceIRK extends Relatorio { sb.append(" GROUP BY "); sb.append(" coi.fechorsalida, "); sb.append(" cjj.corrida_id "); + sb.append(" cjj.tiposervicio_id "); sb.append("), corridas_count AS ( "); sb.append(" SELECT "); sb.append(" to_char(feccorrida, 'HH24:MI') AS hora, "); sb.append(" corrida_id, "); + sb.append(" tiposervicio_id, "); sb.append(" COUNT(*) AS quantidade "); sb.append(" FROM "); sb.append(" corridas "); sb.append(" GROUP BY "); sb.append(" to_char(feccorrida, 'HH24:MI'), "); - sb.append(" corrida_id "); + sb.append(" corrida_id, "); + sb.append(" tiposervicio_id"); sb.append(") "); sb.append("SELECT "); sb.append(" cj.caja_id AS cajaid, "); @@ -237,7 +241,8 @@ public class RelatorioIndiceIRK extends Relatorio { sb.append(" INNER JOIN empresa e ON ( e.empresa_id = :empresaId ) "); sb.append(" INNER JOIN parada origen ON ( origen.parada_id = tr.origen_id ) "); sb.append(" INNER JOIN parada destino ON ( destino.parada_id = tr.destino_id ) "); - sb.append(" INNER JOIN corridas_count cos ON ( cos.corrida_id = co.corrida_id "); + sb.append(" INNER JOIN corridas_count cos ON ( cos.corrida_id = co.corrida_id "); + sb.append(" AND cos.tiposervicio_id = co.tiposervicio_id "); sb.append(" AND hora = to_char(co.fechorsalida, 'HH24:MI') ) "); sb.append("WHERE "); sb.append(" cj.activo = 1 ");