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

fixed bug 0007538 - correção Tarifa Oficial Excel 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@56923 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2016-06-14 12:41:09 +00:00
parent 7f60aa90a5
commit dd1476a8c7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -655,8 +655,10 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO<RutaCombina
sb.append(vt.getEmpresaId()).append(","); sb.append(vt.getEmpresaId()).append(",");
} }
String listInt = sb.toString().substring(0, sb.toString().length() - 1); String listInt = sb.toString().substring(0, sb.toString().length() - 1);
if(!listInt.contains("-1")){
sql.append(" AND RE.EMPRESA_ID in (").append(listInt).append(") "); sql.append(" AND RE.EMPRESA_ID in (").append(listInt).append(") ");
} }
}
if (!lsRuta.isEmpty()) { if (!lsRuta.isEmpty()) {
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
for (Ruta vt : lsRuta) { for (Ruta vt : lsRuta) {
@ -673,24 +675,30 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO<RutaCombina
sb.append(vt.getMarcaId()).append(","); sb.append(vt.getMarcaId()).append(",");
} }
String listInt = sb.toString().substring(0, sb.toString().length() - 1); String listInt = sb.toString().substring(0, sb.toString().length() - 1);
if(!listInt.contains("-1")){
sql.append(" AND M.MARCA_ID in (").append(listInt).append(") "); sql.append(" AND M.MARCA_ID in (").append(listInt).append(") ");
} }
}
if (!lsMoneda.isEmpty()) { if (!lsMoneda.isEmpty()) {
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
for (Moneda vt : lsMoneda) { for (Moneda vt : lsMoneda) {
sb.append(vt.getMonedaId()).append(","); sb.append(vt.getMonedaId()).append(",");
} }
String listInt = sb.toString().substring(0, sb.toString().length() - 1); String listInt = sb.toString().substring(0, sb.toString().length() - 1);
if(!listInt.contains("-1")){
sql.append(" AND MON.MONEDA_ID in (").append(listInt).append(") "); sql.append(" AND MON.MONEDA_ID in (").append(listInt).append(") ");
} }
}
if (!lsClaseServicio.isEmpty()) { if (!lsClaseServicio.isEmpty()) {
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
for (ClaseServicio cs : lsClaseServicio) { for (ClaseServicio cs : lsClaseServicio) {
sb.append(cs.getClaseservicioId()).append(","); sb.append(cs.getClaseservicioId()).append(",");
} }
String listInt = sb.toString().substring(0, sb.toString().length() - 1); String listInt = sb.toString().substring(0, sb.toString().length() - 1);
if(!listInt.contains("-1")){
sql.append(" AND CS.CLASESERVICIO_ID in (").append(listInt).append(") "); sql.append(" AND CS.CLASESERVICIO_ID in (").append(listInt).append(") ");
} }
}
sql.append(" GROUP by R.descruta,R.RUTA_ID,MON.moneda_id,M.MARCA_ID,mon.descmoneda, M.descmarca,CS.descclase "); sql.append(" GROUP by R.descruta,R.RUTA_ID,MON.moneda_id,M.MARCA_ID,mon.descmoneda, M.descmarca,CS.descclase ");
sql.append(" ORDER by R.descruta,R.RUTA_ID,MON.moneda_id,M.MARCA_ID"); sql.append(" ORDER by R.descruta,R.RUTA_ID,MON.moneda_id,M.MARCA_ID");