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

Merge pull request 'fixes bug#AL-4376' (!814) from AL-4376 into master 

Reviewed-on: adm/VentaBoletosAdm#814
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
master 1.166.1
Célio de Souza Ribeiro JR 2024-10-30 19:48:45 +00:00
parent 497c2c0976 6d58def4c3
commit 5337d43026
6 changed files with 57 additions and 16 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.166.0</version>
<version>1.166.1</version>
<packaging>war</packaging>
<properties>

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

@ -55,6 +55,7 @@ public class RelatorioRemarcacaoDevolucao extends Relatorio {
dataResult.put("preco", rset.getBigDecimal("preco"));
dataResult.put("multa", rset.getBigDecimal("multa"));
dataResult.put("formaPagamento", rset.getString("formaPagamento"));
dataResult.put("numfoliosistema", rset.getString("numfoliosistema"));
data.add(dataResult);
}
@ -91,7 +92,8 @@ public class RelatorioRemarcacaoDevolucao extends Relatorio {
sql.append("CASE WHEN cliente.CLIENTE_ID IS NULL THEN boleto.DESCNUMDOC ELSE cliente.NUMIDENTIFICAUNO END as documento, ");
sql.append("boleto.PRECIOPAGADO as preco, ");
sql.append("COALESCE(eventoExtra.IMPINGRESO,0) as multa, ");
sql.append("(SELECT distinct LISTAGG(fp.DESCPAGO, ',') WITHIN GROUP (ORDER BY fp.DESCPAGO) ");
sql.append("boleto.numfoliosistema as numfoliosistema, ");
sql.append("(SELECT distinct LISTAGG(fp.DESCPAGO, ',') WITHIN GROUP (ORDER BY fp.DESCPAGO) ");
sql.append("FROM boleto b ");
sql.append("INNER JOIN BOLETO_FORMAPAGO bf ON b.BOLETO_ID = bf.BOLETO_ID ");
sql.append("INNER JOIN FORMA_PAGO fp ON bf.FORMAPAGO_ID = fp.FORMAPAGO_ID ");

1
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioRemarcacaoDevolucao_es.properties
View File

@ -24,3 +24,4 @@ detail.documento=Doc
detail.preco=Preço
detail.multa=Multa
detail.formaPagamento=Forma Pago
detail.numfoliosistema=Folio

1
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioRemarcacaoDevolucao_pt_BR.properties
View File

@ -24,3 +24,4 @@ detail.documento=Doc
detail.preco=Preço
detail.multa=Multa
detail.formaPagamento=Forma Pagamento
detail.numfoliosistema=Bilhete

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

Binary file not shown.

65
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoDevolucao.jrxml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioRemarcacaoDevolucao" pageWidth="1000" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="990" leftMargin="5" rightMargin="5" topMargin="20" bottomMargin="20" uuid="8aea274b-8721-4a52-9161-42afeb6b49c9">
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioRemarcacaoDevolucao" pageWidth="1100" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1090" leftMargin="5" rightMargin="5" topMargin="20" bottomMargin="20" uuid="8aea274b-8721-4a52-9161-42afeb6b49c9">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
@ -121,6 +121,7 @@
<field name="multa" class="java.math.BigDecimal"/>
<field name="documento" class="java.lang.String"/>
<field name="formaPagamento" class="java.lang.String"/>
<field name="numfoliosistema" class="java.lang.String"/>
</subDataset>
<parameter name="DATA_INICIAL" class="java.util.Date"/>
<parameter name="DATA_FINAL" class="java.util.Date"/>
@ -419,6 +420,25 @@
</textField>
</jr:detailCell>
</jr:column>
<jr:column width="63" uuid="7a53b7d4-3bbc-494b-9f5f-8451efa5a158">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
<reportElement x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true" uuid="a24dc6d8-906a-4549-a372-2fb8c9f5cb49">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
</reportElement>
<textElement markup="none">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.numfoliosistema}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="46175e6d-7ab4-475e-b5e1-885c87f5c565"/>
<textFieldExpression><![CDATA[$F{numfoliosistema}]]></textFieldExpression>
</textField>
</jr:detailCell>
</jr:column>
<jr:column width="61" uuid="f1ebd3b7-4c66-42b7-903a-6bf62cb2d34b">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
@ -496,7 +516,7 @@
<textFieldExpression><![CDATA[$R{detail.dataVenta}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20" uuid="8aa31f3e-3bfa-4e68-b43d-1d2a278bf3fd"/>
<textFieldExpression><![CDATA[$F{dataVenta}]]></textFieldExpression>
@ -513,7 +533,7 @@
<textFieldExpression><![CDATA[$R{detail.dataViagem}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20" uuid="0a02b65a-3ff1-4241-87b9-966f313c3574"/>
<textFieldExpression><![CDATA[$F{dataViagem}]]></textFieldExpression>
@ -530,7 +550,7 @@
<textFieldExpression><![CDATA[$R{detail.origem}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="25b7a795-497d-4d2c-a2b2-259e3eb8e9e5"/>
<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
@ -547,7 +567,7 @@
<textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="85e7fa41-21bf-4045-9a06-446ce1be0f43"/>
<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
@ -564,7 +584,7 @@
<textFieldExpression><![CDATA[$R{detail.agencia}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="c94d985a-8512-4490-987c-028c5f8a4c35"/>
<textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression>
@ -581,7 +601,7 @@
<textFieldExpression><![CDATA[$R{detail.linha}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20" uuid="3f21db36-3758-4d82-81e7-3b60ee415d4c"/>
<textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression>
@ -598,7 +618,7 @@
<textFieldExpression><![CDATA[$R{detail.servico}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="02d0dc39-895c-473c-acc2-d9043510bb04"/>
<textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression>
@ -615,7 +635,7 @@
<textFieldExpression><![CDATA[$R{detail.passageiro}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="73cd59c9-2ef1-491e-9146-86fc2b6af605"/>
<textFieldExpression><![CDATA[$F{passageiro}]]></textFieldExpression>
@ -632,7 +652,7 @@
<textFieldExpression><![CDATA[$R{detail.documento}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="7dadc24c-24f3-4cfa-890f-fdb07b15bf02"/>
<textFieldExpression><![CDATA[$F{documento}]]></textFieldExpression>
@ -649,13 +669,30 @@
<textFieldExpression><![CDATA[$R{detail.dataDevolucao}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20" uuid="868e81e9-c0fa-46fa-a055-c412d5698739"/>
<textFieldExpression><![CDATA[$F{dataRemarcacaoDevolucao}]]></textFieldExpression>
</textField>
</jr:detailCell>
</jr:column>
<jr:column width="56" uuid="80c7a7d7-012f-4afb-851d-7d903edffe14">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField>
<reportElement x="0" y="0" width="55" height="30" uuid="19b6d697-6adb-49a4-8be2-9c4d813c169c"/>
<textElement markup="none">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.numfoliosistema}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="55" height="20" uuid="efbac3b3-dbc2-40d0-8563-17367148f8c1"/>
<textFieldExpression><![CDATA[$F{numfoliosistema}]]></textFieldExpression>
</textField>
</jr:detailCell>
</jr:column>
<jr:column width="62" uuid="eb283198-934b-4c96-aaf4-792b99aa7377">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField>
@ -666,7 +703,7 @@
<textFieldExpression><![CDATA[$R{detail.preco}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="62" height="20" uuid="459899cc-95ba-4102-a684-5b2d0994f2d1"/>
<textFieldExpression><![CDATA[$F{preco}]]></textFieldExpression>
@ -683,7 +720,7 @@
<textFieldExpression><![CDATA[$R{detail.multa}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="62" height="20" uuid="efbac3b3-dbc2-40d0-8563-17367148f8c1"/>
<textFieldExpression><![CDATA[$F{multa}]]></textFieldExpression>
@ -700,7 +737,7 @@
<textFieldExpression><![CDATA[$R{detail.formaPagamento}]]></textFieldExpression>
</textField>
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="116" height="20" uuid="efbac3b3-dbc2-40d0-8563-17367148f8c1"/>
<textFieldExpression><![CDATA[$F{formaPagamento}]]></textFieldExpression>