From 41c5a852d45f44fac9c57a71a2f37690e4163e77 Mon Sep 17 00:00:00 2001
From: "celio.souza" <celio.souza@BHN330100030.bh01.local>
Date: Tue, 28 Nov 2023 17:00:54 -0300
Subject: [PATCH] fixes bug#AL-2912

---
 pom.xml                                        |  2 +-
 .../ventaboletos/dao/ComissaoDAO.java          |  2 ++
 .../dao/hibernate/ComissaoHibernateDAO.java    | 18 +++++++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index fbaaacc8a..943e093aa 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.25.1</version>
+	<version>1.26.1</version>
 
 	<distributionManagement>
         <repository>
diff --git a/src/com/rjconsultores/ventaboletos/dao/ComissaoDAO.java b/src/com/rjconsultores/ventaboletos/dao/ComissaoDAO.java
index a0aa274b6..7f6c07723 100644
--- a/src/com/rjconsultores/ventaboletos/dao/ComissaoDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/ComissaoDAO.java
@@ -20,5 +20,7 @@ public interface ComissaoDAO extends GenericDAO<Comissao, Integer> {
 	public List<PuntoVenta> buscaPuntoVentasEmpresaComComissaoParametrizada(Integer empresaId);
 	
 	public Comissao buscaComissaoVigencia(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal);
+
+	public List<PuntoVenta> buscaPuntoVentasComComissaoParametrizada();
 	
 }
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoHibernateDAO.java
index 22ad0635b..9ff1331c2 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoHibernateDAO.java
@@ -232,7 +232,7 @@ public class ComissaoHibernateDAO extends GenericHibernateDAO<Comissao, Integer>
 
 		return query.list();
 	}
-
+	
 	@Override
 	@SuppressWarnings("unchecked")
 	public List<PuntoVenta> buscaPuntoVentasEmpresaComComissaoParametrizada(Integer empresaId) {
@@ -248,6 +248,22 @@ public class ComissaoHibernateDAO extends GenericHibernateDAO<Comissao, Integer>
 		
 		return qr.list();
 	}
+	
+	@Override
+	@SuppressWarnings("unchecked")
+	public List<PuntoVenta> buscaPuntoVentasComComissaoParametrizada() {
+		StringBuilder sQuery = new StringBuilder("SELECT NEW com.rjconsultores.ventaboletos.entidad.PuntoVenta(pv.puntoventaId, pv.nombpuntoventa) FROM PtovtaComissao c ");
+		sQuery.append("JOIN c.puntoventaId pv ")
+			  .append("JOIN c.empresaId e ")
+			  .append("WHERE pv.activo = 1 ")
+			  .append("AND c.indretercomissao = 1 ")
+			  .append("AND c.activo = 1")
+			  .append("AND pv.statusaprobacion = 'A'");
+		Query qr = getSession().createQuery(sQuery.toString());
+		;
+		
+		return qr.list();
+	}
 
 	@Override
 	public Comissao buscaComissaoVigencia(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal) {