From e21fb4ddc7d1df9cd69f7c50a64d9fbddf3a2035 Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Wed, 2 Aug 2023 16:19:23 -0300
Subject: [PATCH] fixes bug#AL-2771 Acerto retorno

---
 pom.xml                                                      | 2 +-
 .../relatorios/impl/RelatorioBilhetesVendidos.java           | 4 ++--
 .../relatorios/RelatorioBilhetesVendidosController.java      | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 84d940328..bb90e115e 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.11.2</version>
+	<version>1.11.3</version>
 	<packaging>war</packaging>  
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java
index 92aa6c67b..5b88e1b7d 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java
@@ -114,7 +114,7 @@ public class RelatorioBilhetesVendidos extends Relatorio {
 				}
 					
 				
-				if (parametros.get("STATUS").toString().contains("C")) {
+				if (parametros.get("STATUS").toString().contains("C")||parametros.get("STATUS").toString().contains("V")) {
 					if (parametros.get("IDAVOLTA").equals("1")) {
 						sql.append(" UNION ALL ");	
 					}
@@ -226,7 +226,7 @@ public class RelatorioBilhetesVendidos extends Relatorio {
 					stmt.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime()));
 
 				}
-;				ResultSet rset = stmt.executeQuery();
+				ResultSet rset = stmt.executeQuery();
 
 				while (rset.next()) {
 
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java
index 59fa3eb90..0aee863f5 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java
@@ -214,8 +214,11 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
 		if (status.length() > 0) {
 			status = status.substring(0, status.length() - 1);
 		} else {
-			status += "'" + IndStatusBoleto.V + "'";
+			if (!chkIdaVolta.isChecked()) //caso não tenha selecionado nada traz vendidos 
+				status += "'" + IndStatusBoleto.V + "'";
 		}
+			
+			
 		parametros.put("STATUS", status);
 
 		filtro.append(" Empresa: ");