From 0ffc653105bba6a8f308f57c30bf46f80090ce18 Mon Sep 17 00:00:00 2001
From: celio <celio@rjconsultores.com.br>
Date: Wed, 31 May 2023 09:52:38 -0300
Subject: [PATCH] fixes bug#AL-2731

---
 pom.xml                                       |   2 +-
 .../impl/RelatorioPassagensAGR.java           |   8 ++++--
 .../templates/RelatorioPassagensAGR.jasper    | Bin 50454 -> 50454 bytes
 .../templates/RelatorioPassagensAGR.jrxml     |  26 +++++++++---------
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index a7b737adf..76f83a6e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.6.8</version>
+	<version>1.6.9</version>
 	<packaging>war</packaging>
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
index 565d88ec9..350535a07 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
@@ -298,13 +298,17 @@ public class RelatorioPassagensAGR extends Relatorio {
 		 sql.append("  CASE                                                                                                    	");
 		 sql.append("      WHEN (b.desctipodoc like 'RG') THEN b.descnumdoc													  	");
 		 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("  END AS numero_identidade,                                                                               	");
 		 sql.append("  ''  AS orgao_expedidor,                                                                                 	");
 		 sql.append("  CASE                                                                                                    	");
 		 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("      WHEN (b.desctipodoc2 like 'CPF') THEN  b.descnumdoc2    	                                        	");
+		 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("  b.numasiento AS numero_poltrona,                                                                        	");
 		 sql.append("  nvl(b.fechorviaje, '')  AS data_viagem,			                                                    	");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jasper
index 891971fa32b1cd19305c38b09681057347edf7bf..cc4207b604cb885ec781fbb4b3d445e83757318b 100644
GIT binary patch
delta 948
zcmc(cUr19?9LLY@W%@7><}S&gn9~QDptQRUHb{sDvheSm+O>w(gKvh5-YW7nMSAcH
zL!>E562i#j4#nw%c6})6p|_Pa$ld~}2cLz`J@?mvnD3nnhx57Td+ztcJ^48`Kc~K3
zO1YzqDaUwuBV@i$9VqT@#?%IZ+dZ3#yTY+*BkBix@uT0urL>96poRINH~5gYaGoi9
zRvxgYikJ!rCVc^ia}W7z*29=JoZ~}gR*=5wt8+5A*X{FDoM*&|@xSQ;T&WKH%xHKt
zvWe|s3%^EpJ$v?t#8eh#4qs5_Y=|;i+GP~4DJzSz<53M$MiJ|`y0D=K>XjqA?a0<d
zqY=X0P!NWp;dE@v^Tpm0Q$>h4e1V9wAw+0ti%`5qq#{H<k7<~^vw_vy7Ao1xxZd34
z4)e<>ip$9N_d?5BSR1%vo@GBadLx~&Xe6xbSDm3p@o8Fj#Z5K$wbdJoCisZ(XCfX?
zgcD)&H>R6sR<~S*eOI#YHJfcOu_uxqb6S*ipVNY*2~P8p(wvqhB{@Bl6yvlcsg2VM
zNq$bx&1z}9&X#!fj|34(5Rn8CNf40)5lIk{1QAIP2?>?g<9jJ!e%rk!Wd7$LLABIk
O?!0SKYHtiDhp|66k6EMu

delta 941
zcmc)HPe>F|90%~XGprJO5ZwilTGr|i3dPLq>||6RF2#ywZf-W_qI9WKxY5!6TuY>b
zUsy!8h0^dMsm!9Rdr>E-phKr+DFyA)u|s<D(wjHG9>jWY4v+cF`_BBnGn1cE^Hb`|
zTq>AgO!<a4Jsr-c)Rq#w#+ce9xZby_1U1ejkN7y+j~@drs@W*I+gpP*zOy5C@&o;_
z2VK0o>ELtP#mV&hQ1KCarii70)5&nmckVI2%=#E}GdX_9OcCkcaD$)0z3bsNit~)P
zW9)CbfI#Xz4u>L`zO{jkjEfVQ)lkKIkXXuMnD1kT`5R&woqEG4UN@{PhW#9l;OXrO
z7Vlj3ZbZ~>M997jttW~Hb_7SmOQD)qKrB^J!1pl){0%G{u|_{%6R%78x&~DYcIem}
ziD1%R!~9(r2P4Y}XI<PMJ>~q)erajeFKC7p*DWJ%nU-$qm+*DM2xyL)`+m0Bj2m6X
zMZ+}A@pzZ1TblC=6YbAmtp#3h29h@x*~`undn+}`^+f6+*R0ey*Njw}Yg#JFRg_9_
zy^uP`H7C`^Rd9AoV+~%3g?~zrs04{hkf;QSN|2}oiAs>D1WA-o`FQM=V$M$GiYW6x
UzX*0qXPokOt5W~Ru>T?P2OB0<&;S4c

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jrxml
index 6c5fd23ad..147e1010e 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassagensAGR.jrxml
@@ -1,8 +1,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">
-	<property name="ireport.zoom" value="1.0263162364614198"/>
+	<property name="ireport.zoom" value="3.5431220000000248"/>
 	<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.keep.first.band.2" value="columnHeader"/>
 	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
@@ -409,7 +409,7 @@
 				<textFieldExpression><![CDATA[$F{cpfPassageiro}]]></textFieldExpression>
 			</textField>
 			<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>
 					<bottomPen lineWidth="0.75"/>
 				</box>
@@ -425,7 +425,7 @@
 				<textFieldExpression><![CDATA[$F{nomePassageiro}]]></textFieldExpression>
 			</textField>
 			<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>
 					<bottomPen lineWidth="0.75"/>
 				</box>
@@ -441,15 +441,7 @@
 				<textFieldExpression><![CDATA[$F{mesViagem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="320e867c-2d82-4c6f-8da7-5577b7a52e0c" stretchType="RelativeToTallestObject" x="940" y="2" width="48" 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"/>
+				<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>
@@ -521,6 +513,14 @@
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{horaViagem}]]></textFieldExpression>
 			</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>
 	</detail>
 	<summary>