From 4bb158bc7c0039c4e2c2f36bfb6e384d340f5914 Mon Sep 17 00:00:00 2001
From: "wallace.henrique" <wallace.henrique@BHN330100022.bh01.local>
Date: Tue, 1 Oct 2024 18:15:49 -0300
Subject: [PATCH 1/2] fixes bug#AL-5034

---
 pom.xml                                       |  2 +-
 .../impl/RelatorioPassagensAGR.java           | 30 +++++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index f76ebaed9..724aee00e 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.148.0</version>
+	<version>1.149.0</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 fe4e96f57..66d864c62 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
@@ -150,7 +150,9 @@ public class RelatorioPassagensAGR extends Relatorio {
 	}
 	
 	public String getMesAno(String data) {
-		if(!data.isEmpty()) {
+		if(data == null || data.isEmpty()) {
+			return "";	
+		}
 			data = getData(data);
 			DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
 			Date dateFormatada = null;
@@ -162,9 +164,7 @@ public class RelatorioPassagensAGR extends Relatorio {
 			DateFormat outputFormat = new SimpleDateFormat("dd/MM");
 			String dataDiaMes = outputFormat.format(dateFormatada);
 			return dataDiaMes;
-		}
-
-	return "";	
+		
 	}
 		
 	public static String mascaraDOC(String document) {
@@ -250,14 +250,22 @@ public class RelatorioPassagensAGR extends Relatorio {
 	}
 	
 	private String getDataCompleta(String data) {
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-		LocalDateTime dateTime = LocalDateTime.parse(data, formatter);
-		String formattedDate = dateTime.format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
-		return formattedDate;
+		
+		if(data == null || data.isEmpty()) {
+			return "";
+		}
+		
+			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+			LocalDateTime dateTime = LocalDateTime.parse(data, formatter);
+			String formattedDate = dateTime.format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
+			return formattedDate;
 	}
 	
 	public String getHora(String data) {
-		if(!data.isEmpty()) {
+		if(data == null || data.isEmpty()) {
+			return "";
+		}
+		
 			data = getData(data);
 			DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
 			Date dateFormatada = null;
@@ -269,8 +277,7 @@ public class RelatorioPassagensAGR extends Relatorio {
 			DateFormat outputFormat = new SimpleDateFormat("HH:mm");
 			String dataDiaMes = outputFormat.format(dateFormatada);
 			return dataDiaMes;
-		}
-	return "";	
+
 	}
 
 	@Override
@@ -341,7 +348,6 @@ public class RelatorioPassagensAGR extends Relatorio {
 		sql.append("WHERE		                                                                                               	");
 		sql.append("     	( b.motivocancelacion_id NOT IN ( 4 ) 							");
 		sql.append("           OR b.motivocancelacion_id IS NULL ) 							");
-		sql.append("	 	AND r.orgaoconcedente_id = 16 									");
 		
 		if( fecInicioVenda != null && fecFinalVenda !=null ){
 			sql.append("    AND b.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda 	");

From 3dec7259804796e2b568c9aa67612f221811bff6 Mon Sep 17 00:00:00 2001
From: "wallace.henrique" <wallace.henrique@BHN330100022.bh01.local>
Date: Tue, 1 Oct 2024 18:26:46 -0300
Subject: [PATCH 2/2] fixes bug#AL-5034

---
 .../relatorios/impl/RelatorioPassagensAGR.java      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
index 66d864c62..4bdd5fd5b 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
@@ -13,6 +13,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
+
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioPassagensAGRBean;
@@ -150,8 +152,8 @@ public class RelatorioPassagensAGR extends Relatorio {
 	}
 	
 	public String getMesAno(String data) {
-		if(data == null || data.isEmpty()) {
-			return "";	
+		if(StringUtils.isBlank(data)) {
+			return "";
 		}
 			data = getData(data);
 			DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
@@ -168,7 +170,7 @@ public class RelatorioPassagensAGR extends Relatorio {
 	}
 		
 	public static String mascaraDOC(String document) {
-		if (document == null || document.isEmpty()) {
+		if(StringUtils.isBlank(document)) {
 			return "";
 		}
 		String numericOnly = document.replaceAll("[^0-9]", "");
@@ -251,7 +253,7 @@ public class RelatorioPassagensAGR extends Relatorio {
 	
 	private String getDataCompleta(String data) {
 		
-		if(data == null || data.isEmpty()) {
+		if(StringUtils.isBlank(data)) {
 			return "";
 		}
 		
@@ -262,7 +264,8 @@ public class RelatorioPassagensAGR extends Relatorio {
 	}
 	
 	public String getHora(String data) {
-		if(data == null || data.isEmpty()) {
+		
+		if(StringUtils.isBlank(data)) {
 			return "";
 		}