From 681c20d1d0c27a1abfe68e385c9b4e24877c77b5 Mon Sep 17 00:00:00 2001 From: rodrigo Date: Wed, 14 Aug 2013 22:42:44 +0000 Subject: [PATCH] git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@29940 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioLinhasHorario.java | 68 +++++++- .../RelatorioLinhasHorario_pt_BR.properties | 14 +- .../templates/RelatorioLinhasHorario.jasper | Bin 62894 -> 74120 bytes .../templates/RelatorioLinhasHorario.jrxml | 161 +++++++++++++++++- .../RelatorioLinhasHorarioBean.java | 51 +++--- 5 files changed, 255 insertions(+), 39 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java index c27f3badc..b918577df 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java @@ -80,6 +80,25 @@ public class RelatorioLinhasHorario extends Relatorio { List lsDadosRelatorio = new ArrayList(); + BigDecimal totalPassagens = BigDecimal.ZERO; + BigDecimal totalSeguro = BigDecimal.ZERO; + BigDecimal totalBagagens = BigDecimal.ZERO; + BigDecimal totalSeuroOpcional = BigDecimal.ZERO; + BigDecimal totalTotal = BigDecimal.ZERO; + BigDecimal totalOrdinario = BigDecimal.ZERO; + BigDecimal totalExtra = BigDecimal.ZERO; + BigDecimal totalViagem = BigDecimal.ZERO; + BigDecimal totalKmRodado = BigDecimal.ZERO; + BigDecimal totalAbsoluto = BigDecimal.ZERO; + BigDecimal totalEquivalente = BigDecimal.ZERO; + BigDecimal mediaMPA = BigDecimal.ZERO; + BigDecimal mediaMPE = BigDecimal.ZERO; + BigDecimal mediaRsPorKm = BigDecimal.ZERO; + BigDecimal totalEQ = BigDecimal.ZERO; + BigDecimal mediaRSPorViagem = BigDecimal.ZERO; + BigDecimal totalPaxKMOfertado = BigDecimal.ZERO; + BigDecimal totalPaxKMTransportado = BigDecimal.ZERO; + BigDecimal totalIAP = BigDecimal.ZERO; while (rset.next()) { RelatorioLinhasHorarioBean horarioBean = new RelatorioLinhasHorarioBean(); @@ -130,9 +149,50 @@ public class RelatorioLinhasHorario extends Relatorio { horarioBean.setExtensao(horarioBean.getExtensaoTrecho()); lsDadosRelatorio.add(horarioBean); - } - parametros.put("lsDadosRelatorio", lsDadosRelatorio); + totalPassagens = totalPassagens.add(horarioBean.getPassagens() != null ? horarioBean.getPassagens() : BigDecimal.ZERO); + totalSeguro = totalSeguro.add(horarioBean.getSeguro() != null ? horarioBean.getSeguro() : BigDecimal.ZERO); + totalBagagens = totalBagagens.add(horarioBean.getBagagens() != null ? horarioBean.getBagagens() : BigDecimal.ZERO); + totalSeuroOpcional = totalSeuroOpcional.add(horarioBean.getSegOpc() != null ? horarioBean.getSegOpc() : BigDecimal.ZERO); + totalTotal = totalTotal.add(horarioBean.getTotal() != null ? horarioBean.getTotal() : BigDecimal.ZERO); + totalOrdinario = totalOrdinario.add(horarioBean.getOrd() != null ? horarioBean.getOrd() : BigDecimal.ZERO); + totalExtra = totalExtra.add(horarioBean.getExtra() != null ? horarioBean.getExtra() : BigDecimal.ZERO); + totalViagem = totalViagem.add(horarioBean.getTotalViagem() != null ? horarioBean.getTotalViagem() : BigDecimal.ZERO); + totalKmRodado = totalKmRodado.add(horarioBean.getKmRodado() != null ? horarioBean.getKmRodado() : BigDecimal.ZERO); + totalAbsoluto = totalAbsoluto.add(horarioBean.getAbsol() != null ? horarioBean.getAbsol() : BigDecimal.ZERO); + totalEquivalente = totalEquivalente.add(horarioBean.getEquivalente() != null ? horarioBean.getEquivalente() : BigDecimal.ZERO); + mediaMPA = mediaMPA.add(horarioBean.getMpa() != null ? horarioBean.getMpa() : BigDecimal.ZERO); + mediaMPE = mediaMPE.add(horarioBean.getMpe() != null ? horarioBean.getMpe() : BigDecimal.ZERO); + mediaRsPorKm = mediaRsPorKm.add(horarioBean.getRsKm() != null ? horarioBean.getRsKm() : BigDecimal.ZERO); + totalEQ = totalEQ.add(horarioBean.getEq() != null ? horarioBean.getEq() : BigDecimal.ZERO); + mediaRSPorViagem = mediaRSPorViagem.add(horarioBean.getRsViagem() != null ? horarioBean.getRsViagem() : BigDecimal.ZERO); + 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); + } + + BigDecimal qtdeRegistros = new BigDecimal(lsDadosRelatorio.size()); + + parametros.put("lsDadosRelatorio", lsDadosRelatorio); + parametros.put("TOTAL_PASSAGENS", totalPassagens); + parametros.put("TOTAL_SEGURO", totalSeguro); + parametros.put("TOTAL_BAGAGENS", totalBagagens); + parametros.put("TOTAL_SEURO_OPCIONAL", totalSeuroOpcional); + parametros.put("TOTAL_TOTAL", totalTotal); + parametros.put("TOTAL_ORDINARIO", totalOrdinario); + parametros.put("TOTAL_EXTRA", totalExtra); + parametros.put("TOTAL_VIAGEM", totalViagem); + parametros.put("TOTAL_KM_RODADO", totalKmRodado); + parametros.put("TOTAL_ABSOLUTO", totalAbsoluto); + parametros.put("TOTAL_EQUIVALENTE", totalEquivalente); + parametros.put("MEDIA_MPA", mediaMPA.divide(qtdeRegistros, RoundingMode.HALF_EVEN)); + parametros.put("MEDIA_MPE", mediaMPE.divide(qtdeRegistros, RoundingMode.HALF_EVEN)); + parametros.put("MEDIA_RS_POR_KM", mediaRsPorKm.divide(qtdeRegistros, RoundingMode.HALF_EVEN)); + parametros.put("TOTAL_EQ", totalEQ); + parametros.put("MEDIA_RS_POR_VIAGEM", mediaRSPorViagem.divide(qtdeRegistros, RoundingMode.HALF_EVEN)); + parametros.put("TOTAL_PAX_KM_OFERTADO", totalPaxKMOfertado); + parametros.put("TOTAL_PAX_KM_TRANSPORTADO", totalPaxKMTransportado); + parametros.put("TOTAL_IAP", totalIAP); } }); @@ -274,6 +334,7 @@ public class RelatorioLinhasHorario extends Relatorio { StringBuffer sql = new StringBuffer(); sql.append(" SELECT "); + sql.append(" R.RUTA_ID, "); sql.append(" NVL(GR.DESCGRUPO, 'Não Informado') AS GRUPO_RUTA, "); sql.append(" TO_CHAR(CJ.FECHORVIAJE, 'HH24:MI') AS HORA, "); sql.append(" C.CORRIDA_ID AS SERVICO, "); @@ -342,7 +403,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" ON ( EE.CORRIDA_ID = C.CORRIDA_ID "); sql.append(" AND EE.FECCORRIDA = C.FECCORRIDA "); sql.append(" AND EE.TIPOEVENTOEXTRA_ID = 1 ) "); - sql.append(" WHERE CJ.MOTIVOCANCELACION_ID IS NULL AND CJ.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); + sql.append(" WHERE CJ.PRECIOBASE>0 AND CJ.MOTIVOCANCELACION_ID IS NULL AND 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 TB3.CORRIDA_ID = C.CORRIDA_ID "); @@ -387,6 +448,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" AND CS.ACTIVO = 1 "); sql.append(" GROUP BY "); + sql.append(" R.RUTA_ID, "); sql.append(" NVL(GR.DESCGRUPO, 'Não Informado'), "); sql.append(" TO_CHAR(CJ.FECHORVIAJE, 'HH24:MI'), "); sql.append(" C.CORRIDA_ID, "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioLinhasHorario_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioLinhasHorario_pt_BR.properties index 490339664..c61e44845 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioLinhasHorario_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioLinhasHorario_pt_BR.properties @@ -4,12 +4,12 @@ msg.a= #Labels header header.titulo.relatorio=Resumo de Linhas por Horário - RLH -header.periodo=Período: -header.data.hora=Data/Hora: -header.pagina=Página: -header.filtro=Filtro: -header.filtro.servico=Serviço: -header.filtro.linha=Linha: +header.periodo=Per\u00EDodo\: +header.data.hora=Data/Hora\: +header.pagina=P\u00E1gina\: +header.filtro=Filtro\: +header.filtro.servico=Servi\u00E7o\: +header.filtro.linha=Linha\: #Labels detail @@ -41,7 +41,7 @@ detail.mpe=MPE detail.rsKm=R$/Km detail.eq=Eq. detail.rsViagem=R$/Viagem -detail.paxOfer=Pax.Km Ofertado +detail.paxOfer=Pax.Km Ofer. detail.paxTrans=Pax.Km Transportado detail.iap=IAP% diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper index ffdde2e83cc1a4c0d452caff9c284828a679774b..4aad481fcc18c033414f87fccb241d8c2f1dbf36 100644 GIT binary patch delta 22020 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 - + @@ -44,6 +44,25 @@ + + + + + + + + + + + + + + + + + + + @@ -349,10 +368,10 @@ - + - + @@ -552,6 +571,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioLinhasHorarioBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioLinhasHorarioBean.java index a324e55a1..08e11f162 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioLinhasHorarioBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioLinhasHorarioBean.java @@ -90,7 +90,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getServico() { - return servico; + return servico == null ? BigDecimal.ZERO : servico; } public void setServico(BigDecimal servico) { @@ -106,7 +106,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getLot() { - return lot; + return lot == null ? BigDecimal.ZERO : lot; } public void setLot(BigDecimal lot) { @@ -122,7 +122,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getExtensaoTrecho() { - return extensaoTrecho; + return extensaoTrecho == null ? BigDecimal.ZERO : extensaoTrecho; } public void setExtensaoTrecho(BigDecimal extensaoTrecho) { @@ -130,7 +130,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getExtensao() { - return extensao; + return extensao == null ? BigDecimal.ZERO : extensao; } public void setExtensao(BigDecimal extensao) { @@ -138,7 +138,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getTarifa() { - return tarifa; + return tarifa == null ? BigDecimal.ZERO : tarifa; } public void setTarifa(BigDecimal tarifa) { @@ -146,7 +146,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getPassagens() { - return passagens; + return passagens == null ? BigDecimal.ZERO : passagens; } public void setPassagens(BigDecimal passagens) { @@ -154,7 +154,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getSeguro() { - return seguro; + return seguro == null ? BigDecimal.ZERO : seguro; } public void setSeguro(BigDecimal seguro) { @@ -162,7 +162,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getBagagens() { - return bagagens; + return bagagens == null ? BigDecimal.ZERO : bagagens; } public void setBagagens(BigDecimal bagagens) { @@ -170,7 +170,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getSegOpc() { - return segOpc; + return segOpc == null ? BigDecimal.ZERO : segOpc; } public void setSegOpc(BigDecimal segOpc) { @@ -178,7 +178,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getTotal() { - return total; + return total == null ? BigDecimal.ZERO : total; } public void setTotal(BigDecimal total) { @@ -186,7 +186,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getOrd() { - return ord; + return ord == null ? BigDecimal.ZERO : ord; } public void setOrd(BigDecimal ord) { @@ -194,7 +194,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getExtra() { - return extra; + return extra == null ? BigDecimal.ZERO : extra; } public void setExtra(BigDecimal extra) { @@ -202,7 +202,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getAbsol() { - return absol; + return absol == null ? BigDecimal.ZERO : absol; } public void setAbsol(BigDecimal absol) { @@ -210,7 +210,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getMediaReceitaViagem() { - return mediaReceitaViagem; + return mediaReceitaViagem == null ? BigDecimal.ZERO : mediaReceitaViagem; } public void setMediaReceitaViagem(BigDecimal mediaReceitaViagem) { @@ -218,7 +218,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getTotalViagem() { - return totalViagem; + return totalViagem == null ? BigDecimal.ZERO : totalViagem; } public void setTotalViagem(BigDecimal totalViagem) { @@ -226,7 +226,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getKmRodado() { - return kmRodado; + return kmRodado == null ? BigDecimal.ZERO : kmRodado; } public void setKmRodado(BigDecimal kmRodado) { @@ -234,7 +234,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getEquivalente() { - return equivalente; + return equivalente == null ? BigDecimal.ZERO : equivalente; } public void setEquivalente(BigDecimal equivalente) { @@ -242,7 +242,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getMpa() { - return mpa; + return mpa == null ? BigDecimal.ZERO : mpa; } public void setMpa(BigDecimal mpa) { @@ -250,7 +250,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getMpe() { - return mpe; + return mpe == null ? BigDecimal.ZERO : mpe; } public void setMpe(BigDecimal mpe) { @@ -258,7 +258,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getRsKm() { - return rsKm; + return rsKm == null ? BigDecimal.ZERO : rsKm; } public void setRsKm(BigDecimal rsKm) { @@ -266,7 +266,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getEq() { - return eq; + return eq == null ? BigDecimal.ZERO : eq; } public void setEq(BigDecimal eq) { @@ -274,7 +274,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getRsViagem() { - return rsViagem; + return rsViagem == null ? BigDecimal.ZERO : rsViagem; } public void setRsViagem(BigDecimal rsViagem) { @@ -282,7 +282,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getPaxKmOfertado() { - return paxKmOfertado; + return paxKmOfertado == null ? BigDecimal.ZERO : paxKmOfertado; } public void setPaxKmOfertado(BigDecimal paxKmOfertado) { @@ -290,7 +290,7 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getPaxKmTransportado() { - return paxKmTransportado; + return paxKmTransportado == null ? BigDecimal.ZERO : paxKmTransportado; } public void setPaxKmTransportado(BigDecimal paxKmTransportado) { @@ -298,11 +298,10 @@ public class RelatorioLinhasHorarioBean { } public BigDecimal getIap() { - return iap; + return iap == null ? BigDecimal.ZERO : iap; } public void setIap(BigDecimal iap) { this.iap = iap; } - }