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

fixes bug #9035 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@70758 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucas.taia 2017-06-28 18:06:14 +00:00
parent 44509c99e5
commit 97232909ab
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/rjconsultores/ventaboletos/dao/TarifaMinimaDAO.java
View File

@ -28,9 +28,7 @@ public interface TarifaMinimaDAO extends GenericDAO<TarifaMinima, Integer> {
public List<TarifaMinima> pesquisar(Marca marca, Parada origem, Parada destino,
ClaseServicio claseServicio, Moneda moneda);
public List<TarifaMinima> pesquisar( Moneda moneda,
Plaza plaza, Marca marca, Parada origem, Parada destino,
ClaseServicio claseServicio, OrgaoConcedente orgaoConcedente);
public List<TarifaMinima> pesquisar( TarifaMinima tarifaMinima);
public List<TarifaMinima> buscarPorPlaza(Plaza plaza);

30
src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaMinimaHibernateDAO.java
View File

@ -130,20 +130,30 @@ public class TarifaMinimaHibernateDAO extends GenericHibernateDAO<TarifaMinima,
return c.list();
}
public List<TarifaMinima> pesquisar(Moneda moneda,
Plaza plaza, Marca marca, Parada origem, Parada destino,
ClaseServicio claseServicio, OrgaoConcedente orgaoConcedente) {
public List<TarifaMinima> pesquisar(TarifaMinima tarifaMinima) {
Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("activo", Boolean.TRUE));
// c.add(Restrictions.eq("importetarifa", valor));
c.add(Restrictions.eq("moneda", moneda));
c.add(Restrictions.eq("marca", marca));
c.add(Restrictions.eq("origem", origem));
c.add(Restrictions.eq("destino", destino));
c.add(Restrictions.eq("claseServicio", claseServicio));
c.add(Restrictions.eq("plaza", plaza));
c.add(Restrictions.eq("orgaoConcedente", orgaoConcedente));
c.add(Restrictions.eq("moneda", tarifaMinima.getMoneda()));
c.add(Restrictions.eq("marca", tarifaMinima.getMarca()));
c.add(Restrictions.eq("origem", tarifaMinima.getOrigem()));
c.add(Restrictions.eq("destino", tarifaMinima.getDestino()));
c.add(Restrictions.eq("claseServicio", tarifaMinima.getClaseServicio()));
c.add(Restrictions.eq("plaza", tarifaMinima.getPlaza()));
c.add(Restrictions.eq("orgaoConcedente", tarifaMinima.getOrgaoConcedente()));
c.add(Restrictions.eq("vigenciaTarifa", tarifaMinima.getVigenciaTarifa()));
if(tarifaMinima.getRuta() != null){
c.add(Restrictions.eq("ruta", tarifaMinima.getRuta()));
}
if(tarifaMinima.getRegionMetropolitana() != null){
c.add(Restrictions.eq("regionMetropolitana", tarifaMinima.getRegionMetropolitana()));
}
if(tarifaMinima.getCoeficienteTarifa() != null){
c.add(Restrictions.eq("coeficienteTarifa", tarifaMinima.getCoeficienteTarifa()));
}
return c.list();
}

3
src/com/rjconsultores/ventaboletos/service/TarifaMinimaService.java
View File

@ -35,8 +35,7 @@ public interface TarifaMinimaService extends GenericService<TarifaMinima, Intege
public List<TarifaMinima> pesquisar(BigDecimal valor, Moneda moneda, Plaza plaza,
Marca marca, Parada origem, Parada destino, ClaseServicio claseServicio);
public List<TarifaMinima> pesquisar(Moneda moneda, Plaza plaza,
Marca marca, Parada origem, Parada destino, ClaseServicio claseServicio, OrgaoConcedente orgaoConcedente);
public List<TarifaMinima> pesquisar(TarifaMinima tarifaMinima);
public List<TarifaMinima> pesquisarOrigemDestinoTodos(Marca marca,Parada origem, Parada destino,ClaseServicio claseServicio, Moneda moneda);

7
src/com/rjconsultores/ventaboletos/service/impl/TarifaMinimaServiceImpl.java
View File

@ -86,11 +86,8 @@ public class TarifaMinimaServiceImpl implements TarifaMinimaService {
destino, claseServicio);
}
public List<TarifaMinima> pesquisar( Moneda moneda,
Plaza plaza, Marca marca, Parada origem, Parada destino,
ClaseServicio claseServicio, OrgaoConcedente orgaoConcedente) {
return tarifaMinimaDAO.pesquisar( moneda, plaza, marca, origem,
destino, claseServicio, orgaoConcedente);
public List<TarifaMinima> pesquisar( TarifaMinima tarifaMinima) {
return tarifaMinimaDAO.pesquisar( tarifaMinima);
}
public List<TarifaMinima> pesquisarEspecifico(Marca marca, Parada origem,