fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Quando gerava o relatorio com alias, ele gerava duas colunas ambiguas :' (#31) from AL-1983 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/31
Reviewed-by: Lucas Taiã <lucas@rjconsultores.com.br>
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master 1.0.25
wallace 2022-12-29 18:18:47 +00:00
parent cd1a21fb9f 1429923bac
commit 069496301d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<properties> <properties>
<ventaboletosadm.version>1.0.24</ventaboletosadm.version> <ventaboletosadm.version>1.0.25</ventaboletosadm.version>
<modelWeb.version>1.0.18</modelWeb.version> <modelWeb.version>1.0.18</modelWeb.version>
<flyway.version>1.0.8</flyway.version> <flyway.version>1.0.8</flyway.version>
</properties> </properties>

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java
View File

@ -212,11 +212,13 @@ public class RelatorioBPe extends Relatorio {
if(alias != null && alias.equals("S")) {// ALIAS Origem/Destino dos bilhetes if(alias != null && alias.equals("S")) {// ALIAS Origem/Destino dos bilhetes
sql.append(" COALESCE(oriA.DESCPARADA, ori.DESCPARADA) as origem, "); sql.append(" COALESCE(oriA.DESCPARADA, ori.DESCPARADA) as origem, ");
sql.append(" COALESCE(destA.DESCPARADA, dest.DESCPARADA) as destino,"); 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(" locpv.DESCPARADA as locpuntoventa, ");
sql.append(" pv.NUMPUNTOVENTA as numPuntoVenta, "); 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, "); sql.append(" TO_CHAR(bol.FECHORVIAJE,'dd/mm/yyyy HH24:MI') as dtviagem, ");