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

Problemas RLH (fixes bug #7074) 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@52438 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2016-02-01 12:27:25 +00:00
parent 8b76e28467
commit 8068b8d546
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,7 +282,7 @@ public class RelatorioLinhasHorario extends Relatorio {
private RelatorioLinhasHorarioBean calcEquivalente(RelatorioLinhasHorarioBean horarioBean) {
BigDecimal equivalente = new BigDecimal(0);
try {
equivalente = horarioBean.getSomaExtensaoTrecho().divide(horarioBean.getExtensao(),2, RoundingMode.HALF_UP);
equivalente = horarioBean.getSomaExtensaoTrecho().divide(horarioBean.getExtensao(), 2, RoundingMode.HALF_UP);
} catch (ArithmeticException e) {
equivalente = BigDecimal.ZERO;
} catch (NullPointerException nex) {
@ -434,12 +434,12 @@ public class RelatorioLinhasHorario extends Relatorio {
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 ");
sql.append(" FROM CORRIDA C ");
sql.append(" LEFT JOIN BOLETO B ON (B.CORRIDA_ID = C.CORRIDA_ID AND B.FECCORRIDA = C.FECCORRIDA AND B.MARCA_ID = C.MARCA_ID ");
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.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 C.EMPRESACORRIDA_ID = " + empresa.getEmpresaId());
sql.append(empresa == null ? "" : " AND B.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 ");
@ -456,9 +456,9 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append(" SUM(NVL(BO.IMPORTEPEDAGIO, 0)) AS IMPORTEPEDAGIO, ");
sql.append(" SUM(NVL(BO.PRECIOPAGADO, 0)) AS PRECIOPAGADO ");
sql.append(" FROM CORRIDA CO ");
sql.append(" INNER JOIN BOLETO BO ON CO.CORRIDA_ID = BO.CORRIDA_ID AND CO.FECCORRIDA = BO.FECCORRIDA AND BO.MARCA_ID = CO.MARCA_ID ");
sql.append(" INNER JOIN BOLETO BO ON CO.CORRIDA_ID = BO.CORRIDA_ID AND CO.FECCORRIDA = BO.FECCORRIDA ");
sql.append(" INNER JOIN RUTA_COMBINACION RC ON RC.RUTA_ID = CO.RUTA_ID ");
sql.append(" INNER JOIN TRAMO T ON RC.TRAMO_ID = T.TRAMO_ID AND T.ORIGEN_ID = BO.ORIGEN_ID AND T.DESTINO_ID = BO.DESTINO_ID ");
sql.append(" INNER JOIN TRAMO T ON RC.TRAMO_ID = T.TRAMO_ID AND T.ORIGEN_ID = BO.ORIGEN_ID AND T.DESTINO_ID = BO.DESTINO_ID ");
sql.append(" WHERE CO.ACTIVO = 1 ");
sql.append(" AND RC.ACTIVO = 1");
sql.append(" AND T.ACTIVO = 1");
@ -509,8 +509,7 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append("AND TB4.ROLOPERATIVO_ID = C.ROLOPERATIVO_ID ");
sql.append("AND TB4.HORASALIDA = TO_CHAR(C.FECHORSALIDA, 'HH24:MI') ");
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());
if (lsNumServico.size() > 0) {
for (Corrida corrida : lsNumServico) {
@ -537,7 +536,7 @@ public class RelatorioLinhasHorario extends Relatorio {
}
sql.append(tipoServico > 0 ? " AND C.TIPOSERVICIO_ID = " + tipoServico + " " : "");
sql.append(" AND C.ACTIVO <> 0 AND ORIGEM.ACTIVO = 1 AND DESTINO.ACTIVO = 1 ");
sql.append("AND R.ACTIVO = 1 AND RO.ACTIVO = 1 AND DA.ACTIVO = 1 AND CS.ACTIVO = 1 ");
sql.append("GROUP BY R.RUTA_ID, NVL(GR.DESCGRUPO, 'Não Definido'), TO_CHAR(C.FECHORSALIDA, 'HH24:MI'), C.CORRIDA_ID, R.INDSENTIDOIDA, ");
@ -548,7 +547,7 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append("GROUP BY RUTA_ID, GRUPO_RUTA, HORA, SERVICO, SENTIDO, LOT, CLA, TARIFA, ORIGEM, DESTINO, ");
sql.append(" EXTENSAO, BAGAGENS, ORD, EXTRA, TIPO_LINHA, ABSOL ");
sql.append("ORDER BY TIPO_LINHA, GRUPO_RUTA, SERVICO, ORIGEM, DESTINO ");
return sql.toString();
}