From e00f49115aad469a6ca8e941987757944509de7a Mon Sep 17 00:00:00 2001 From: frederico Date: Wed, 31 Oct 2018 20:21:04 +0000 Subject: [PATCH] fixed bug#12319 qua:Wallysson dev:Thiago git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@86672 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioHistoricoClientes.java | 7 +- ...toricoClientesSemAgrupamento_es.properties | 2 + ...icoClientesSemAgrupamento_pt_BR.properties | 2 + ...orioHistoricoClientesSemAgrupamento.jasper | Bin 45034 -> 47408 bytes ...torioHistoricoClientesSemAgrupamento.jrxml | 148 +++++++++++------- 5 files changed, 99 insertions(+), 60 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoClientes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoClientes.java index 15a42fd6b..4c002bf76 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoClientes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoClientes.java @@ -39,9 +39,10 @@ public class RelatorioHistoricoClientes extends Relatorio { dataResult.put("cpfCliente", rset.getString("cpfCliente")); dataResult.put("emailCliente", rset.getString("emailCliente")); dataResult.put("telCliente", rset.getString("telCliente")); - + dataResult.put("celular", rset.getString("celular")); dataResult.put("sigla", rset.getString("sigla")); dataResult.put("bilhete", rset.getString("bilhete")); + dataResult.put("codAgencia", rset.getString("codAgencia")); dataResult.put("agencia", rset.getString("agencia")); dataResult.put("linha", rset.getString("linha")); dataResult.put("origem", rset.getString("origem")); @@ -96,6 +97,7 @@ public class RelatorioHistoricoClientes extends Relatorio { sql.append("OR (caja.TIPOVENTA_ID NOT IN (12,18,49,5))) "); sql.append("THEN 'NO' ELSE 'IP' END as sigla,"); sql.append("caja.NUMFOLIOSISTEMA AS bilhete, "); + sql.append("puntoVenta.NUMPUNTOVENTA AS codAgencia, "); sql.append("puntoVenta.NOMBPUNTOVENTA AS agencia, "); sql.append("ruta.DESCRUTA AS linha, "); sql.append("origem.DESCPARADA AS origem, "); @@ -109,7 +111,8 @@ public class RelatorioHistoricoClientes extends Relatorio { sql.append("cliente.NOMBCLIENTE AS nomeCliente, "); sql.append("cliente.NUMIDENTIFICAUNO AS cpfCliente, "); sql.append("cliente.DESCCORREO AS emailCliente, "); - sql.append("cliente.NUMTELEFONO AS telCliente, "); + sql.append("cliente.NUMTELEFONO AS telCliente, "); + sql.append("cliente.NUMTELEFONODOS AS celular, "); sql.append("caja.IMPORTEOUTROS + caja.IMPORTEPEDAGIO + caja.IMPORTESEGURO + caja.IMPORTETAXAEMBARQUE AS taxas, "); sql.append("(SELECT LISTAGG(formaPago.CVEPAGO, ',') WITHIN GROUP (ORDER BY formaPago.CVEPAGO) "); sql.append("FROM CAJA caja2 "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_es.properties index 537f25b1a..2604b323c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_es.properties @@ -15,8 +15,10 @@ label.nomeCliente=Nome label.cpfCliente=CPF label.emailCliente=Email label.telCliente=Tel +label.celular=Celular label.sigla=Tipo label.bilhete=Bilhete +label.codAgencia= Cod. Agência label.agencia=Agência label.linha=Linha label.origem=Origem diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_pt_BR.properties index 537f25b1a..2604b323c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_pt_BR.properties @@ -15,8 +15,10 @@ label.nomeCliente=Nome label.cpfCliente=CPF label.emailCliente=Email label.telCliente=Tel +label.celular=Celular label.sigla=Tipo label.bilhete=Bilhete +label.codAgencia= Cod. Agência label.agencia=Agência label.linha=Linha label.origem=Origem diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jasper index b24e0a00b5e40a5a057db9106d50fa8034625d22..bd2f7b360fd767fa053398e7a0e79656d88b0e70 100644 GIT binary patch literal 47408 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 literal 45034 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 kjlKcsXwGMtcVhH1nAd*fcf&{KObXaBme*a diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jrxml index ae1a9d13d..a23ccbdcf 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jrxml @@ -1,6 +1,6 @@ - + @@ -30,6 +30,8 @@ + + <band height="79" splitType="Stretch"> <textField pattern="" isBlankWhenNull="false"> @@ -96,255 +98,271 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -358,26 +376,40 @@ $F{cpfCliente}.substring(0,3) + $F{cpfCliente}.substring(9,11)]]> - + - + - + + + + + + + + + + + + + + +