diff --git a/pom.xml b/pom.xml index fbaaacc8a..943e093aa 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.25.1 + 1.26.1 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 { public List buscaPuntoVentasEmpresaComComissaoParametrizada(Integer empresaId); public Comissao buscaComissaoVigencia(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal); + + public List 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 return query.list(); } - + @Override @SuppressWarnings("unchecked") public List buscaPuntoVentasEmpresaComComissaoParametrizada(Integer empresaId) { @@ -248,6 +248,22 @@ public class ComissaoHibernateDAO extends GenericHibernateDAO return qr.list(); } + + @Override + @SuppressWarnings("unchecked") + public List 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) {