From 9bc1bb1057a671308273fe39e9360f810bab82d0 Mon Sep 17 00:00:00 2001 From: Gleimar Botelho Baleeiro Date: Thu, 9 May 2024 12:49:53 -0300 Subject: [PATCH 1/2] =?UTF-8?q?Mudan=C3=A7a=20no=20filtro=20para=20passar?= =?UTF-8?q?=20a=20considerar=20apenas=20a=20situa=C3=A7=C3=A3o=20de=20agru?= =?UTF-8?q?pamento=20de=20corridas.=20Antes=20olhava=20s=C3=B3=20a=20difer?= =?UTF-8?q?en=C3=A7a=20de=20datas,=20o=20que=20se=20mostrou=20errado.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ventaboletos/dao/hibernate/BpeHibernateDAO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java index ecdf3447e..444e66910 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java @@ -1100,7 +1100,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO { sql.append(" inner join marca m on m.marca_id = bori.marca_id and m.activo = 1 "); sql.append(" inner join empresa e on e.empresa_id = m.empresa_id "); sql.append(" inner join bpe bpe on bpe.boleto_id = bori.boleto_id "); - sql.append(" and (case when bori.motivocancelacion_id = 17 and bori.boletooriginal_id is null then 0 else 1 end) "); + sql.append(" and bpe.activo(case when bori.motivocancelacion_id = 17 and bori.boletooriginal_id is null then 0 else 1 end) "); sql.append(" inner join estado est_bpe on bpe.uf = est_bpe.codibge "); sql.append(" left join boleto b on b.boleto_id = coalesce(bori.boletoanterior_id, bori.boletooriginal_id) "); sql.append(" left join bpe bpeori on b.boleto_id = bpeori.boleto_id and bpeori.activo = 1 "); From d62d53df7eb70294be79a82a71521b6154fbc322 Mon Sep 17 00:00:00 2001 From: Gleimar Botelho Baleeiro Date: Thu, 9 May 2024 12:50:10 -0300 Subject: [PATCH 2/2] =?UTF-8?q?Mudan=C3=A7a=20no=20filtro=20para=20passar?= =?UTF-8?q?=20a=20considerar=20apenas=20a=20situa=C3=A7=C3=A3o=20de=20agru?= =?UTF-8?q?pamento=20de=20corridas.=20Antes=20olhava=20s=C3=B3=20a=20difer?= =?UTF-8?q?en=C3=A7a=20de=20datas,=20o=20que=20se=20mostrou=20errado.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b92b41c26..dd16378b4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.53.0 + 1.54.0 @@ -219,4 +219,4 @@ - \ No newline at end of file +