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

Merge pull request 'fixes bug#AL-2963' (!233) from AL-2963 into master 

Reviewed-on: adm/VentaBoletosAdm#233
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master 1.10.7
Gleison da Cruz 2023-07-25 13:26:26 +00:00
parent f7bc62e563 f8b96d233b
commit ad59e93774
2 changed files with 2 additions and 2 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.10.6</version>
<version>1.10.7</version>
<packaging>war</packaging>
<properties>

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassageirosViajarDetalhado.java
View File

@ -84,7 +84,7 @@ public class RelatorioPassageirosViajarDetalhado extends Relatorio {
sql.append(" U.CVEUSUARIO AS AGENTE, ");
sql.append(" ' ' AS CONTROLE ");
sql.append(" FROM BOLETO B INNER JOIN USUARIO U ON (B.USUARIO_ID = U.USUARIO_ID) ");
sql.append(" WHERE B.INDSTATUSBOLETO = 'V' AND B.MOTIVOCANCELACION_ID IS NULL "+passagemAberta+" ");
sql.append(" WHERE ((B.INDSTATUSBOLETO = 'V' AND B.MOTIVOCANCELACION_ID IS NULL) OR (TIPOVENTA_ID = 15 AND B.MOTIVOCANCELACION_ID IS NULL)) "+passagemAberta+" ");
if (dataCadastroInicial != null && dataCadastroFinal != null) {
sql.append("AND B.FECCREACION BETWEEN TO_DATE('" + formatSemHora.format(dataCadastroInicial) + " 00:00:00', " + formatToDate + ") "
+ "AND TO_DATE('" + formatSemHora.format(dataCadastroFinal) + " 23:59:59', " + formatToDate + ") ");