fixes bug#21484

fixes bug#21221
dev:valdir
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@105360 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2021-02-11 20:28:10 +00:00
parent 074cc8027f
commit 47fedc3e24
1 changed files with 17 additions and 4 deletions

View File

@ -400,16 +400,16 @@ public class CorridaHibernateDAO extends GenericHibernateDAO<Corrida, Corrida.Id
sql.append(" AND c.corrida_id LIKE :corridaId "); sql.append(" AND c.corrida_id LIKE :corridaId ");
if (origem != null) { if (origem != null) {
sql.append(" AND c.ORIGEN_ID=").append(origem); sql.append(" AND c.ORIGEN_ID=:origem");
} }
if (destino != null) { if (destino != null) {
sql.append(" AND c.DESTINO_ID=").append(destino); sql.append(" AND c.DESTINO_ID=:destino");
} }
if (ruta != null) { if (ruta != null) {
sql.append(" AND c.RUTA_ID=").append(ruta); sql.append(" AND c.RUTA_ID=:ruta");
} }
if (numRuta != null) { if (numRuta != null) {
sql.append(" AND r.NUMRUTA=").append(numRuta); sql.append(" AND r.NUMRUTA=:numRuta");
} }
sql.append(" GROUP BY c.corrida_id "); sql.append(" GROUP BY c.corrida_id ");
@ -422,6 +422,19 @@ public class CorridaHibernateDAO extends GenericHibernateDAO<Corrida, Corrida.Id
sq.setParameter("corridaId", '%'); sq.setParameter("corridaId", '%');
} }
if (origem != null) {
sq.setParameter("origem", origem);
}
if (destino != null) {
sq.setParameter("destino", destino);
}
if (ruta != null) {
sq.setParameter("ruta", ruta);
}
if (numRuta != null) {
sq.setParameter("numRuta", numRuta.toString());
}
sq.setParameter("dateInicio", dateInicio); sq.setParameter("dateInicio", dateInicio);
sq.setParameter("dateFin", dateFin); sq.setParameter("dateFin", dateFin);