Merge pull request 'fixes bug#AL-2912' (!121) from AL-2912 into master

Reviewed-on: adm/ModelWeb#121
Reviewed-by: Julio Heredia <julio@rjconsultores.com.br>
master
Célio de Souza Ribeiro JR 2023-11-28 20:05:22 +00:00
commit b30882ada7
3 changed files with 20 additions and 2 deletions

View File

@ -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>

View File

@ -21,4 +21,6 @@ public interface ComissaoDAO extends GenericDAO<Comissao, Integer> {
public Comissao buscaComissaoVigencia(Integer puntoVentaId, Integer empresaId, Date dataInicial, Date dataFinal);
public List<PuntoVenta> buscaPuntoVentasComComissaoParametrizada();
}

View File

@ -249,6 +249,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) {
StringBuilder hql = new StringBuilder();