From f08e654c03f588b5214ce5ef25c01c45bcc1af62 Mon Sep 17 00:00:00 2001 From: julio Date: Mon, 2 Sep 2013 18:36:51 +0000 Subject: [PATCH] =?UTF-8?q?RLH=20-=20Homologa=C3=A7=C3=A3o=20de=20Itens?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@30477 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioLinhasHorario.java | 64 +++++++++--------- .../templates/RelatorioLinhasHorario.jasper | Bin 109541 -> 110006 bytes .../templates/RelatorioLinhasHorario.jrxml | 11 ++- .../RelatorioLinhasHorarioBean.java | 9 +++ 4 files changed, 52 insertions(+), 32 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java index 272273e04..01c323e54 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java @@ -15,6 +15,7 @@ import com.rjconsultores.ventaboletos.entidad.Corrida; 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.ProcessadorParametros; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioLinhasHorarioBean; @@ -27,9 +28,9 @@ public class RelatorioLinhasHorario extends Relatorio { public RelatorioLinhasHorario(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); - this.setProcessadorParametros(new ProcessadorParametros(this) { + this.setCustomDataSource(new DataSource(this) { @Override - public void processaParametros() throws Exception { + public void initDados() throws Exception { Connection conexao = this.relatorio.getConexao(); @@ -75,6 +76,8 @@ public class RelatorioLinhasHorario extends Relatorio { Integer tipoServico = (Integer) parametros.get("TIPOSERVICIO_ID"); String sql = getSql(lsNumLinha, lsNumServico, empresa, tipoServico, grupoRuta); + System.out.println(sql); + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); ResultSet rset = null; @@ -146,6 +149,7 @@ public class RelatorioLinhasHorario extends Relatorio { horarioBean.setOrigem((String) rset.getObject("ORIGEM")); horarioBean.setDestino((String) rset.getObject("DESTINO")); + horarioBean.setSomaExtensaoTrecho((BigDecimal) rset.getObject("EXTENSAO_TRECHO")); horarioBean = trecho(horarioBean); horarioBean = calcTotal(horarioBean); @@ -211,13 +215,13 @@ public class RelatorioLinhasHorario extends Relatorio { 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("MEDIA_MPA", mediaMPA.divide(qtdeRegistros, 2, RoundingMode.HALF_EVEN)); + parametros.put("MEDIA_MPE", mediaMPE.divide(qtdeRegistros, 2, RoundingMode.HALF_EVEN)); + parametros.put("MEDIA_RS_POR_KM", mediaRsPorKm.divide(qtdeRegistros, 2, RoundingMode.HALF_EVEN)); parametros.put("TOTAL_EQ", totalEQ); parametros.put("TOTAL_TX_EMBARQUE", totalTxEmbarque); parametros.put("TOTAL_PEDAGIO", totalPedagio); - parametros.put("MEDIA_RS_POR_VIAGEM", mediaRSPorViagem.divide(qtdeRegistros, RoundingMode.HALF_EVEN)); + parametros.put("MEDIA_RS_POR_VIAGEM", mediaRSPorViagem.divide(qtdeRegistros, 2, RoundingMode.HALF_EVEN)); parametros.put("TOTAL_PAX_KM_OFERTADO", totalPaxKMOfertado); parametros.put("TOTAL_PAX_KM_TRANSPORTADO", totalPaxKMTransportado); parametros.put("TOTAL_IAP", totalIAP); @@ -253,7 +257,7 @@ public class RelatorioLinhasHorario extends Relatorio { private RelatorioLinhasHorarioBean calcMediaReceitaTotal(RelatorioLinhasHorarioBean horarioBean) { BigDecimal mediaTotal = horarioBean.getPassagens().add(horarioBean.getSeguro()); mediaTotal = mediaTotal.add(horarioBean.getBagagens()); - mediaTotal = mediaTotal.divide(new BigDecimal(3), RoundingMode.CEILING); + mediaTotal = mediaTotal.divide(new BigDecimal(3), 2, RoundingMode.HALF_EVEN); horarioBean.setMediaReceitaViagem(mediaTotal); return horarioBean; } @@ -273,13 +277,11 @@ public class RelatorioLinhasHorario extends Relatorio { private RelatorioLinhasHorarioBean calcEquivalente(RelatorioLinhasHorarioBean horarioBean) { BigDecimal equivalente = new BigDecimal(0); try { - equivalente = horarioBean.getExtensao().divide(horarioBean.getExtensao(), RoundingMode.CEILING); - equivalente = equivalente.multiply(horarioBean.getAbsol()); - + equivalente = horarioBean.getSomaExtensaoTrecho().divide(horarioBean.getExtensao(), 2, RoundingMode.HALF_EVEN); } catch (ArithmeticException e) { - equivalente = new BigDecimal(0); + equivalente = BigDecimal.ZERO; } catch (NullPointerException nex) { - equivalente = new BigDecimal(0); + equivalente = BigDecimal.ZERO; } catch (Exception ex) { ex.printStackTrace(); } @@ -291,11 +293,11 @@ public class RelatorioLinhasHorario extends Relatorio { private RelatorioLinhasHorarioBean calcMpa(RelatorioLinhasHorarioBean horarioBean) { BigDecimal mpa = new BigDecimal(0); try { - mpa = horarioBean.getAbsol().divide(horarioBean.getTotalViagem(), RoundingMode.CEILING); + mpa = horarioBean.getAbsol().divide(horarioBean.getTotalViagem(), 2, RoundingMode.HALF_EVEN); } catch (ArithmeticException e) { - mpa = new BigDecimal(0); + mpa = BigDecimal.ZERO; } catch (NullPointerException nex) { - mpa = new BigDecimal(0); + mpa = BigDecimal.ZERO; } catch (Exception ex) { ex.printStackTrace(); } @@ -304,14 +306,13 @@ public class RelatorioLinhasHorario extends Relatorio { } private RelatorioLinhasHorarioBean calcMpe(RelatorioLinhasHorarioBean horarioBean) { - BigDecimal mpe = horarioBean.getEquivalente().divide(horarioBean.getTotalViagem(), RoundingMode.CEILING); + BigDecimal mpe = horarioBean.getEquivalente().divide(horarioBean.getTotalViagem(), 2, RoundingMode.HALF_EVEN); horarioBean.setMpe(mpe); return horarioBean; } private RelatorioLinhasHorarioBean calcRsKm(RelatorioLinhasHorarioBean horarioBean) { - BigDecimal rsKm = horarioBean.getTotal().divide(horarioBean.getTotalViagem(), RoundingMode.CEILING); - rsKm = rsKm.multiply(horarioBean.getExtensao()); + BigDecimal rsKm = horarioBean.getTotal().divide(horarioBean.getKmRodado(), 2, RoundingMode.HALF_EVEN); horarioBean.setRsKm(rsKm); return horarioBean; } @@ -319,11 +320,11 @@ public class RelatorioLinhasHorario extends Relatorio { private RelatorioLinhasHorarioBean calcEq(RelatorioLinhasHorarioBean horarioBean) { BigDecimal eq = null; try { - eq = horarioBean.getMediaReceitaViagem().divide(horarioBean.getTarifa(), RoundingMode.CEILING); + eq = horarioBean.getMediaReceitaViagem().divide(horarioBean.getTarifa(), 2, RoundingMode.HALF_EVEN); } catch (ArithmeticException e) { - eq = new BigDecimal(0); + eq = BigDecimal.ZERO; } catch (NullPointerException nex) { - eq = new BigDecimal(0); + eq = BigDecimal.ZERO; } catch (Exception ex) { ex.printStackTrace(); } @@ -332,7 +333,7 @@ public class RelatorioLinhasHorario extends Relatorio { } private RelatorioLinhasHorarioBean calcRsViagem(RelatorioLinhasHorarioBean horarioBean) { - BigDecimal RSViagem = horarioBean.getTotal().divide(horarioBean.getTotalViagem(), RoundingMode.CEILING); + BigDecimal RSViagem = horarioBean.getTotal().divide(horarioBean.getTotalViagem(), 2, RoundingMode.HALF_EVEN); horarioBean.setRsViagem(RSViagem); return horarioBean; } @@ -352,12 +353,13 @@ public class RelatorioLinhasHorario extends Relatorio { private RelatorioLinhasHorarioBean calcIap(RelatorioLinhasHorarioBean horarioBean) { BigDecimal iap = null; + BigDecimal CENTO = BigDecimal.TEN.multiply(BigDecimal.TEN); try { - iap = horarioBean.getPaxKmTransportado().divide(horarioBean.getPaxKmOfertado(), 4, RoundingMode.HALF_EVEN); + iap = (horarioBean.getPaxKmTransportado().multiply(CENTO)).divide(horarioBean.getPaxKmOfertado(), 2, RoundingMode.HALF_EVEN); } catch (ArithmeticException e) { - iap = new BigDecimal(0); + iap = BigDecimal.ZERO; } catch (NullPointerException nex) { - iap = new BigDecimal(0); + iap = BigDecimal.ZERO; } catch (Exception ex) { ex.printStackTrace(); } @@ -367,14 +369,13 @@ public class RelatorioLinhasHorario extends Relatorio { @Override protected void processaParametros() throws Exception { - this.getProcessadorParametros().processaParametros(); } private String getSql(ArrayList lsNumLinha, ArrayList lsNumServico, Empresa empresa, Integer tipoServico, GrupoRuta grupoRuta) { StringBuffer sql = new StringBuffer(); sql.append(" SELECT R.RUTA_ID, "); - sql.append(" NVL(GR.DESCGRUPO, 'NÃO POSSUI GRUPO') AS GRUPO_RUTA, "); + sql.append(" NVL(GR.DESCGRUPO, 'Não Definido') AS GRUPO_RUTA, "); sql.append(" TO_CHAR(C.FECHORSALIDA, 'HH24:MI') AS HORA, "); sql.append(" C.CORRIDA_ID AS SERVICO, "); sql.append(" R.INDSENTIDOIDA AS SENTIDO, "); @@ -384,6 +385,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" ORIGEM.CVEPARADA AS ORIGEM, "); sql.append(" DESTINO.CVEPARADA AS DESTINO, "); sql.append(" EXTENSAO, "); + sql.append(" SUM(NVL(CJ.NUMKMVIAJE, 0)) AS EXTENSAO_TRECHO, "); sql.append(" SUM(NVL(EE.IMPINGRESO, 0)) AS BAGAGENS, "); sql.append(" SUM(NVL(CJ.IMPORTESEGURO, 0)) AS SEGURO, "); sql.append(" SUM(NVL(CJ.IMPORTETAXAEMBARQUE, 0)) AS TX_EMBARQUE, "); @@ -438,7 +440,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" AND B.MOTIVOCANCELACION_ID IS NULL "); sql.append(" GROUP BY C.CORRIDA_ID) TB4, "); sql.append(" CORRIDA C "); - sql.append(" LEFT JOIN CAJA CJ "); + sql.append(" LEFT JOIN BOLETO CJ "); sql.append(" ON ( CJ.CORRIDA_ID = C.CORRIDA_ID "); sql.append(" AND CJ.FECCORRIDA = C.FECCORRIDA ) "); sql.append(" LEFT JOIN PARADA ORIGEM "); @@ -473,7 +475,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" ON ( TF.VIGENCIATARIFA_ID = VTF.VIGENCIATARIFA_ID "); sql.append(" AND C.FECCORRIDA BETWEEN VTF.FECINICIOVIGENCIA AND "); sql.append(" VTF.FECFINVIGENCIA ) "); - sql.append(" WHERE CJ.PRECIOBASE > 0 "); + sql.append(" WHERE CJ.INDSTATUSBOLETO != 'S' "); sql.append(" AND CJ.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND CJ.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); sql.append(" AND TB1.RUTA_ID = C.RUTA_ID "); @@ -524,7 +526,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" AND DA.ACTIVO = 1 "); sql.append(" AND CS.ACTIVO = 1 "); sql.append(" GROUP BY R.RUTA_ID, "); - sql.append(" NVL(GR.DESCGRUPO, 'NÃO POSSUI GRUPO'), "); + sql.append(" NVL(GR.DESCGRUPO, 'Não Definido'), "); sql.append(" TO_CHAR(C.FECHORSALIDA, 'HH24:MI'), "); sql.append(" C.CORRIDA_ID, "); sql.append(" R.INDSENTIDOIDA, "); @@ -539,7 +541,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" CD.ESTADO_ID, "); sql.append(" ORIGEM.CVEPARADA, "); sql.append(" DESTINO.CVEPARADA "); - sql.append(" ORDER BY NVL(GR.DESCGRUPO, 'NÃO POSSUI GRUPO'), "); + sql.append(" ORDER BY NVL(GR.DESCGRUPO, 'Não Definido'), "); sql.append(" C.CORRIDA_ID "); return sql.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jasper index 6eb500273471167324bbabd4f0f338e9d31670a9..48eecfdcbfc9cfcd0ff5bb9af739acc63ea1238c 100644 GIT binary patch delta 19712 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 X=So#-)cE`F!ZY3f7&WwdF{=1qrR4OU delta 19182 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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 0a9fccde6..4da189670 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml @@ -1,5 +1,5 @@ - + @@ -1232,4 +1232,13 @@ + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioLinhasHorarioBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioLinhasHorarioBean.java index dce70e848..c13ff59fb 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioLinhasHorarioBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioLinhasHorarioBean.java @@ -40,6 +40,7 @@ public class RelatorioLinhasHorarioBean { private BigDecimal pedagio; private BigDecimal ordLinha; private BigDecimal extraLinha; + private BigDecimal somaExtensaoTrecho; public RelatorioLinhasHorarioBean() { } @@ -345,4 +346,12 @@ public class RelatorioLinhasHorarioBean { public void setExtraLinha(BigDecimal extraLinha) { this.extraLinha = extraLinha; } + + public BigDecimal getSomaExtensaoTrecho() { + return somaExtensaoTrecho; + } + + public void setSomaExtensaoTrecho(BigDecimal somaExtensaoTrecho) { + this.somaExtensaoTrecho = somaExtensaoTrecho; + } }