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

bug #6759 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49241 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2015-10-20 20:10:31 +00:00
parent 06972c3918
commit e582587412
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,8 +82,6 @@ public class RelatorioLinhasHorario extends Relatorio {
Integer tipoServico = (Integer) parametros.get("TIPOSERVICIO_ID"); Integer tipoServico = (Integer) parametros.get("TIPOSERVICIO_ID");
String sql = getSql(lsNumLinha, lsNumServico, empresa, tipoServico, grupoRuta); String sql = getSql(lsNumLinha, lsNumServico, empresa, tipoServico, grupoRuta);
log.info(sql);
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
ResultSet rset = null; ResultSet rset = null;
@ -434,7 +432,7 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append(empresa == null ? "" : " AND C.EMPRESACORRIDA_ID = " + empresa.getEmpresaId()); sql.append(empresa == null ? "" : " AND C.EMPRESACORRIDA_ID = " + empresa.getEmpresaId());
sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI')) TB2, "); 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(" (SELECT C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI') AS HORASALIDA, ");
sql.append(" COUNT(1) AS ABSOL "); sql.append(" COUNT(B.BOLETO_ID) AS ABSOL ");
sql.append(" FROM CORRIDA C "); sql.append(" FROM CORRIDA C ");
sql.append(" LEFT JOIN BOLETO B ON (B.CORRIDA_ID = C.CORRIDA_ID AND B.FECCORRIDA = C.FECCORRIDA "); sql.append(" LEFT JOIN BOLETO B ON (B.CORRIDA_ID = C.CORRIDA_ID AND B.FECCORRIDA = C.FECCORRIDA ");
sql.append(" AND B.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND B.MOTIVOCANCELACION_ID IS NULL ");
@ -442,8 +440,6 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append(" WHERE C.ACTIVO = 1 "); sql.append(" WHERE C.ACTIVO = 1 ");
sql.append(" AND C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); 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.EMPRESACORRIDA_ID = " + empresa.getEmpresaId());
// sql.append(" AND B.MOTIVOCANCELACION_ID IS NULL ");
// sql.append(" AND B.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA);
sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI')) TB4, "); sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID, TO_CHAR(C.FECHORSALIDA, 'HH24:MI')) TB4, ");
sql.append(" CORRIDA C "); sql.append(" CORRIDA C ");
sql.append("LEFT JOIN "); sql.append("LEFT JOIN ");
@ -502,6 +498,7 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append("SELECT RC.RUTA_ID, T.ORIGEN_ID, T.DESTINO_ID, NVL(T.CANTKMREAL,0) AS EXTENSAO "); sql.append("SELECT RC.RUTA_ID, T.ORIGEN_ID, T.DESTINO_ID, NVL(T.CANTKMREAL,0) AS EXTENSAO ");
sql.append("FROM RUTA_COMBINACION RC "); sql.append("FROM RUTA_COMBINACION RC ");
sql.append("INNER JOIN TRAMO T ON RC.TRAMO_ID = T.TRAMO_ID "); sql.append("INNER JOIN TRAMO T ON RC.TRAMO_ID = T.TRAMO_ID ");
sql.append("WHERE RC.ACTIVO = 1 "); sql.append("WHERE RC.ACTIVO = 1 ");
sql.append(") TB5 ON TB5.RUTA_ID = C.RUTA_ID "); sql.append(") TB5 ON TB5.RUTA_ID = C.RUTA_ID ");
sql.append("AND TB5.ORIGEN_ID = ORIGEM.PARADA_ID "); sql.append("AND TB5.ORIGEN_ID = ORIGEM.PARADA_ID ");