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

Merge pull request 'AL-2679' (!153) from AL-2679 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/153
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master 1.5.3
Valdir Cordeiro 2023-05-16 20:32:07 +00:00
parent dea416a3c8 c9a4490947
commit 5fd25b5e87
2 changed files with 3 additions and 3 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> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.5.2</version> <version>1.5.3</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

4
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
View File

@ -298,7 +298,7 @@ public class RelatorioPassagensAGR extends Relatorio {
sql.append(" AND b.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda "); sql.append(" AND b.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda ");
} }
if (!categoriaIds.isEmpty() || !categoriaIds.equals("Todas") ) { if (!categoriaIds.isEmpty() && !categoriaIds.equals("Todas") ) {
sql.append(" AND b.categoria_id in ( "+categoriaIds+" ) "); sql.append(" AND b.categoria_id in ( "+categoriaIds+" ) ");
} }
@ -306,7 +306,7 @@ public class RelatorioPassagensAGR extends Relatorio {
sql.append(" AND b.fechorviaje BETWEEN :fecInicioViagem AND :fecFinalViagem "); sql.append(" AND b.fechorviaje BETWEEN :fecInicioViagem AND :fecFinalViagem ");
} }
if (!empresa.isEmpty() || !empresa.equals("Todas")){ if (!empresa.isEmpty()){
sql.append(" AND b.empresacorrida_id =:empresa_id "); sql.append(" AND b.empresacorrida_id =:empresa_id ");
} }