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

fixes bug#20695 

dev:valdir
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@103846 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2020-10-19 14:28:24 +00:00
parent d46db6618c
commit c3bc0d9a0e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java
View File

@ -352,7 +352,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
sql.append(" WHERE ");
sql.append(" CR.CORRIDA_ID = :CORRIDA_ID ");
sql.append(" AND TO_CHAR(CR.FECCORRIDA, 'MMYYYY') = TO_CHAR(:DATA_MES, 'MMYYYY') ");
sql.append(" AND TO_CHAR(CR.FECHORSALIDAORIGINAL, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(" AND TO_CHAR(CR.FECHORSALIDA, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(isServicoExtra ? " AND CR.TIPOSERVICIO_ID = 2 " : " AND CR.TIPOSERVICIO_ID <> 2 ");
sql.append(" AND CR.RUTA_ID = :RUTA_ID ");
sql.append(" AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID ");
@ -403,7 +403,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
sql.append("WHERE ");
sql.append(" CR.CORRIDA_ID = :CORRIDA_ID ");
sql.append("AND TO_CHAR(CR.FECCORRIDA, 'MMYYYY') = TO_CHAR(:DATA_MES, 'MMYYYY') ");
sql.append("AND TO_CHAR(CR.FECHORSALIDAORIGINAL, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append("AND TO_CHAR(CR.FECHORSALIDA, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(isServicoExtra ? "AND CR.TIPOSERVICIO_ID = 2 " : " AND CR.TIPOSERVICIO_ID <> 2 ");
sql.append("AND CR.RUTA_ID = :RUTA_ID ");
sql.append("AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID ");
@ -455,7 +455,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
sql.append(" AND EXTENSAO_LINHA.FECCORRIDA = C.FECCORRIDA ");
sql.append(" AND EXTENSAO_LINHA.ROLOPERATIVO_ID = C.ROLOPERATIVO_ID ");
sql.append(" AND C.ROLOPERATIVO_ID = :ROLOPERATIVO_ID ");
sql.append(" AND TO_CHAR(C.FECHORSALIDAORIGINAL, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(" AND TO_CHAR(C.FECHORSALIDA, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(isServicoExtra ? " AND C.TIPOSERVICIO_ID = 2 " : " AND C.TIPOSERVICIO_ID <> 2 ");
sql.append(" AND C.RUTA_ID = :RUTA_ID ");
sql.append(" AND C.ACTIVO = 1 ");
@ -494,7 +494,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
sql.append(" WHERE CR.ACTIVO = 1 AND RS.ACTIVO = 1 AND TR1.ACTIVO = 1 ");
sql.append(" AND CR.CORRIDA_ID = :CORRIDA_ID ");
sql.append(" AND TO_CHAR(CR.FECCORRIDA, 'MMYYYY') = TO_CHAR(:DATA_MES, 'MMYYYY') ");
sql.append(" AND TO_CHAR(CR.FECHORSALIDAORIGINAL, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(" AND TO_CHAR(CR.FECHORSALIDA, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(isServicoExtra ? " AND CR.TIPOSERVICIO_ID = 2 " : " AND CR.TIPOSERVICIO_ID <> 2 ");
sql.append(" AND CR.RUTA_ID = :RUTA_ID ");
sql.append(" AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID ");
@ -503,7 +503,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
sql.append(" WHERE CR.ACTIVO = 1 ");
sql.append(" AND CR.CORRIDA_ID = :CORRIDA_ID ");
sql.append(" AND TO_CHAR(CR.FECCORRIDA, 'MMYYYY') = TO_CHAR(:DATA_MES, 'MMYYYY') ");
sql.append(" AND TO_CHAR(CR.FECHORSALIDAORIGINAL, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(" AND TO_CHAR(CR.FECHORSALIDA, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(isServicoExtra ? " AND CR.TIPOSERVICIO_ID = 2 " : " AND CR.TIPOSERVICIO_ID <> 2 ");
sql.append(" AND CR.RUTA_ID = :RUTA_ID ");
sql.append(" AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID ");
@ -527,7 +527,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
sql.append("WHERE ");
sql.append(" BO.CORRIDA_ID = :CORRIDA_ID ");
sql.append("AND TO_CHAR(BO.FECCORRIDA, 'MMYYYY') = TO_CHAR(:DATA_MES, 'MMYYYY') ");
sql.append("AND TO_CHAR(CR.FECHORSALIDAORIGINAL, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append("AND TO_CHAR(CR.FECHORSALIDA, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(isServicoExtra ? "AND CR.TIPOSERVICIO_ID = 2 " : " AND CR.TIPOSERVICIO_ID <> 2 ");
sql.append("AND CR.RUTA_ID = :RUTA_ID ");
sql.append("AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID ");
@ -576,7 +576,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
sql.append(" WHERE CT1.CORRIDA_ID = :CORRIDA_ID ");
sql.append(" AND TO_CHAR(CT1.FECCORRIDA, 'MMYYYY') = TO_CHAR(:DATA_MES, 'MMYYYY') ");
sql.append(" AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID ");
sql.append(" AND TO_CHAR(CR.FECHORSALIDAORIGINAL, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(" AND TO_CHAR(CR.FECHORSALIDA, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(isServicoExtra ? "AND CR.TIPOSERVICIO_ID = 2 " : " AND CR.TIPOSERVICIO_ID <> 2 ");
sql.append(" AND CR.RUTA_ID = :RUTA_ID ");
sql.append(" GROUP BY ");
@ -586,7 +586,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
sql.append(" WHERE CR.CORRIDA_ID = :CORRIDA_ID ");
sql.append(" AND TO_CHAR(CR.FECCORRIDA, 'MMYYYY') = TO_CHAR(:DATA_MES, 'MMYYYY') ");
sql.append(" AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID ");
sql.append(" AND TO_CHAR(CR.FECHORSALIDAORIGINAL, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(" AND TO_CHAR(CR.FECHORSALIDA, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(isServicoExtra ? "AND CR.TIPOSERVICIO_ID = 2 " : " AND CR.TIPOSERVICIO_ID <> 2 ");
sql.append(" AND CR.RUTA_ID = :RUTA_ID ");
sql.append("AND BO.ACTIVO = 1 ");
@ -616,7 +616,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
sql.append("WHERE ");
sql.append(" BO.CORRIDA_ID = :CORRIDA_ID ");
sql.append("AND TO_CHAR(BO.FECCORRIDA, 'MMYYYY') = TO_CHAR(:DATA_MES, 'MMYYYY') ");
sql.append("AND TO_CHAR(CR.FECHORSALIDAORIGINAL, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append("AND TO_CHAR(CR.FECHORSALIDA, 'HH24:MI') = TO_CHAR(TO_DATE(:HORARIO, 'HH24:MI'), 'HH24:MI') ");
sql.append(isServicoExtra ? "AND CR.TIPOSERVICIO_ID = 2 " : " AND CR.TIPOSERVICIO_ID <> 2 ");
sql.append("AND CR.RUTA_ID = :RUTA_ID ");
sql.append("AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID ");
@ -649,7 +649,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
sql.append(" RT.DESCRUTA, ");
sql.append(" DA.CANTASIENTOS ASSENTOS, ");
sql.append(" PO.CVEPARADA||' - '||PD.CVEPARADA SIGLA, ");
sql.append(" TO_CHAR(CR.FECHORSALIDAORIGINAL, 'HH24:MI') HORARIO, ");
sql.append(" TO_CHAR(CR.FECHORSALIDA, 'HH24:MI') HORARIO, ");
//if (addRoloperativo_id) {
sql.append(" CR.ROLOPERATIVO_ID, ");
@ -697,7 +697,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
sql.append(" AND TR.DESTINO_ID = CR.DESTINO_ID ");
sql.append(" AND CR.TIPOSERVICIO_ID = NVL(:TIPOSERVICIO_ID, CR.TIPOSERVICIO_ID) ");
sql.append(" AND TO_CHAR(CR.FECCORRIDA, 'MMYYYY') = TO_CHAR(:DATA_MES, 'MMYYYY') ");
sql.append(" ORDER BY INTERESTADUAL, GRUPO_LINHA, SIGLA, CR.CORRIDA_ID, TO_CHAR(CR.FECHORSALIDAORIGINAL, 'HH24:MI') ");
sql.append(" ORDER BY INTERESTADUAL, GRUPO_LINHA, SIGLA, CR.CORRIDA_ID, TO_CHAR(CR.FECHORSALIDA, 'HH24:MI') ");
return sql.toString();
}