From 09da8a52313e0de6103d550a697b07544f8689ea Mon Sep 17 00:00:00 2001
From: "wallace.henrique" <wallace.henrique@BHN330100022.bh01.local>
Date: Thu, 21 Sep 2023 11:32:06 -0300
Subject: [PATCH 1/2] fixes bug#AL-3278

---
 pom.xml                                                |  2 +-
 ...droDemonstrativoMovimentoPassageirosNovoLayout.java | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4aecbfbaf..2c461c8f3 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.21.1</version>
+	<version>1.21.2</version>
 	<packaging>war</packaging>  
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java
index 6da1f0854..3174cc9e9 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java
@@ -88,7 +88,7 @@ public class RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout extends
 							}
 							else {
 								map.put("totalvolta", rset.getLong("totalvolta") + volta);
-								total = total.add(rset.getBigDecimal("totalReceita"));
+								total = total.add(limpaNulo(rset.getBigDecimal("totalReceita")));
 								map.put("totalReceita", total);
 							}
 
@@ -218,5 +218,13 @@ public class RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout extends
 		}
 		return semelhancas;
 	}
+	
+	private BigDecimal limpaNulo( BigDecimal val ) {
+		if( val == null ) {
+			return BigDecimal.ZERO;
+		}else {
+			return val;
+		}
+	}
 
 }

From d9e3b3bd51acc693a6c90fc89a523678e06fbb85 Mon Sep 17 00:00:00 2001
From: "wallace.henrique" <wallace.henrique@BHN330100022.bh01.local>
Date: Thu, 21 Sep 2023 11:44:25 -0300
Subject: [PATCH 2/2] fixes bug#AL3278

---
 ...atorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java
index 3174cc9e9..363f45703 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java
@@ -83,7 +83,7 @@ public class RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout extends
 							agrupar = true;
 							if (ida == 0) {
 								map.put("totalida", rset.getLong("totalida"));
-								total = total.add(rset.getBigDecimal("totalReceita"));
+								total = total.add(limpaNulo(rset.getBigDecimal("totalReceita")));
 								map.put("totalReceita", total);
 							}
 							else {