From a1045b94c309d2d189fcb2a64ce3dc6861bbeab9 Mon Sep 17 00:00:00 2001 From: fabio Date: Tue, 21 May 2019 18:15:16 +0000 Subject: [PATCH] fixes bug#13826 dev: Lucas Silverio qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@93527 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioOperacionalFinanceiro.java | 18 +- ...latorioOperacionalFinanceiro_es.properties | 2 + ...orioOperacionalFinanceiro_pt_BR.properties | 3 + .../RelatorioOperacionalFinanceiro.jasper | Bin 40710 -> 59293 bytes .../RelatorioOperacionalFinanceiro.jrxml | 319 ++++++++++++++++-- .../RelatorioOperacionalFinanceiroBean.java | 6 +- 6 files changed, 307 insertions(+), 41 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java index a9d79b142..915b2811d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java @@ -76,7 +76,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { bean.setDescTramo( rset.getString("descTramo")); bean.setOutros( rset.getBigDecimal("outros")); bean.setPedagio( rset.getBigDecimal("pedagio")); - bean.setQtde( rset.getString("qtde")); + bean.setQtde( rset.getInt("qtde")); bean.setSeguro( rset.getBigDecimal("seguro")); bean.setSentido( rset.getString("sentido")); bean.setTarifa( rset.getBigDecimal("tarifa")); @@ -118,9 +118,9 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { StringBuilder sql = new StringBuilder(); - sql.append(" SELECT "); + sql.append(" SELECT "); sql.append(" tramoId, "); - sql.append(" DESCTRAMO, "); + sql.append(" origem || ' x ' || destino as DESCTRAMO, "); sql.append(" DESCRUTA, "); sql.append(" count(caja_id) as qtde, "); sql.append(" SUM(tarifa) as tarifa, "); @@ -134,7 +134,8 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { sql.append(" SELECT "); sql.append(" "); sql.append(" t.TRAMO_ID as tramoId, "); - sql.append(" t.DESCTRAMO, "); + sql.append(" ORI.DESCPARADA as origem, "); + sql.append(" DES.DESCPARADA as destino, "); sql.append(" r.DESCRUTA, "); sql.append(" c.TIPOVENTA_ID as tipoVenda, "); sql.append(" c.caja_id, "); @@ -205,6 +206,8 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { sql.append(" LEFT JOIN CORRIDA cor ON c.CORRIDA_ID = cor.CORRIDA_ID and cor.FECCORRIDA = c.FECCORRIDA and cor.ACTIVO = 1 "); sql.append(" LEFT JOIN CORRIDA_TRAMO ct ON ct.CORRIDA_ID = cor.CORRIDA_ID and ct.FECCORRIDA = cor.FECCORRIDA and ct.ACTIVO = 1 "); sql.append(" LEFT JOIN TRAMO t ON t.TRAMO_ID = ct.TRAMO_ID and t.ACTIVO = 1 "); + sql.append(" LEFT JOIN parada ORI ON ORI.parada_id = t.origen_id "); + sql.append(" LEFT JOIN parada DES ON DES.parada_id = t.destino_id "); sql.append(" where c.ACTIVO = 1 "); sql.append(" AND c.FECHORVENTA BETWEEN :fecInicioVenda AND :fecFinalVenda "); @@ -222,12 +225,13 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { sql.append(" ) dados "); sql.append(" GROUP BY "); - sql.append(" tramoId, "); - sql.append(" DESCTRAMO, "); + sql.append(" tramoId, "); + sql.append(" origem, "); + sql.append(" destino, "); sql.append(" DESCRUTA, "); sql.append(" sentido, "); sql.append(" tipo "); - sql.append(" ORDER BY DESCRUTA, DESCTRAMO, tipo "); + sql.append(" ORDER BY DESCRUTA, origem, destino, tipo "); return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOperacionalFinanceiro_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOperacionalFinanceiro_es.properties index 754367492..7658d923d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOperacionalFinanceiro_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOperacionalFinanceiro_es.properties @@ -15,6 +15,8 @@ header.empresa=Empresa\: header.periodo.viagem=Período Viagem\: header.periodo.venda=Período Venda\: header.tipopassagem=Tipo Passagem\: +header.filtro.total.trecho=Total Trecho: +header.filtro.total.linha=Total Linha: #Labels detail diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOperacionalFinanceiro_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOperacionalFinanceiro_pt_BR.properties index 739b1d663..cf54298d9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOperacionalFinanceiro_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOperacionalFinanceiro_pt_BR.properties @@ -15,6 +15,8 @@ header.empresa=Empresa\: header.periodo.viagem=Período Viagem\: header.periodo.venda=Período Venda\: header.tipopassagem=Tipo Passagem\: +header.filtro.total.trecho=Total Trecho: +header.filtro.total.linha=Total Linha: #Labels detail @@ -27,4 +29,5 @@ detail.pedagio=Ped detail.seguro=Seguro detail.taxaembarque=Taxa Embarque detail.outros=Outros +detail.valortotal=Valor Total detail.valortotal=Valor Total \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper index d00f52740eb6fabf244d68adf0757668414ca81e..2db9800eceecb1c652f50748879557822ade9bc9 100644 GIT binary patch literal 59293 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 MS>H*lIo0`p0b(Unj{pDw diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml index fe06a36cd..d460a970d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml @@ -1,8 +1,8 @@ - - - + + + @@ -17,7 +17,7 @@ - + @@ -25,13 +25,86 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -63,6 +136,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -95,7 +260,7 @@ - + @@ -107,7 +272,7 @@ - + @@ -119,7 +284,7 @@ - + @@ -131,7 +296,7 @@ - + @@ -143,7 +308,7 @@ - + @@ -155,7 +320,7 @@ - + @@ -167,7 +332,7 @@ - + @@ -179,7 +344,7 @@ - + @@ -192,6 +357,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -266,8 +523,8 @@ - - + + @@ -277,8 +534,8 @@ - - + + @@ -289,7 +546,7 @@ - + @@ -299,8 +556,8 @@ - - + + @@ -310,8 +567,8 @@ - - + + @@ -321,8 +578,8 @@ - - + + @@ -332,8 +589,8 @@ - - + + @@ -343,8 +600,8 @@ - - + + @@ -352,14 +609,14 @@ - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioOperacionalFinanceiroBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioOperacionalFinanceiroBean.java index cddb92c86..232f13fdc 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioOperacionalFinanceiroBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioOperacionalFinanceiroBean.java @@ -7,7 +7,7 @@ public class RelatorioOperacionalFinanceiroBean { private String tramoID; private String descTramo; private String descRuta; - private String qtde; + private Integer qtde; private BigDecimal tarifa; private BigDecimal taxaembarque; private BigDecimal pedagio; @@ -40,11 +40,11 @@ public class RelatorioOperacionalFinanceiroBean { this.descRuta = descRuta; } - public String getQtde() { + public Integer getQtde() { return qtde; } - public void setQtde(String qtde) { + public void setQtde(Integer qtde) { this.qtde = qtde; }