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

fixed bug #7538 - correção Tarifa Oficial Excel: não era tratado ruta '-1 TODAS' nem excel sem dados 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@56872 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2016-06-10 18:02:46 +00:00
parent 6664aa719c
commit b12234dd97
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java
View File

@ -663,8 +663,10 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO<RutaCombina
sb.append(vt.getRutaId()).append(",");
}
String listInt = sb.toString().substring(0, sb.toString().length() - 1);
if(!listInt.contains("-1")){
sql.append(" AND RC.RUTA_ID in (").append(listInt).append(")");
}
}
if (!lsMarca.isEmpty()) {
StringBuilder sb = new StringBuilder("");
for (Marca vt : lsMarca) {

3
src/com/rjconsultores/ventaboletos/service/impl/RutaCombinacionServiceImpl.java
View File

@ -279,6 +279,9 @@ public class RutaCombinacionServiceImpl implements RutaCombinacionService {
List<TarifaOficialEscalaGroupVO> lsLinhasAgrupadas = rutaCombinacionDAO.pesquisaTarifaOficialGroupObj(lsAddRmvMonedas, lsAddRmvMarcas, lsAddRmvClaseServico,
lsAddRmvEmpresas, lsAddRmvRutas, lsAddRmvVigenciaTarifa);
if(lsLinhasAgrupadas == null || lsLinhasAgrupadas.isEmpty()){
return null;
}
HSSFSheet sheet1 = null;