From 80bc714e87ab717aff7b6621f6c1dd4f4a229864 Mon Sep 17 00:00:00 2001 From: "wallace.henrique" Date: Thu, 29 Dec 2022 11:20:40 -0300 Subject: [PATCH 1/2] =?UTF-8?q?Quando=20gerava=20o=20relatorio=20com=20ali?= =?UTF-8?q?as,=20ele=20gerava=20duas=20colunas=20ambiguas=20:=20origem=20e?= =?UTF-8?q?=20destino.=20Ent=C3=A3o=20foi=20criado=20uma=20condi=C3=A7?= =?UTF-8?q?=C3=A3o,=20para=20um=20ou=20outro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../ventaboletos/relatorios/impl/RelatorioBPe.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 37a07862c..b37aded49 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.23 + 1.0.24 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java index 339481632..cb23ad08b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java @@ -212,11 +212,13 @@ public class RelatorioBPe extends Relatorio { if(alias != null && alias.equals("S")) {// ALIAS Origem/Destino dos bilhetes sql.append(" COALESCE(oriA.DESCPARADA, ori.DESCPARADA) as origem, "); sql.append(" COALESCE(destA.DESCPARADA, dest.DESCPARADA) as destino,"); + }else { + sql.append(" ori.DESCPARADA as origem, "); + sql.append(" dest.DESCPARADA as destino,"); } sql.append(" locpv.DESCPARADA as locpuntoventa, "); sql.append(" pv.NUMPUNTOVENTA as numPuntoVenta, "); - sql.append(" ori.DESCPARADA as origem, "); - sql.append(" dest.DESCPARADA as destino,"); + sql.append(" TO_CHAR(bol.FECHORVIAJE,'dd/mm/yyyy HH24:MI') as dtviagem, "); @@ -238,7 +240,7 @@ public class RelatorioBPe extends Relatorio { sql.append(" case "); sql.append(" when bpe.tiposubstituicao is null and bpeSub.bpe_id is null and bpe.indcontingencia = 0 then 'Autorizado' "); sql.append(" when bpe.tiposubstituicao is null and bpeSub.bpe_id is null and bpe.indcontingencia = 1 then 'Aut.Conting.' "); - sql.append(" when bpe.tiposubstituicao is not null then 'Autorizado/Substituição' "); + sql.append(" when bpe.tiposubstituicao is not null then 'Autorizado/Substituicâo' "); sql.append(" when bpeSub.bpe_id is not null then 'Autorizado/Substituído' "); sql.append(" else 'Autorizado' "); sql.append(" end "); From 1429923bac0f74e3126a95d9743c44349a78ca74 Mon Sep 17 00:00:00 2001 From: "wallace.henrique" Date: Thu, 29 Dec 2022 12:14:32 -0300 Subject: [PATCH 2/2] =?UTF-8?q?AL-1983=20Corrigindo=20a=20acentua=C3=A7?= =?UTF-8?q?=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ventaboletos/relatorios/impl/RelatorioBPe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java index cb23ad08b..c732414f9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java @@ -240,7 +240,7 @@ public class RelatorioBPe extends Relatorio { sql.append(" case "); sql.append(" when bpe.tiposubstituicao is null and bpeSub.bpe_id is null and bpe.indcontingencia = 0 then 'Autorizado' "); sql.append(" when bpe.tiposubstituicao is null and bpeSub.bpe_id is null and bpe.indcontingencia = 1 then 'Aut.Conting.' "); - sql.append(" when bpe.tiposubstituicao is not null then 'Autorizado/Substituicâo' "); + sql.append(" when bpe.tiposubstituicao is not null then 'Autorizado/Substituição' "); sql.append(" when bpeSub.bpe_id is not null then 'Autorizado/Substituído' "); sql.append(" else 'Autorizado' "); sql.append(" end ");