fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fixes bug#AL-4189' (!535) from AL-4189 into master 

Reviewed-on: adm/VentaBoletosAdm#535
Reviewed-by: aristides <aristides@rjconsultores.com.br>
master 1.79.3
aristides 2024-06-02 13:08:35 +00:00
parent c79aa6111f 2f15c0a734
commit 1027fa777d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.79.2</version>
<version>1.79.3</version>
<packaging>war</packaging>
<properties>

11
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java
View File

@ -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 ");