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

Merge pull request 'fixes bug#AL-4336' (!755) from AL-4336 into master 

Reviewed-on: adm/VentaBoletosAdm#755
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master
wallace 2024-10-04 14:08:32 +00:00
parent fc9abf8bc2 1441aad35f
commit ff1b37371f
4 changed files with 6 additions and 7 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.150.0</version> <version>1.150.1</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

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

@ -115,7 +115,7 @@ public class RelatorioBilhetesVendidosFiltroFormaPagamento extends Relatorio {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
if (parametros.get("IDAVOLTA").equals("1")) { if (parametros.get("IDAVOLTA").equals("1")) {
sql.append(" select "); sql.append(" select distinct ");
sql.append(" u.CVEUSUARIO CVEBILHETEIRO, "); sql.append(" u.CVEUSUARIO CVEBILHETEIRO, ");
sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, "); sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, ");
sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, "); sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, ");
@ -149,7 +149,7 @@ public class RelatorioBilhetesVendidosFiltroFormaPagamento extends Relatorio {
sql.append(" B.NOMBPASAJERO AS PASSAGEIRO, "); sql.append(" B.NOMBPASAJERO AS PASSAGEIRO, ");
sql.append(" B.DESCNUMDOC AS DOC, "); sql.append(" B.DESCNUMDOC AS DOC, ");
sql.append(" COALESCE(b.NUMOPERACION, bo.NUMOPERACION) AS LOCALIZADOR, "); sql.append(" COALESCE(b.NUMOPERACION, bo.NUMOPERACION) AS LOCALIZADOR, ");
sql.append("(SELECT LISTAGG(formaPago.DESCPAGO, ',') WITHIN GROUP (ORDER BY formaPago.DESCPAGO) "); sql.append("(SELECT distinct LISTAGG(formaPago.DESCPAGO, ',') WITHIN GROUP (ORDER BY formaPago.DESCPAGO) ");
sql.append("FROM CAJA caja2 "); sql.append("FROM CAJA caja2 ");
sql.append("INNER JOIN CAJA_FORMAPAGO cajaFormaPago ON cajaFormaPago.CAJA_ID = caja2.CAJA_ID "); sql.append("INNER JOIN CAJA_FORMAPAGO cajaFormaPago ON cajaFormaPago.CAJA_ID = caja2.CAJA_ID ");
sql.append("INNER JOIN FORMA_PAGO formaPago ON formaPago.FORMAPAGO_ID = cajaFormaPago.FORMAPAGO_ID "); sql.append("INNER JOIN FORMA_PAGO formaPago ON formaPago.FORMAPAGO_ID = cajaFormaPago.FORMAPAGO_ID ");
@ -216,7 +216,7 @@ public class RelatorioBilhetesVendidosFiltroFormaPagamento extends Relatorio {
if (parametros.get("IDAVOLTA").equals("1")) { if (parametros.get("IDAVOLTA").equals("1")) {
sql.append(" UNION ALL "); sql.append(" UNION ALL ");
} }
sql.append(" select "); sql.append(" select distinct ");
sql.append(" u.CVEUSUARIO CVEBILHETEIRO, "); sql.append(" u.CVEUSUARIO CVEBILHETEIRO, ");
sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, "); sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, ");
sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, "); sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, ");
@ -250,7 +250,7 @@ public class RelatorioBilhetesVendidosFiltroFormaPagamento extends Relatorio {
sql.append(" B.NOMBPASAJERO AS PASSAGEIRO, "); sql.append(" B.NOMBPASAJERO AS PASSAGEIRO, ");
sql.append(" B.DESCNUMDOC AS DOC, "); sql.append(" B.DESCNUMDOC AS DOC, ");
sql.append(" COALESCE(b.NUMOPERACION, bo.NUMOPERACION) AS LOCALIZADOR, "); sql.append(" COALESCE(b.NUMOPERACION, bo.NUMOPERACION) AS LOCALIZADOR, ");
sql.append("(SELECT LISTAGG(formaPago.DESCPAGO, ',') WITHIN GROUP (ORDER BY formaPago.DESCPAGO) "); sql.append("(SELECT distinct LISTAGG(formaPago.DESCPAGO, ',') WITHIN GROUP (ORDER BY formaPago.DESCPAGO) ");
sql.append("FROM CAJA caja2 "); sql.append("FROM CAJA caja2 ");
sql.append("INNER JOIN CAJA_FORMAPAGO cajaFormaPago ON cajaFormaPago.CAJA_ID = caja2.CAJA_ID "); sql.append("INNER JOIN CAJA_FORMAPAGO cajaFormaPago ON cajaFormaPago.CAJA_ID = caja2.CAJA_ID ");
sql.append("INNER JOIN FORMA_PAGO formaPago ON formaPago.FORMAPAGO_ID = cajaFormaPago.FORMAPAGO_ID "); sql.append("INNER JOIN FORMA_PAGO formaPago ON formaPago.FORMAPAGO_ID = cajaFormaPago.FORMAPAGO_ID ");
@ -336,7 +336,6 @@ public class RelatorioBilhetesVendidosFiltroFormaPagamento extends Relatorio {
sql.append(" CATEGORIA, "); sql.append(" CATEGORIA, ");
sql.append(" IMPRESSAO_POSTERIOR, "); sql.append(" IMPRESSAO_POSTERIOR, ");
sql.append(" SERVICO "); sql.append(" SERVICO ");
return sql; return sql;
} }

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jasper
View File

Binary file not shown.

2
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosFiltroFormaPagamento.jrxml
View File

@ -652,7 +652,7 @@
<textField pattern="" isBlankWhenNull="true"> <textField pattern="" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="1143" y="0" width="83" height="12" isPrintWhenDetailOverflows="true" uuid="f807b716-15e8-46d3-b712-9630eb7d0165"/> <reportElement stretchType="RelativeToTallestObject" x="1143" y="0" width="83" height="12" isPrintWhenDetailOverflows="true" uuid="f807b716-15e8-46d3-b712-9630eb7d0165"/>
<textElement> <textElement>
<font size="6"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{FORMA_PAGAMENTO}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{FORMA_PAGAMENTO}]]></textFieldExpression>
</textField> </textField>