From 9341268afebf3a3f43dc15b41b5dd08478c7fe7f Mon Sep 17 00:00:00 2001 From: julio Date: Mon, 3 Feb 2014 14:41:35 +0000 Subject: [PATCH] git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@33421 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioLinhasHorario.java | 68 ++- .../templates/RelatorioLinhasHorario.jasper | Bin 110624 -> 110934 bytes .../templates/RelatorioLinhasHorario.jrxml | 439 +++++++++--------- .../utilitarios/IndStatusCorrida.java | 16 + .../RelatorioLinhasHorarioBean.java | 4 +- 5 files changed, 263 insertions(+), 264 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/IndStatusCorrida.java diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java index 8ec2074e9..e739d1106 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java @@ -16,6 +16,7 @@ import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.GrupoRuta; import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.IndStatusCorrida; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioLinhasHorarioBean; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; @@ -193,8 +194,6 @@ public class RelatorioLinhasHorario extends Relatorio { totalPaxKMOfertado = totalPaxKMOfertado.add(horarioBean.getPaxKmOfertado() != null ? horarioBean.getPaxKmOfertado() : BigDecimal.ZERO); totalPaxKMTransportado = totalPaxKMTransportado.add(horarioBean.getPaxKmTransportado() != null ? horarioBean.getPaxKmTransportado() : BigDecimal.ZERO); - // totalIAP = totalIAP.add(horarioBean.getIap() != null ? horarioBean.getIap() : BigDecimal.ZERO); - totalIAP = calcTotalIap(totalPaxKMTransportado, totalPaxKMOfertado); } @@ -408,56 +407,42 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" SUM(CJ.PRECIOPAGADO) AS PASSAGENS, "); sql.append(" ORD, "); sql.append(" EXTRA, "); - sql.append(" CASE "); - sql.append(" WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 'INTERESTADUAL' "); - sql.append(" ELSE 'INTERMUNICIPAL' "); - sql.append(" END TIPO_LINHA, "); + sql.append(" CASE WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 'INTERESTADUAL' "); + sql.append(" ELSE 'INTERMUNICIPAL' END TIPO_LINHA, "); sql.append(" ABSOL "); - sql.append(" FROM (SELECT RS.RUTA_ID, "); + sql.append(" FROM "); + sql.append(" (SELECT RS.RUTA_ID, "); sql.append(" SUM(NVL(T.CANTKMREAL, 0)) AS EXTENSAO "); - sql.append(" FROM RUTA_SECUENCIA RS "); - sql.append(" INNER JOIN TRAMO T "); - sql.append(" ON ( RS.TRAMO_ID = T.TRAMO_ID ) "); - sql.append(" WHERE RS.ACTIVO = 1 "); - sql.append(" AND T.ACTIVO = 1 "); + sql.append(" FROM RUTA_SECUENCIA RS "); + sql.append(" INNER JOIN TRAMO T ON ( RS.TRAMO_ID = T.TRAMO_ID ) "); + sql.append(" WHERE RS.ACTIVO = 1 AND T.ACTIVO = 1 "); sql.append(" GROUP BY RS.RUTA_ID) TB1, "); - sql.append(" (SELECT C.CORRIDA_ID, "); - sql.append(" COUNT(CASE "); - sql.append(" WHEN C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); - sql.append(" AND C.TIPOSERVICIO_ID = 1 THEN 1 "); - sql.append(" ELSE NULL "); - sql.append(" END) AS ORD "); + sql.append(" (SELECT C.CORRIDA_ID, C.ROLOPERATIVO_ID, "); + sql.append(" COUNT(CASE WHEN C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); + sql.append(" AND C.TIPOSERVICIO_ID = 1 THEN 1 ELSE NULL END) AS ORD "); sql.append(" FROM CORRIDA C "); sql.append(" WHERE C.ACTIVO = 1 "); - sql.append(" GROUP BY C.CORRIDA_ID) TB2, "); - sql.append(" (SELECT C.CORRIDA_ID, "); - sql.append(" COUNT(CASE "); - sql.append(" WHEN C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); - sql.append(" AND C.TIPOSERVICIO_ID = 2 THEN 1 "); - sql.append(" ELSE NULL "); - sql.append(" END) AS EXTRA "); + sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID) TB2, "); + sql.append(" (SELECT C.CORRIDA_ID, C.ROLOPERATIVO_ID, "); + sql.append(" COUNT(CASE WHEN C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); + sql.append(" AND C.TIPOSERVICIO_ID = 2 THEN 1 ELSE NULL END) AS EXTRA "); sql.append(" FROM CORRIDA C "); sql.append(" WHERE C.ACTIVO = 1 "); - sql.append(" GROUP BY C.CORRIDA_ID) TB3, "); - sql.append(" (SELECT C.CORRIDA_ID, "); - sql.append(" NVL(COUNT(CASE "); - sql.append(" WHEN C.FECCORRIDA "); - sql.append(" BETWEEN :DATA_INICIO AND :DATA_FINAL THEN "); - sql.append(" 1 "); - sql.append(" ELSE NULL "); - sql.append(" END), 0) AS ABSOL "); + sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID) TB3, "); + sql.append(" (SELECT C.CORRIDA_ID, C.ROLOPERATIVO_ID, "); + sql.append(" COUNT(CASE WHEN C.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); + sql.append(" THEN 1 ELSE NULL END) AS ABSOL "); sql.append(" FROM CORRIDA C "); sql.append(" LEFT JOIN BOLETO B "); - sql.append(" ON ( B.CORRIDA_ID = C.CORRIDA_ID "); - sql.append(" AND B.FECCORRIDA = C.FECCORRIDA ) "); - sql.append(" WHERE C.ACTIVO = 1 "); - sql.append(" AND B.ACTIVO = 1 "); + sql.append(" ON ( B.CORRIDA_ID = C.CORRIDA_ID AND B.FECCORRIDA = C.FECCORRIDA ) "); + sql.append(" WHERE C.ACTIVO = 1 AND B.ACTIVO = 1 "); sql.append(" AND B.MOTIVOCANCELACION_ID IS NULL "); - sql.append(" GROUP BY C.CORRIDA_ID) TB4, "); + sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID) TB4, "); sql.append(" CORRIDA C "); sql.append(" LEFT JOIN "); sql.append(" (SELECT CO.FECCORRIDA, "); sql.append(" CO.CORRIDA_ID, "); + sql.append(" CO.ROLOPERATIVO_ID, "); sql.append(" CO.RUTA_ID, "); sql.append(" BO.PRECIOBASE, "); sql.append(" ROUND((BO.NUMKMVIAJE * COUNT(1) / (SELECT SUM(TR.CANTKMREAL) "); @@ -476,11 +461,13 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" AND (BO.MOTIVOCANCELACION_ID IS NULL OR BO.MOTIVOCANCELACION_ID = 0) "); sql.append(" GROUP BY CO.FECCORRIDA, "); sql.append(" CO.CORRIDA_ID, "); + sql.append(" CO.ROLOPERATIVO_ID, "); sql.append(" CO.RUTA_ID, "); sql.append(" BO.PRECIOBASE, "); sql.append(" BO.NUMKMVIAJE) CJ "); sql.append(" ON ( CJ.CORRIDA_ID = C.CORRIDA_ID "); - sql.append(" AND CJ.FECCORRIDA = C.FECCORRIDA ) "); + sql.append(" AND CJ.FECCORRIDA = C.FECCORRIDA "); + sql.append(" AND CJ.ROLOPERATIVO_ID = C.ROLOPERATIVO_ID ) "); sql.append(" LEFT JOIN PARADA ORIGEM "); sql.append(" ON ( C.ORIGEN_ID = ORIGEM.PARADA_ID ) "); sql.append(" LEFT JOIN PARADA DESTINO "); @@ -516,8 +503,11 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" WHERE CJ.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); sql.append(" AND TB1.RUTA_ID = C.RUTA_ID "); sql.append(" AND TB2.CORRIDA_ID = C.CORRIDA_ID "); + sql.append(" AND TB2.ROLOPERATIVO_ID = C.ROLOPERATIVO_ID "); sql.append(" AND TB3.CORRIDA_ID = C.CORRIDA_ID "); + sql.append(" AND TB3.ROLOPERATIVO_ID = C.ROLOPERATIVO_ID "); sql.append(" AND TB4.CORRIDA_ID = C.CORRIDA_ID "); + sql.append(" AND TB4.ROLOPERATIVO_ID = C.ROLOPERATIVO_ID "); if (empresa != null) { sql.append(" AND C.EMPRESACORRIDA_ID IN ( " + empresa.getEmpresaId() + " ) "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper index b45c85b01d750deacf9b091a073f4acd4c54cf04..3f06c6dc7fd29bef757e9e232386cbe98054f33b 100644 GIT binary patch delta 21776 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml index 3b1c7067c..f51a72f97 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml @@ -2,7 +2,7 @@ - + @@ -215,17 +215,17 @@ - + - + - + @@ -236,150 +236,150 @@ - + - + - - + + - - + + - - + + - - + + - - + + - + - + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -393,167 +393,167 @@ - + - + - + - + - - + + - - + + - - + + - - + + - - + + - + - + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + @@ -571,297 +571,291 @@ - + - - + - - + - - + - - + - - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -875,196 +869,196 @@ - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - - + + - + - - + + - - + + - + - + - + - - + + - - + + - - + + - - + + @@ -1083,148 +1077,148 @@ - - + + - - + + - - + + - - + + - - + + - + - + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + @@ -1235,8 +1229,7 @@ - - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/IndStatusCorrida.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/IndStatusCorrida.java new file mode 100644 index 000000000..122908a1f --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/IndStatusCorrida.java @@ -0,0 +1,16 @@ +package com.rjconsultores.ventaboletos.relatorios.utilitarios; + +public enum IndStatusCorrida { + + HABILITADO("H"), FECHADO("P"), CANCELADO("C"), LATENTE("L"), EXTRA("E"); + + private String value; + + private IndStatusCorrida(String value) { + this.value = value; + } + + public String getValue() { + return value; + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioLinhasHorarioBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioLinhasHorarioBean.java index c13ff59fb..fb6a46f76 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioLinhasHorarioBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioLinhasHorarioBean.java @@ -55,9 +55,9 @@ public class RelatorioLinhasHorarioBean { this.sentido = ""; } else { if (sen.intValue() == 1) { - this.sentido = "ida"; + this.sentido = "Ida"; } else { - this.sentido = "volta"; + this.sentido = "Volta"; } } }