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

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

Reviewed-on: adm/VentaBoletosAdm#177
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master 1.6.9
Célio de Souza Ribeiro JR 2023-05-31 12:57:12 +00:00
parent 8b7469a37b 0ffc653105
commit a0b02a2a76
4 changed files with 20 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> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.6.8</version> <version>1.6.9</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

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

@ -298,13 +298,17 @@ public class RelatorioPassagensAGR extends Relatorio {
sql.append(" CASE "); sql.append(" CASE ");
sql.append(" WHEN (b.desctipodoc like 'RG') THEN b.descnumdoc "); sql.append(" WHEN (b.desctipodoc like 'RG') THEN b.descnumdoc ");
sql.append(" WHEN (b.desctipodoc2 like 'RG') THEN b.descnumdoc2 "); sql.append(" WHEN (b.desctipodoc2 like 'RG') THEN b.descnumdoc2 ");
sql.append(" WHEN (c.NUMIDENTIFICAUNO IS NOT NULL AND c.TIPOIDENTIFICAUNO_ID = 1) THEN c.numidentificauno ");
sql.append(" WHEN (c.NUMIDENTIFICADOS IS NOT NULL AND c.TIPOIDENTIFICADOS_ID = 1) THEN c.numidentificados ");
sql.append(" ELSE '' "); sql.append(" ELSE '' ");
sql.append(" END AS numero_identidade, "); sql.append(" END AS numero_identidade, ");
sql.append(" '' AS orgao_expedidor, "); sql.append(" '' AS orgao_expedidor, ");
sql.append(" CASE "); sql.append(" CASE ");
sql.append(" WHEN (b.desctipodoc like 'CPF') THEN b.descnumdoc "); sql.append(" WHEN (b.desctipodoc like 'CPF') THEN b.descnumdoc ");
sql.append(" WHEN (b.desctipodoc2 like 'RG') THEN b.descnumdoc2 "); sql.append(" WHEN (b.desctipodoc2 like 'CPF') THEN b.descnumdoc2 ");
sql.append(" ELSE '' "); sql.append(" WHEN (c.NUMIDENTIFICAUNO IS NOT NULL AND c.TIPOIDENTIFICAUNO_ID = 2) THEN c.numidentificauno ");
sql.append(" WHEN (c.NUMIDENTIFICADOS IS NOT NULL AND c.TIPOIDENTIFICADOS_ID = 2) THEN c.numidentificados ");
sql.append(" ELSE '' ");
sql.append(" END AS cpf_passageiro, "); sql.append(" END AS cpf_passageiro, ");
sql.append(" b.numasiento AS numero_poltrona, "); sql.append(" b.numasiento AS numero_poltrona, ");
sql.append(" nvl(b.fechorviaje, '') AS data_viagem, "); sql.append(" nvl(b.fechorviaje, '') AS data_viagem, ");

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

Binary file not shown.

26
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jrxml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?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="RelatorioPassagensAGR" pageWidth="2100" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="2080" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e"> <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="RelatorioPassagensAGR" pageWidth="2100" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="2080" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
<property name="ireport.zoom" value="1.0263162364614198"/> <property name="ireport.zoom" value="3.5431220000000248"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="8"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/> <property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
@ -409,7 +409,7 @@
<textFieldExpression><![CDATA[$F{cpfPassageiro}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{cpfPassageiro}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="789e30d0-e90e-402c-b21f-6ed3742dd9f3" stretchType="RelativeToTallestObject" x="730" y="2" width="53" height="17" isPrintWhenDetailOverflows="true"/> <reportElement uuid="789e30d0-e90e-402c-b21f-6ed3742dd9f3" stretchType="RelativeToTallestObject" x="730" y="2" width="52" height="17" isPrintWhenDetailOverflows="true"/>
<box> <box>
<bottomPen lineWidth="0.75"/> <bottomPen lineWidth="0.75"/>
</box> </box>
@ -425,7 +425,7 @@
<textFieldExpression><![CDATA[$F{nomePassageiro}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nomePassageiro}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="49849cc3-f811-4d5f-8740-2212c8009817" stretchType="RelativeToTallestObject" x="783" y="2" width="69" height="17" isPrintWhenDetailOverflows="true"/> <reportElement uuid="49849cc3-f811-4d5f-8740-2212c8009817" stretchType="RelativeToTallestObject" x="782" y="2" width="70" height="17" isPrintWhenDetailOverflows="true"/>
<box> <box>
<bottomPen lineWidth="0.75"/> <bottomPen lineWidth="0.75"/>
</box> </box>
@ -441,15 +441,7 @@
<textFieldExpression><![CDATA[$F{mesViagem}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{mesViagem}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="320e867c-2d82-4c6f-8da7-5577b7a52e0c" stretchType="RelativeToTallestObject" x="940" y="2" width="48" height="17" isPrintWhenDetailOverflows="true"/> <reportElement uuid="183b2db5-e38f-4130-b7f7-6b7b2eb0669e" stretchType="RelativeToTallestObject" x="989" y="2" width="215" height="17" isPrintWhenDetailOverflows="true"/>
<box>
<bottomPen lineWidth="0.75"/>
</box>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$F{numeroLinha}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="183b2db5-e38f-4130-b7f7-6b7b2eb0669e" stretchType="RelativeToTallestObject" x="988" y="2" width="216" height="17" isPrintWhenDetailOverflows="true"/>
<box> <box>
<bottomPen lineWidth="0.75"/> <bottomPen lineWidth="0.75"/>
</box> </box>
@ -521,6 +513,14 @@
<textElement textAlignment="Center"/> <textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$F{horaViagem}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{horaViagem}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="320e867c-2d82-4c6f-8da7-5577b7a52e0c" stretchType="RelativeToTallestObject" x="940" y="2" width="49" height="17" isPrintWhenDetailOverflows="true"/>
<box>
<bottomPen lineWidth="0.75"/>
</box>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$F{numeroLinha}]]></textFieldExpression>
</textField>
</band> </band>
</detail> </detail>
<summary> <summary>