From 850e10691906cb2e63f890e736c12e5f0c6dd7dd Mon Sep 17 00:00:00 2001
From: "wallace.henrique" <wallace.henrique@ip-192-168-100-60.ec2.internal>
Date: Wed, 27 Mar 2024 10:51:29 -0300
Subject: [PATCH] bug#AL-3866

---
 pom.xml                                       |  2 +-
 .../dao/hibernate/BpeHibernateDAO.java        | 21 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 70051c14c..0dcf5c023 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ModelWeb</artifactId>
-	<version>1.43.1</version>
+	<version>1.43.2</version>
  
 	<distributionManagement>
         <repository>
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java
index cf5118cf4..0fba72dee 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java
@@ -475,9 +475,9 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
 
 		List<FiscalRdi> rdis = new ArrayList<FiscalRdi>();
 
-		boolean isNoXML = isNoXml() && consultaOtimizada;
+//		boolean isNoXML = isNoXml() && consultaOtimizada;
 
-		if (isNoXML) {
+		
 			StringBuilder sqlVendidos = new StringBuilder();
 			sqlVendidos.append(sqlRelatorioRDIVendidosNoXML(ufs));
 
@@ -500,16 +500,15 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
 					return m1.getEstado().compareTo(m2.getEstado());
 				}
 			});
-		} else {
 
-			StringBuilder sql = new StringBuilder();
-			sql.append(sqlRelatorioRDIVendidosXML(ufs));
-			sql.append("    union all    ");
-			sql.append(sqlRelatorioRDICanceladosXML(ufs));
-
-			List<DetalhadoFiscal> list = montaRelatorioRDIXML(connection, inicio, fim, empresaId, ufs, sql.toString());
-			rdis.addAll(calcularRelatorioRDIXML(list, isReceitaTerceiros));
-		}
+//			StringBuilder sql = new StringBuilder();
+//			sql.append(sqlRelatorioRDIVendidosXML(ufs));
+//			sql.append("    union all    ");
+//			sql.append(sqlRelatorioRDICanceladosXML(ufs));
+//
+//			List<DetalhadoFiscal> list = montaRelatorioRDIXML(connection, inicio, fim, empresaId, ufs, sql.toString());
+//			rdis.addAll(calcularRelatorioRDIXML(list, isReceitaTerceiros));
+		
 
 		return agrupaRdi(rdis);
 	}