From b6a3efd234cdb077fdfb931eea61583d1abb08a5 Mon Sep 17 00:00:00 2001 From: "guilherme.lopes" Date: Thu, 27 Feb 2020 17:43:23 +0000 Subject: [PATCH] =?UTF-8?q?fixes=20bug#18267=20qua:=20Juliane=20dev:=20Wal?= =?UTF-8?q?lace=20Ajuste=20na=20consulta=20SQL=20e=20no=20retorno=20para?= =?UTF-8?q?=20gera=C3=A7=C3=A3o=20do=20arquivo?= 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/Model/trunk/modelWeb@100361 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/dao/hibernate/BpeHibernateDAO.java | 10 ++++++++-- .../utilerias/exportacao/ExportacaoBpe.java | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java index 746d7fcd0..8cfaeab5a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java @@ -270,7 +270,10 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO { sql.append(" bpe.nprot, "); sql.append(" coalesce(c.numserie_bpe, '1') as numserie_bpe, "); sql.append(" c.categoria_id, "); - sql.append(" e.codestabelecimento as cod_estabelecimento, "); + /** + * Mantis 18267 + */ + sql.append(" ei.codestabelecimento as cod_estabelecimento, "); sql.append(" ep.crtbpe as crt, "); sql.append(" ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) as valortributado, "); sql.append(" ei.porcredbaseicms as red_base_calc_estadual, "); @@ -377,7 +380,10 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO { sql.append(" bpe.nprot, "); sql.append(" coalesce(c.numserie_bpe, '1') as numserie_bpe, "); sql.append(" c.categoria_id, "); - sql.append(" e.codestabelecimento as cod_estabelecimento, "); + /** + * Mantis 18267 + */ + sql.append(" ei.codestabelecimento as cod_estabelecimento, "); sql.append(" ep.crtbpe as crt, "); sql.append(" ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) as valortributado, "); sql.append(" ei.porcredbaseicms as red_base_calc_estadual, "); diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java b/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java index a4f5489aa..89bf0ab90 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java @@ -101,7 +101,10 @@ public class ExportacaoBpe { private void adicionarRegistroBPETipoBEP(final StringBuilder sb, ExportacaoBPETipoBPE tipoBPE, boolean isVersao131) { String tipoRegistro = "BPE"; - String estabelecimento = tipoBPE.getEstabelecimento(); + /** + * Mantis 18267 + */ + String estabelecimento = StringUtils.isBlank(tipoBPE.getEstabelecimento()) ? VAZIO : tipoBPE.getEstabelecimento(); String chaveEletrônica = tipoBPE.getChaveEletronica(); String serie = tipoBPE.getSerie(); String numero = tipoBPE.getNumero();