fixes bug#AL-2543

dev:Valdevir
qua:Valdevir
master
valdevir 2023-05-24 14:59:24 -03:00
parent 50ca24e804
commit a6a6f3c738
2 changed files with 4 additions and 4 deletions

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId>
<version>1.4.3</version>
<version>1.4.4</version>
<distributionManagement>
<repository>
<id>rj-releases</id>

View File

@ -128,7 +128,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("activo", Boolean.TRUE));
c.add(Restrictions.ne("rutaId", -1));
c.add(Restrictions.not(Restrictions.eq("indRutaCancelada", Boolean.TRUE)));
if (empresa.getEmpresaId() != -1) {
c.createCriteria("lsRutaEmpresa").add(Restrictions.eq("empresa", empresa)).add(Restrictions.eq("activo", Boolean.TRUE));
}
@ -242,7 +242,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
return qry.list();
}
public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao) { // busca rutas e pedágios
public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao) { // busca rutas e ped<EFBFBD>gios
StringBuffer hql = new StringBuffer();
hql.append("select distinct r FROM Ruta r left join r.rutaSecuenciaList rSeqList ");
hql.append(" left join rSeqList.lsRutaCase casRutaList ");
@ -342,7 +342,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
}
try {
// Pode cair na exception caso ja possua tarifa criada para o tramo, e nao é necessaria criar novamente
// Pode cair na exception caso ja possua tarifa criada para o tramo, e nao <EFBFBD> necessaria criar novamente
qryList = new ArrayList<String>();
qry = new StringBuilder(" update TARIFA set TRAMO_ID = :nuevoTramo, ");