fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#20230 

dev:valdevir
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@103046 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago.clemente 2020-08-26 18:02:29 +00:00
parent 00ff30ca47
commit 2a3a84356a
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/rjconsultores/ventaboletos/dao/EstacionSitefDAO.java
View File

@ -17,6 +17,6 @@ public interface EstacionSitefDAO extends GenericDAO<EstacionSitef, Integer> {
EstacionSitef buscar(Empresa empresa, Integer numempresa, Integer numfilial, String numpdv); EstacionSitef buscar(Empresa empresa, Integer numempresa, Integer numfilial, String numpdv);
public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv); public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv, Integer numfilial);
} }

4
src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionSitefHibernateDAO.java
View File

@ -46,12 +46,14 @@ public class EstacionSitefHibernateDAO extends GenericHibernateDAO<EstacionSitef
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv) { public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv, Integer numfilial) {
Criteria c = getSession().createCriteria(getPersistentClass()); Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("empresa", empresa)); c.add(Restrictions.eq("empresa", empresa));
c.add(Restrictions.or(Restrictions.isNull("tipoIntegracao"), Restrictions.eq("tipoIntegracao", tipoIntegracaoTEF != null ? tipoIntegracaoTEF : TipoIntegracaoTEF.SITEF))); c.add(Restrictions.or(Restrictions.isNull("tipoIntegracao"), Restrictions.eq("tipoIntegracao", tipoIntegracaoTEF != null ? tipoIntegracaoTEF : TipoIntegracaoTEF.SITEF)));
c.add(Restrictions.eq("numpdv", numpdv)); c.add(Restrictions.eq("numpdv", numpdv));
c.add(Restrictions.eq("activo", true)); c.add(Restrictions.eq("activo", true));
c.add(Restrictions.eq("numfilial", numfilial));
List<EstacionSitef> estacionsSitef = c.list(); List<EstacionSitef> estacionsSitef = c.list();
return estacionsSitef.isEmpty() ? null : estacionsSitef.get(0); return estacionsSitef.isEmpty() ? null : estacionsSitef.get(0);
} }

2
src/com/rjconsultores/ventaboletos/service/EstacionSitefService.java
View File

@ -17,6 +17,6 @@ public interface EstacionSitefService {
EstacionSitef buscar(Empresa empresa, Integer numempresa, Integer numfilial, String numpdv); EstacionSitef buscar(Empresa empresa, Integer numempresa, Integer numfilial, String numpdv);
public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv); public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv, Integer numfilial);
} }

4
src/com/rjconsultores/ventaboletos/service/impl/EstacionSitefServiceImpl.java
View File

@ -26,8 +26,8 @@ public class EstacionSitefServiceImpl implements EstacionSitefService {
} }
@Override @Override
public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv) { public EstacionSitef buscar(Empresa empresa, TipoIntegracaoTEF tipoIntegracaoTEF, String numpdv, Integer numfilial) {
return estacionSitefDAO.buscar(empresa, tipoIntegracaoTEF, numpdv); return estacionSitefDAO.buscar(empresa, tipoIntegracaoTEF, numpdv, numfilial);
} }
} }