From 022ab03a3c732b6e599e4754bdd7ca8f065b716d Mon Sep 17 00:00:00 2001
From: celio <celio.souza@totvs.com.br>
Date: Thu, 26 Sep 2024 18:02:47 -0300
Subject: [PATCH] fixes bug#AL-4761

---
 pom.xml                                       |   2 +-
 .../RelatorioFormaPagamentoAgenciaNovo.java   |   7 ++++---
 .../RelatorioFormaPagamentoAgenciaNovo.jasper | Bin 67394 -> 67392 bytes
 .../RelatorioFormaPagamentoAgenciaNovo.jrxml  |   8 ++++----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2bfbc6a28..d70b14e07 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.145.7</version>
+	<version>1.145.8</version>
 	<packaging>war</packaging> 
     
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgenciaNovo.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgenciaNovo.java
index 0bb0dfd54..9889d5535 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgenciaNovo.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgenciaNovo.java
@@ -117,8 +117,9 @@ public class RelatorioFormaPagamentoAgenciaNovo extends RelatorioDemandas {
 					BigDecimal seguroOPC = rset.getBigDecimal("seg_opcional");
 					BigDecimal taxa = rset.getBigDecimal("taxa");
 					BigDecimal valor = rset.getBigDecimal("valor");
-					String formaPagamento = rset.getString("forma_pagamento");
-					String formaPagamentoOriginal = rset.getString("forma_pago_original");
+					String formaPagamento = StringUtils.isEmpty(rset.getString("forma_pagamento")) ? StringUtils.EMPTY : rset.getString("forma_pagamento");
+					String formaPagamentoOriginal = StringUtils.isEmpty(rset.getString("forma_pago_original")) ? StringUtils.EMPTY : rset.getString("forma_pago_original");
+					Boolean isFormaPagamentoIguais =  formaPagamento.equals(formaPagamentoOriginal);
 					
 					dataResult.put("DATA", rset.getDate("data"));
 					dataResult.put("BILHETE", rset.getString("bilhete"));
@@ -137,7 +138,7 @@ public class RelatorioFormaPagamentoAgenciaNovo extends RelatorioDemandas {
 						dataResult.put("SEG_OPCIONAL", seguroOPC.compareTo(BigDecimal.ZERO) == 0 ? seguroOPC : seguroOPC.negate());
 						dataResult.put("TAXA", taxa.compareTo(BigDecimal.ZERO) == 0 ? taxa : taxa.negate());
 						dataResult.put("VALOR", valor.compareTo(BigDecimal.ZERO) == 0 ? valor : valor.negate());
-					} else {
+					} else if (isFormaPagamentoIguais){
 						dataResult.put("FORMA_PAGAMENTO", formaPagamento);
 						dataResult.put("TARIFA", tarifa);
 						dataResult.put("PEDAGIO", pedagio);
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jasper
index 36aa680e60bbdb4b32ea9df9a03431532106f7d6..fa28cd387e64d1815148fb81e982d465de95145a 100644
GIT binary patch
delta 178
zcmX@q$8w;LWy2Q#$!;P-lev=8HtPgLF>>x@U|>iAVus0#N%@oi1@bcbZ{`VNW}NJx
zCb(H4I8T|0(O~nWvNC@OBXeU56H`MYLsN@*6BA2IQ!{o3Mn(pm$qP>_PnN$NyLrJe
o7aqK-Hp^eWV=RnmPRV3OXSvC8M>%=D63Y^ko%3@GGILUk0R1&HN&o-=

delta 180
zcmX@m$8xBTWy2PK&L{>bn9P`zzgZ_Bijng;Py{Rt5}N!kke9J}GfxmR<K+DZ1UD-L
z=P9!=o0^+!o={fiFKTFEW@c<=XlZU~6mMv3Y;I}7&cHZ%!acRgvX^5w&pYPAgImdF
j*~@o~g)vPinat=cH(BN=C$CpxSz@wter`c#PHGVV>Tfg^

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jrxml
index 045d0a000..77346a995 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jrxml
@@ -1,7 +1,7 @@
 <?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="RelatorioFormaPagamentoAgenciaNovo" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="832cc8a2-6330-4063-9b36-f96514ae8283">
 	<property name="ireport.zoom" value="2.5937424601000147"/>
-	<property name="ireport.x" value="574"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="title"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.3" value="pageHeader"/>
@@ -71,7 +71,7 @@
 		<groupHeader>
 			<band height="30">
 				<textField>
-					<reportElement x="0" y="0" width="90" height="15" uuid="29bb0167-21cd-401c-94d9-f94bb1e9b9e4">
+					<reportElement x="0" y="0" width="100" height="15" uuid="29bb0167-21cd-401c-94d9-f94bb1e9b9e4">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box>
@@ -82,8 +82,8 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$R{AGENCIA}]]></textFieldExpression>
 				</textField>
-				<textField isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" x="90" y="0" width="711" height="15" isPrintWhenDetailOverflows="true" uuid="e873a0b8-5b07-4883-8be6-edf75307e9ab">
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement x="100" y="0" width="701" height="15" isPrintWhenDetailOverflows="true" uuid="e873a0b8-5b07-4883-8be6-edf75307e9ab">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box>