correção da validação do campo numCorrida

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@22115 d1611594-4594-4d17-8e1d-87c2c4800839
master
carla 2012-10-17 17:45:29 +00:00
parent 565a4cc9a6
commit d4e6d326f3
4 changed files with 17 additions and 26 deletions

View File

@ -29,9 +29,9 @@ public interface EsquemaCorridaDAO extends GenericDAO<EsquemaCorrida, Integer> {
public List<EsquemaCorrida> buscar(EsquemaCorrida ec);
public boolean buscarNumCorrida (Integer numCorrida);
public boolean buscarNumCorrida (Integer numCorrida, Integer numCorridaPisoExtra);
public boolean buscarNumCorridaPisoExtra(Integer numCorridaPisoExtra);
/**
* Indica se el esquema corrida es hijo de un esquemCorrida.

View File

@ -227,11 +227,17 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO<EsquemaCorri
@Override
public boolean buscarNumCorrida(Integer numCorrida) {
public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra) {
Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("activo", Boolean.TRUE));
Disjunction or = Restrictions.disjunction();
or.add(Restrictions.or(Restrictions.eq("numCorridaPisoExtra", numCorridaPisoExtra), Restrictions.eq("numCorrida", numCorrida)));
or.add(Restrictions.eq("numCorrida", numCorridaPisoExtra));
c.add(or);
c.add(Restrictions.eq("numCorrida", numCorrida));
if (c.list().isEmpty()) {
return false;
@ -241,17 +247,5 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO<EsquemaCorri
}
@Override
public boolean buscarNumCorridaPisoExtra(Integer numCorridaPisoExtra) {
Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("activo", Boolean.TRUE));
c.add(Restrictions.eq("numCorridaPisoExtra", numCorridaPisoExtra));
if (c.list().isEmpty()) {
return false;
} else {
return true;
}
}
}

View File

@ -30,9 +30,8 @@ public interface EsquemaCorridaService extends GenericService<EsquemaCorrida, In
public List<EsquemaCorrida> buscar(EsquemaCorrida ec);
public boolean buscarNumCorrida(Integer numCorrida);
public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra);
public boolean buscarNumCorridaPisoExtra(Integer numCorridaPisoExtra);
public void actualizaEsquemaTramo(List<ParadaEsquema> listParadaEsquema,EsquemaCorrida ec);

View File

@ -102,13 +102,11 @@ public class EsquemaCorridaServiceImpl implements EsquemaCorridaService {
return esquemaCorridaDAO.buscar(ec);
}
public boolean buscarNumCorrida (Integer numCorrida) {
return esquemaCorridaDAO.buscarNumCorrida(numCorrida);
public boolean buscarNumCorrida (Integer numCorrida, Integer numCorridaPisoExtra) {
return esquemaCorridaDAO.buscarNumCorrida(numCorrida, numCorridaPisoExtra);
}
public boolean buscarNumCorridaPisoExtra (Integer numCorridaPisoExtra) {
return esquemaCorridaDAO.buscarNumCorridaPisoExtra(numCorridaPisoExtra);
}
@Transactional
public void actualizaEsquemaTramo(List<ParadaEsquema> listParadaEsquema, EsquemaCorrida ec) {