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

fixes bug #7074: Problemas RLH 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@52448 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2016-02-01 13:45:41 +00:00
parent c02d05299f
commit 5567f94326
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java
View File

@ -429,7 +429,7 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append(" FROM CORRIDA C ");
sql.append(" WHERE C.ACTIVO = 1");
sql.append(" AND C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL ");
sql.append(empresa == null ? "" : " AND C.EMPRESACORRIDA_ID = " + empresa.getEmpresaId());
sql.append(empresa == null ? "" : " AND C.MARCA_ID = " + empresa.getEmpresaId());
sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI')) TB2, ");
sql.append(" (SELECT C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI') AS HORASALIDA, ");
sql.append(" COUNT(B.BOLETO_ID) AS ABSOL ");
@ -439,7 +439,7 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append(" AND B.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA).append(") ");
sql.append(" WHERE C.ACTIVO = 1 ");
sql.append(" AND C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL ");
sql.append(empresa == null ? "" : " AND B.MARCA_ID = " + empresa.getEmpresaId());
sql.append(empresa == null ? "" : " AND C.MARCA_ID = " + empresa.getEmpresaId());
sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI')) TB4, ");
sql.append(" CORRIDA C ");
sql.append("LEFT JOIN ");
@ -462,7 +462,7 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append(" WHERE CO.ACTIVO = 1 ");
sql.append(" AND RC.ACTIVO = 1");
sql.append(" AND T.ACTIVO = 1");
sql.append(empresa == null ? "" : " AND BO.MARCA_ID = " + empresa.getEmpresaId());
sql.append(empresa == null ? "" : " AND CO.MARCA_ID = " + empresa.getEmpresaId());
sql.append(" AND BO.INDSTATUSBOLETO != 'S' AND BO.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" AND BO.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA);
sql.append(" AND BO.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL ");