From 94659ca43cd0f3470d8056fdb21a3342d9bf39ab Mon Sep 17 00:00:00 2001 From: "lucas.calixto" Date: Fri, 28 Apr 2017 19:25:02 +0000 Subject: [PATCH] fixes bug#8940 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@68382 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioGratuidade.java | 21 +++++- .../RelatorioGratuidade_es.properties | 3 + .../RelatorioGratuidade_pt_BR.properties | 3 +- .../templates/RelatorioGratuidade.jasper | Bin 44869 -> 47199 bytes .../templates/RelatorioGratuidade.jrxml | 67 +++++++++++++----- .../utilitarios/RelatorioGratuidadeBean.java | 28 ++++++++ 6 files changed, 99 insertions(+), 23 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java index 220510eff..e881b9ffa 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java @@ -15,6 +15,9 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioGratuidade extends Relatorio { + + private Integer orgaoConcedenteId; + private String orgaoConcedenteDesc; private List lsDadosRelatorio; @@ -37,6 +40,8 @@ public class RelatorioGratuidade extends Relatorio { String origem = parametros.get("origem") != null ? parametros.get("origem").toString() : ""; String destino = parametros.get("destino") != null ? parametros.get("destino").toString() : ""; String categoria = parametros.get("categoria") != null ? parametros.get("categoria").toString() : ""; + orgaoConcedenteId = parametros.get("orgao_concedente_id") != null ? (Integer) parametros.get("orgao_concedente_id") : null; + orgaoConcedenteDesc = parametros.get("orgao_concedente_desc") != null ? parametros.get("orgao_concedente_desc").toString() : null; String sql = getSql(empresa, agencia, ruta, fecInicio, fecFinal, origem, destino, categoria); @@ -64,6 +69,9 @@ public class RelatorioGratuidade extends Relatorio { if(categoria != null && !categoria.equals("")){ stmt.setInt("categoria_id", Integer.parseInt(categoria)); } + if(orgaoConcedenteId != null){ + stmt.setInt("orgao_concedente_id", orgaoConcedenteId); + } ResultSet rset = null; @@ -90,6 +98,10 @@ public class RelatorioGratuidade extends Relatorio { gratuidadeBean.setPreciopagado(rset.getBigDecimal("preciopagado")); gratuidadeBean.setNombempresa(rset.getString("nombempresa")); gratuidadeBean.setCvecategoria(rset.getString("cvecategoria")); + gratuidadeBean.setNumasiento(rset.getString("numasiento")); + gratuidadeBean.setDescorigen(rset.getString("descorigen")); + gratuidadeBean.setDescdestino(rset.getString("descdestino")); + gratuidadeBean.setNumfoliosistema(rset.getString("numfoliosistema")); lsDadosRelatorio.add(gratuidadeBean); } @@ -111,8 +123,8 @@ public class RelatorioGratuidade extends Relatorio { private String getSql(String empresa, String agencia, String ruta, String fecInicio, String fecFinal, String origem, String destino, String categoria) { StringBuffer sql = new StringBuffer(); - sql.append("SELECT b.feccorrida, ori.cveparada origen, des.cveparada destino, "); - sql.append("b.numkmviaje, r.descruta, b.corrida_id, b.fechorviaje, "); + sql.append("SELECT b.feccorrida, ori.cveparada origen, des.cveparada destino, ori.descparada descorigen, des.descparada descdestino, "); + sql.append("b.numkmviaje, r.descruta, b.corrida_id, b.fechorviaje, b.numasiento, b.numfoliosistema, "); sql.append("tv.desctipoventa, b.nombpasajero, b.descnumdoc, tar.preciooriginal, "); sql.append("b.porccategoria, b.preciopagado, u.cveusuario, ag.nombpuntoventa, e.nombempresa, cat.cvecategoria "); sql.append("FROM boleto b "); @@ -153,7 +165,10 @@ public class RelatorioGratuidade extends Relatorio { if(!categoria.isEmpty()){ sql.append(" AND c.categoria_id = :categoria_id "); } + if(orgaoConcedenteId != null){ + sql.append(" AND r.orgaoconcedente_id = :orgao_concedente_id "); + } return sql.toString(); } -} +} \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties index 900c89969..e3df91728 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties @@ -35,3 +35,6 @@ detail.total=Total Quantidade: linhas=Líneas +detail.numfoliosistema=N.Bil +detail.numasiento=Pol + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties index edb0e7d61..4ae484a77 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties @@ -35,4 +35,5 @@ detail.total=Total Quantidade: linhas=Linhas - +detail.numfoliosistema=N.Bil +detail.numasiento=Pol diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper index 68a726a5ebe566c336ba815fd3e9f026e3198c95..ac807f567779710b854403c99e169085b849a892 100644 GIT binary patch delta 15385 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 p^Oa - + @@ -32,6 +32,11 @@ + + + + + @@ -88,34 +93,34 @@ - + - + - + - + - - + + - + @@ -133,17 +138,27 @@ - + - + + + + + + + + + + + @@ -235,35 +250,35 @@ - + - + - + - + - + @@ -288,29 +303,43 @@ - + - + - + - + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java index 501652b0c..87bfdfe0b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java @@ -6,7 +6,9 @@ import java.util.Date; public class RelatorioGratuidadeBean { private Date feccorrida; private String origen; + private String descorigen; private String destino; + private String descdestino; private Integer km; private String linha; private String corridaId; @@ -21,6 +23,8 @@ public class RelatorioGratuidadeBean { private String nombpuntoventa; private String nombempresa; private String cvecategoria; + private String numasiento; + private String numfoliosistema; public Date getFeccorrida() { return feccorrida; @@ -123,6 +127,30 @@ public class RelatorioGratuidadeBean { } public void setCvecategoria(String cvecategoria) { this.cvecategoria = cvecategoria; + } + public String getNumasiento() { + return numasiento; + } + public void setNumasiento(String numasiento) { + this.numasiento = numasiento; + } + public String getDescorigen() { + return descorigen; + } + public void setDescorigen(String descorigen) { + this.descorigen = descorigen; + } + public String getDescdestino() { + return descdestino; + } + public void setDescdestino(String descdestino) { + this.descdestino = descdestino; + } + public String getNumfoliosistema() { + return numfoliosistema; + } + public void setNumfoliosistema(String numfoliosistema) { + this.numfoliosistema = numfoliosistema; } }