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

fixes bug#14247 

dev: Lucas Silvério
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@93658 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2019-05-23 14:09:31 +00:00
parent 6a09539fc4
commit ed17504d72
1 changed files with 131 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java
View File

@ -360,14 +360,15 @@ public class RelatorioOrigemDestino extends Relatorio {
sql.append(" INNER JOIN empresa EM ON EM.empresa_id = CO.empresacorrida_id "); sql.append(" INNER JOIN empresa EM ON EM.empresa_id = CO.empresacorrida_id ");
sql.append(" INNER JOIN ruta RU ON RU.ruta_id = CO.ruta_id "); sql.append(" INNER JOIN ruta RU ON RU.ruta_id = CO.ruta_id ");
sql.append(" INNER JOIN ruta_secuencia rt on rt.ruta_id = ru.ruta_id "); sql.append(" INNER JOIN ruta_secuencia rt on rt.ruta_id = ru.ruta_id ");
sql.append(" INNER JOIN tarifa TF ON (TF.CLASESERVICIO_ID = CO.CLASESERVICIO_ID "); sql.append(" LEFT JOIN tarifa TF ON (TF.CLASESERVICIO_ID = CO.CLASESERVICIO_ID ");
sql.append(" AND TF.DESTINO_ID = CO.DESTINO_ID "); sql.append(" AND TF.DESTINO_ID = CO.DESTINO_ID ");
sql.append(" AND TF.ORIGEN_ID = CO.ORIGEN_ID "); sql.append(" AND TF.ORIGEN_ID = CO.ORIGEN_ID ");
sql.append(" AND TF.MARCA_ID = CO.MARCA_ID "); sql.append(" AND TF.MARCA_ID = CO.MARCA_ID ");
sql.append(" AND TF.RUTA_ID = CO.RUTA_ID AND tf.tramo_id = rt.tramo_id)"); sql.append(" AND TF.RUTA_ID = CO.RUTA_ID AND tf.tramo_id = rt.tramo_id ");
sql.append("INNER JOIN VIGENCIA_TARIFA VT ON (TF.VIGENCIATARIFA_ID=VT.VIGENCIATARIFA_ID)"); sql.append(" AND TF.activo = 1 ) ");
sql.append(" WHERE CA.activo = 1 AND RU.activo = 1 AND EM.activo = 1 AND ORI.activo = 1 AND DES.activo = 1 AND TF.activo = 1 "); sql.append(" LEFT JOIN VIGENCIA_TARIFA VT ON (TF.VIGENCIATARIFA_ID=VT.VIGENCIATARIFA_ID ");
sql.append(" AND CO.activo = 1 "); sql.append(" AND CO.FECCORRIDA BETWEEN vt.FECINICIOVIGENCIA and vt.FECFINVIGENCIA )");
sql.append(" WHERE CA.activo = 1 AND RU.activo = 1 AND EM.activo = 1 AND ORI.activo = 1 AND DES.activo = 1 AND CO.activo = 1 ");
sql.append((!corridasIds.equals("Todas") ? " AND CA.CORRIDA_ID IN (" + corridasIds + ") " : " ")); sql.append((!corridasIds.equals("Todas") ? " AND CA.CORRIDA_ID IN (" + corridasIds + ") " : " "));
sql.append((" AND CO.EMPRESACORRIDA_ID IN (") + empresaIds + ") "); sql.append((" AND CO.EMPRESACORRIDA_ID IN (") + empresaIds + ") ");
sql.append(" AND CA.FECCORRIDA BETWEEN to_date('" + dataDe + "','dd/mm/yyyy HH24:mi:ss') AND to_date('" + dataAte + "','dd/mm/yyyy HH24:mi:ss') "); sql.append(" AND CA.FECCORRIDA BETWEEN to_date('" + dataDe + "','dd/mm/yyyy HH24:mi:ss') AND to_date('" + dataAte + "','dd/mm/yyyy HH24:mi:ss') ");
@ -379,7 +380,6 @@ public class RelatorioOrigemDestino extends Relatorio {
sql.append(" AND CA.preciobase IS NOT NULL "); sql.append(" AND CA.preciobase IS NOT NULL ");
sql.append((bilhetesGratuitos ? " AND CA.PRECIOBASE >= 0 " : " AND CA.PRECIOBASE > 0 ")); sql.append((bilhetesGratuitos ? " AND CA.PRECIOBASE >= 0 " : " AND CA.PRECIOBASE > 0 "));
sql.append(" AND CO.FECCORRIDA BETWEEN vt.FECINICIOVIGENCIA and vt.FECFINVIGENCIA");
sql.append(" GROUP BY RU.ruta_id, "); sql.append(" GROUP BY RU.ruta_id, ");
sql.append(" EM.nombempresa, "); sql.append(" EM.nombempresa, ");
sql.append(" ORI.DESCPARADA, "); sql.append(" ORI.DESCPARADA, ");