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

Merge pull request 'fixes #bugAL-3619' (!368) from AL-3619 into master 

Reviewed-on: adm/VentaBoletosAdm#368
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master 1.43.5
Gleison da Cruz 2024-01-24 12:57:29 +00:00
parent 9a0198cbc2 1718f5919a
commit 825e549be9
2 changed files with 6 additions and 5 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.43.4</version>
<version>1.43.5</version>
<packaging>war</packaging>
<properties>

9
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimpData.java
View File

@ -510,8 +510,9 @@ public class RelatorioLinhasHorarioSimpData extends Relatorio {
sql.append(empresa == null ? "" : " INNER JOIN MARCA M ON (C.MARCA_ID = M.MARCA_ID AND M.EMPRESA_ID= :EMPRESA_ID)");
sql.append(" WHERE ");
sql.append(" 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(" EXISTS (SELECT 1 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 TO_DATE(:DATA_INICIO, 'DD/MM/YYYY hh24:mi:ss') AND TO_DATE(:DATA_FINAL, 'DD/MM/YYYY hh24:mi:ss') ");
sql.append(" GROUP BY C.CORRIDA_ID, ");
sql.append(" C.ROLOPERATIVO_ID, ");
sql.append(" C.ruta_id, ");
@ -523,7 +524,8 @@ public class RelatorioLinhasHorarioSimpData extends Relatorio {
sql.append(" AND TB2.ROLOPERATIVO_ID = C.ROLOPERATIVO_ID ");
sql.append(" AND TB2.feccorrida = c.feccorrida ");
sql.append(" AND TB2.HORASALIDA = TO_CHAR(C.FECHORSALIDA, 'HH24:MI')) ");
sql.append(rutaIds.isEmpty() ? "" : " and c.RUTA_ID IN (" + rutaIds + ") ");
sql.append(corridaIds.isEmpty() ? "" : " and c.CORRIDA_ID IN (" + corridaIds + ") ");
sql.append(" INNER JOIN (");
sql.append(" SELECT ");
sql.append(" C.CORRIDA_ID, ");
@ -640,8 +642,7 @@ public class RelatorioLinhasHorarioSimpData extends Relatorio {
sql.append(" DESCRUTA, SERVICO, SENTIDO, LOT, CLA, ORIGEM, DESTINO, ");
sql.append(" EXTENSAO, BAGAGENS, ORD, EXTRA, TIPO_LINHA, ABSOL ");
sql.append("ORDER BY TIPO_LINHA, GRUPO_RUTA, DESCRUTA, SERVICO, ORIGEM, DESTINO ");
return sql.toString();
return sql.toString();
}