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

Merge pull request 'AL-2731' (!173) from AL-2731 into master 

Reviewed-on: adm/VentaBoletosAdm#173
Reviewed-by: wallace <wallace@rjconsultores.com.br>
master 1.6.5
Célio de Souza Ribeiro JR 2023-05-29 22:06:14 +00:00
parent d4e7468e9a 3f967168f3
commit 79049d14ba
2 changed files with 13 additions and 8 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.6.4</version>
<version>1.6.5</version>
<packaging>war</packaging>
<properties>

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

@ -285,7 +285,7 @@ public class RelatorioPassagensAGR extends Relatorio {
sql.append(" SELECT ");
sql.append(" b.numfoliosistema AS numero_bilhete, ");
sql.append(" e.nombempresa AS razao_social, ");
sql.append(" e.cnpj AS cnpj, ");
sql.append(" COALESCE(ie.cnpj, e.cnpj) AS cnpj, ");
sql.append(" CASE ");
sql.append(" WHEN ((b.DESCNUMDOC IS NOT NULL OR c.NUMIDENTIFICAUNO IS NOT NULL) AND c.TIPOIDENTIFICAUNO_ID = 13) ");
sql.append(" THEN nvl(b.descnumdoc, c.numidentificauno) ");
@ -296,14 +296,14 @@ public class RelatorioPassagensAGR extends Relatorio {
sql.append(" ct.desccategoria AS tipo_desconto_beneficio, ");
sql.append(" b.nombpasajero AS nome_passageiro, ");
sql.append(" CASE ");
sql.append(" WHEN ((b.DESCNUMDOC IS NOT NULL OR c.NUMIDENTIFICAUNO IS NOT NULL) AND c.TIPOIDENTIFICAUNO_ID = 1) ");
sql.append(" THEN nvl(b.descnumdoc, c.numidentificauno) ");
sql.append(" WHEN (b.desctipodoc like 'RG') THEN b.descnumdoc ");
sql.append(" WHEN (b.desctipodoc2 like 'RG') THEN b.descnumdoc2 ");
sql.append(" ELSE '' ");
sql.append(" END AS numero_identidade, ");
sql.append(" '' AS orgao_expedidor, ");
sql.append(" CASE ");
sql.append(" WHEN ((b.DESCNUMDOC IS NOT NULL OR c.NUMIDENTIFICAUNO IS NOT NULL) AND c.TIPOIDENTIFICAUNO_ID = 2) ");
sql.append(" THEN nvl(b.descnumdoc, c.numidentificauno) ");
sql.append(" WHEN (b.desctipodoc like 'CPF') THEN b.descnumdoc ");
sql.append(" WHEN (b.desctipodoc2 like 'RG') THEN b.descnumdoc2 ");
sql.append(" ELSE '' ");
sql.append(" END AS cpf_passageiro, ");
sql.append(" b.numasiento AS numero_poltrona, ");
@ -319,7 +319,7 @@ public class RelatorioPassagensAGR extends Relatorio {
sql.append("FROM ");
sql.append(" boleto b ");
sql.append(" LEFT JOIN BPE bpe ON (bpe.boleto_id = b.boleto_id AND bpe.activo = 1) ");
sql.append(" LEFT JOIN empresa e ON (e.empresa_id = b.empresacorrida_id) ");
sql.append(" LEFT JOIN empresa e ON (e.empresa_id = b.marca_id) ");
sql.append(" LEFT JOIN parada ori ON (ori.parada_id = b.origen_id) ");
sql.append(" LEFT JOIN parada des ON (des.parada_id = b.destino_id) ");
sql.append(" LEFT JOIN ruta r ON (r.ruta_id = b.ruta_id) ");
@ -328,6 +328,11 @@ public class RelatorioPassagensAGR extends Relatorio {
sql.append(" AND c.activo = 1) ");
sql.append(" LEFT JOIN categoria ct ON (b.categoria_id = ct.categoria_id ");
sql.append(" AND ct.activo =1 and ct.categoria_id not in (1)) ");
sql.append(" LEFT JOIN punto_venta pv ON (b.puntoventa_id = pv.puntoventa_id and pv.activo =1) ");
sql.append(" LEFT JOIN parada pr ON (pv.parada_id = pr.parada_id and pr.activo =1) ");
sql.append(" LEFT JOIN ciudad ci ON (pr.ciudad_id = ci.ciudad_id and ci.activo =1) ");
sql.append(" LEFT JOIN inscricao_estadual ie ON (e.empresa_id = ie.empresa_id ");
sql.append(" and ci.estado_id = ie.estado_id and ie.activo =1) ");
sql.append("WHERE ");
sql.append(" ( b.motivocancelacion_id NOT IN ( 4 ) ");
sql.append(" OR b.motivocancelacion_id IS NULL ) ");
@ -346,7 +351,7 @@ public class RelatorioPassagensAGR extends Relatorio {
}
if (!empresa.isEmpty()){
sql.append(" AND b.empresacorrida_id =:empresa_id ");
sql.append(" AND e.empresa_id =:empresa_id ");
}
if (linha != null && !linha.equals("Todas")) {