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

fixed bug #7860 - Correção de bug ao tentar cadastrar serviço . 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@59562 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago 2016-08-24 20:24:37 +00:00
parent 78033889ce
commit 2f2319b53d
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ public interface EsquemaCorridaDAO extends GenericDAO<EsquemaCorrida, Integer> {
public List<EsquemaCorrida> buscar(Marca marca, RolOperativo rolOperativo, Ruta ruta, ClaseServicio claseServicio); public List<EsquemaCorrida> buscar(Marca marca, RolOperativo rolOperativo, Ruta ruta, ClaseServicio claseServicio);
public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra); public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra, boolean isDoublePiso);
public EsquemaCorrida buscaEsquemaPorRuta(Ruta ruta); public EsquemaCorrida buscaEsquemaPorRuta(Ruta ruta);

7
src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java
View File

@ -185,13 +185,18 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO<EsquemaCorri
} }
@Override @Override
public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra) { public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra, boolean isDoublePiso) {
Criteria c = getSession().createCriteria(getPersistentClass()); Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("activo", Boolean.TRUE)); c.add(Restrictions.eq("activo", Boolean.TRUE));
Disjunction or = Restrictions.disjunction(); Disjunction or = Restrictions.disjunction();
if(isDoublePiso){
or.add(Restrictions.or(Restrictions.eq("numCorridaPisoExtra", numCorridaPisoExtra), Restrictions.eq("numCorrida", numCorrida))); or.add(Restrictions.or(Restrictions.eq("numCorridaPisoExtra", numCorridaPisoExtra), Restrictions.eq("numCorrida", numCorrida)));
or.add(Restrictions.eq("numCorrida", numCorridaPisoExtra)); or.add(Restrictions.eq("numCorrida", numCorridaPisoExtra));
}else{
or.add(Restrictions.eq("numCorrida", numCorrida));
}
c.add(or); c.add(or);

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

@ -30,7 +30,7 @@ public interface EsquemaCorridaService extends GenericService<EsquemaCorrida, In
public List<EsquemaCorrida> buscar(Marca marca, RolOperativo rolOperativo, Ruta ruta, ClaseServicio claseServicio); public List<EsquemaCorrida> buscar(Marca marca, RolOperativo rolOperativo, Ruta ruta, ClaseServicio claseServicio);
public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra); public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra, boolean isDoublePiso);
public void actualizaEsquemaTramo(List<ParadaEsquema> listParadaEsquema, EsquemaCorrida ec); public void actualizaEsquemaTramo(List<ParadaEsquema> listParadaEsquema, EsquemaCorrida ec);

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

@ -117,8 +117,8 @@ public class EsquemaCorridaServiceImpl implements EsquemaCorridaService {
return esquemaCorridaDAO.buscar(marca, rolOperativo, ruta, claseServicio); return esquemaCorridaDAO.buscar(marca, rolOperativo, ruta, claseServicio);
} }
public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra) { public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra, boolean isDoublePiso) {
return esquemaCorridaDAO.buscarNumCorrida(numCorrida, numCorridaPisoExtra); return esquemaCorridaDAO.buscarNumCorrida(numCorrida, numCorridaPisoExtra, isDoublePiso);
} }
@Transactional @Transactional