diff --git a/pom.xml b/pom.xml index 4a69f1e43..4c31b92c1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 1.0.24 + 1.0.25 1.0.18 1.0.8 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java index 339481632..c732414f9 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, ");