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

Merge pull request 'fixes bug#AL-3841' (!465) from AL-3841 into master 

Reviewed-on: adm/VentaBoletosAdm#465
Reviewed-by: aristides <aristides@rjconsultores.com.br>
master 1.61.9
wallace 2024-03-27 17:38:46 +00:00
parent e9e0a89daa caac52ff2f
commit 54beab89d2
2 changed files with 6 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> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.61.8</version> <version>1.61.9</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

8
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageiros.java
View File

@ -134,11 +134,13 @@ public class RelatorioQuadroDemonstrativoMovimentoPassageiros extends Relatorio
query.append("JOIN parada ori ON\tori.parada_id = tr.origen_id "); query.append("JOIN parada ori ON\tori.parada_id = tr.origen_id ");
query.append("JOIN parada des ON\tdes.parada_id = tr.destino_id "); query.append("JOIN parada des ON\tdes.parada_id = tr.destino_id ");
query.append(" "); query.append(" ");
query.append("WHERE "); query.append("WHERE ");
query.append(" r.NUMRUTA = '").append(linhasIds).append("' "); query.append(" r.INDSENTIDOIDA =1 ");
query.append("AND r.INDSENTIDOIDA =1 ");
query.append("AND rc.ACTIVO =1 "); query.append("AND rc.ACTIVO =1 ");
query.append("AND r.ACTIVO =1 "); query.append("AND r.ACTIVO =1 ");
if (!StringUtils.isBlank(linhasIds)) {
query.append(" and r.NUMRUTA = '").append(linhasIds).append("' ");
}
query.append("ORDER BY 1 "); query.append("ORDER BY 1 ");
List<String> listOrigemDestino = new ArrayList<String>(); List<String> listOrigemDestino = new ArrayList<String>();