From 80e9776a7067a33800e6e81bc5c7d55c5fabf8f7 Mon Sep 17 00:00:00 2001 From: wilian Date: Mon, 14 Aug 2017 18:06:01 +0000 Subject: [PATCH] fixes bug #9223 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@72603 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioOCDNaoResgatadaEmpresa.java | 48 ++- ...atorioOCDNaoResgatadaEmpresa_es.properties | 4 +- ...rioOCDNaoResgatadaEmpresa_pt_BR.properties | 20 +- .../RelatorioOCDNaoResgatadaEmpresa.jasper | Bin 44031 -> 42865 bytes .../RelatorioOCDNaoResgatadaEmpresa.jrxml | 386 +++++++++--------- web/WEB-INF/i3-label_pt_BR.label | 6 +- 6 files changed, 228 insertions(+), 236 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java index 5a2fea49c..32e07eb2a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java @@ -2,19 +2,21 @@ package com.rjconsultores.ventaboletos.relatorios.impl; import java.sql.Connection; import java.sql.ResultSet; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; import java.util.Map; -import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; +import org.apache.commons.lang.StringUtils; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.IndOrdenacion; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioOCDBean; +import com.rjconsultores.ventaboletos.utilerias.OcdUtil; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio { private List lsDadosRelatorio; @@ -30,25 +32,34 @@ public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio { Map parametros = this.relatorio.getParametros(); - String fecInicio = parametros.get("fecInicio").toString() + " 00:00:00"; - String fecFinal = parametros.get("fecFinal").toString() + " 23:59:59"; - String numOperacao = parametros.get("numOperacao").toString(); + String fecInicio = parametros.get("fecInicio").toString() + " 00:00"; + String fecFinal = parametros.get("fecFinal").toString() + " 23:59"; + String localizador = parametros.get("numOperacao").toString(); + String numoperacion = null; + Long ocdId = null; + if(OcdUtil.validarLocalizadorOcd(localizador)) { + numoperacion = OcdUtil.getNumOcdByLocalizadorOcd(localizador); + ocdId = OcdUtil.getOcdIdByLocalizadorOcd(localizador); + } + Integer empresaId = parametros.get("empresa") != null ? Integer.parseInt(parametros.get("empresa").toString()) : null; boolean statusPendente = (Boolean) parametros.get("statusPendente"); boolean statusPago = (Boolean) parametros.get("statusPago"); IndOrdenacion ordenacion = (IndOrdenacion) parametros.get("ordenacion"); - String sql = getSql(fecInicio, fecFinal, empresaId, statusPendente, statusPago ,ordenacion, numOperacao); + String sql = getSql(fecInicio, fecFinal, empresaId, statusPendente, statusPago ,ordenacion, numoperacion, ocdId); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); ResultSet rset = null; - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss"); - stmt.setTimestamp("fecInicio", new java.sql.Timestamp(sdf.parse(fecInicio).getTime())); - stmt.setTimestamp("fecFinal", new java.sql.Timestamp(sdf.parse(fecFinal).getTime())); + stmt.setString("fecInicio", fecInicio); + stmt.setString("fecFinal", fecFinal); if (empresaId != null) { stmt.setInt("empresaId", empresaId); } + if(ocdId != null){ + stmt.setLong("ocdId", ocdId); + } rset = stmt.executeQuery(); @@ -73,7 +84,6 @@ public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio { ocdBean.setEmpresa(rset.getString("nombempresa")); ocdBean.setNombpuntoventa(rset.getString("nombpuntoventa") != null ? rset.getString("nombpuntoventa") : ""); ocdBean.setNombpuntoventapago(rset.getString("nombpuntoventapago") != null ? rset.getString("nombpuntoventapago") : ""); - ocdBean.setNombusuario(rset.getString("nombusuario") != null ? rset.getString("nombusuario") : ""); ocdBean.setNombusuarioinc(rset.getString("nombusuarioinc") != null ? rset.getString("nombusuarioinc") : ""); ocdBean.setNombusuariopago(rset.getString("nombusuariopago") != null ? rset.getString("nombusuariopago") : ""); ocdBean.setNumoperacion(rset.getString("numoperacion")); @@ -83,6 +93,8 @@ public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio { ocdBean.setOrigem(rset.getString("origem")); ocdBean.setDestino(rset.getString("destino")); ocdBean.setFeccorrida(rset.getTimestamp("feccorrida")); + ocdBean.setOcdId(rset.getLong("ocd_id")); + ocdBean.setNumoperacion(OcdUtil.generaLocalizadorOCD(ocdBean.getNumoperacion(), ocdBean.getOcdId())); lsDadosRelatorio.add(ocdBean); } @@ -105,20 +117,19 @@ public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio { } private String getSql(String fecInicio, String fecFinal, Integer empresaId, - boolean statusPendente, boolean statusPago, IndOrdenacion ordenacion, String numOperacao) { + boolean statusPendente, boolean statusPago, IndOrdenacion ordenacion, String numoperacion, Long ocdId) { StringBuffer sql = new StringBuffer(); sql.append("select nombempresa, o.*, ui.nombusuario nombusuarioinc, "); - sql.append("up.nombusuario nombusuariopago, u.nombusuario nombusuario, "); + sql.append("up.nombusuario nombusuariopago, "); sql.append("p.nombpuntoventa nombpuntoventa, pp.nombpuntoventa nombpuntoventapago, "); - sql.append(" f.cvepago formaPago, b.NUMASIENTO asiento, pd.CIUDAD_ID destino, po.CIUDAD_ID origem, c.FECHORSALIDA feccorrida "); + sql.append(" f.cvepago formaPago, b.NUMASIENTO asiento, pd.cveparada destino, po.cveparada origem, c.FECHORSALIDA feccorrida "); sql.append("from ocd o "); sql.append("join boleto b on b.boleto_id = o.boleto_id "); sql.append("join boleto_formapago bfp on b.boleto_id = bfp.boleto_id "); sql.append("join forma_pago f on f.formapago_id = bfp.formapago_id "); sql.append("join marca m on m.marca_id = b.marca_id "); sql.append("join empresa e on m.empresa_id = e.empresa_id "); - sql.append("join usuario u on u.usuario_id = o.usuario_id "); sql.append("join corrida c on c.CORRIDA_ID = b.CORRIDA_ID and c.FECCORRIDA = b.FECCORRIDA "); sql.append("join usuario ui on ui.usuario_id = o.usuarioinc_id "); sql.append("join parada po on b.origen_id = po.parada_id "); @@ -126,7 +137,7 @@ public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio { sql.append("left join usuario up on up.usuario_id = o.usuariopago_id "); sql.append("join punto_venta p on p.puntoventa_id = o.puntoventa_id "); sql.append("left join punto_venta pp on pp.puntoventa_id = o.puntoventapago_id "); - sql.append("where o.fecpagar between :fecInicio and :fecFinal "); + sql.append("where o.fecpagar between to_date(:fecInicio,'dd/mm/yyyy hh24:mi') and to_date(:fecFinal,'dd/mm/yyyy hh24:mi') "); sql.append(" and o.activo = 1 "); sql.append(statusPendente ? " and o.fecpago is null " : ""); sql.append(statusPendente ? " and o.indpago = 0 " : ""); @@ -136,8 +147,11 @@ public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio { if (empresaId != null) { sql.append(" and e.empresa_id = :empresaId "); } - if(!numOperacao.equals("")){ - sql.append(" and o.numoperacion like '%"+numOperacao+"%' "); + if(StringUtils.isNotBlank(numoperacion)){ + sql.append(" and o.numoperacion like '%"+numoperacion+"%' "); + } + if(ocdId != null){ + sql.append(" and o.ocd_id = :ocdId "); } sql.append(" order by "); switch (ordenacion) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_es.properties index 0a65238bf..9068ec4ca 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_es.properties @@ -16,14 +16,14 @@ header.filtro.grupo=Grupo de l detail.boletoId=Boleto detail.nombpuntoventa=Punto Venta detail.numoperacion=Num. Operacion -detail.fecpagar=Fecha Pago +detail.fecpago=Fecha Pago +detail.fecpagar=Fecha P/ Pago detail.valorPagar=Valor Pagar detail.penalizacion=Penalizacion detail.nombusuarioinc=Usuário Inc. detail.fecinc=Fecha Inc. detail.nombempresa=Empresa -detail.nombusuario=Usuário detail.nombusuariopago=Usuário Pagar detail.nombpuntoventapago=Punto Venta Pagar diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_pt_BR.properties index 75e9e0797..d776a9fac 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOCDNaoResgatadaEmpresa_pt_BR.properties @@ -15,17 +15,17 @@ header.filtro.grupo=Grupo de Linhas\: detail.boletoId=Boleto detail.nombpuntoventa=Ponto de Venda -detail.numoperacion=Num. Operação -detail.fecpagar=Data Pag. +detail.numoperacion=Localizador +detail.fecpago=Data Pagamento +detail.fecpagar=Data P/ Pagamento detail.valorPagar=Vr. Pagar detail.penalizacion=Penalização -detail.nombusuarioinc=Usuário Inc. +detail.nombusuarioinc=Usuário Geração -detail.fecinc=Data Inc. +detail.fecinc=Data Geração detail.nombempresa=Empresa -detail.nombusuario=Usuário -detail.nombusuariopago=Usuário Pag. -detail.nombpuntoventapago=Ponto Venda Pag. +detail.nombusuariopago=Usuário Pagamento +detail.nombpuntoventapago=Agência Pagamento detail.formaPago1=FP1 detail.formaPago2=FP2 @@ -33,8 +33,6 @@ detail.formaPago3=FP3 detail.origem=Origem detail.destino=Destino detail.feccorrida=Data Viagem -detail.asiento=Asiento - -linhas=Linhas - +detail.asiento=Assento +linhas=Linhas \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOCDNaoResgatadaEmpresa.jasper index d557a25970e2afea84ad1fac19ba1d5b8c35857b..8adfe0161fba6c1cbdeba13b2832a3526041306c 100644 GIT binary patch literal 42865 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 literal 44031 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 - + - + @@ -30,160 +30,157 @@ + - - - - + + + + - - - - - - - - - + + - + - - + + - - - - - - - - + - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - + - - + + - - - - - - - - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -192,21 +189,16 @@ - - - - - - - + + - + @@ -214,143 +206,131 @@ - - - - - - - - - - + + + + + - - + + - + - - + + - - - - - - - - + - - - - - - - - - + + - - - - - - - - + - - + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index d5456dfaa..9b99b591b 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -476,12 +476,12 @@ relatorioOCDController.indStatusOCD.value=Status OCD relatorioOCDController.radPendente.value=Pendentes relatorioOCDController.radPagos.value=Pagos relatorioOCDController.radTodos.value=Todos -relatorioOCDController.lbNumOperacao.value=Num. Operação +relatorioOCDController.lbNumOperacao.value=Localizador relatorioOCDController.indOrdenacao.value=Ordenação relatorioOCDController.radBoleto.value=Bilhete -relatorioOCDController.radNumOperacao.value=Num.Operação -relatorioOCDController.radFecInclusao.value=Data Inclusão +relatorioOCDController.radNumOperacao.value=Localizador +relatorioOCDController.radFecInclusao.value=Data Geração relatorioOCDController.radFecPagamento.value=Data Pagamento #Relatorio Linhas Horario