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

Merge pull request 'fixes bug#AL-4681' (!678) from AL-4681 into master 

Reviewed-on: adm/VentaBoletosAdm#678
Reviewed-by: aristides <aristides@rjconsultores.com.br>
master 1.129.1
aristides 2024-08-24 17:53:01 +00:00
parent 793c8347ed 2cffcc6ebf
commit 2a7408768d
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.129.0</version> <version>1.129.1</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

14
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java
View File

@ -32,7 +32,13 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio {
Map<String, Object> parametros = this.relatorio.getParametros(); Map<String, Object> parametros = this.relatorio.getParametros();
String puntosVentaIds = (String) parametros.get("NUMPUNTOVENTA"); String puntosVentaIds = (String) parametros.get("NUMPUNTOVENTA");
List<Integer> puntosVentaIdsList = new ArrayList<>(); List<Integer> puntosVentaIdsList = new ArrayList<>();
boolean isTodasAgencias = false;
for (String id : puntosVentaIds.split(",")) { for (String id : puntosVentaIds.split(",")) {
if("-1".equals(id)) {
isTodasAgencias = true;
break;
}
puntosVentaIdsList.add(Integer.parseInt(id)); puntosVentaIdsList.add(Integer.parseInt(id));
} }
lsDadosRelatorio = new ArrayList<RelatorioW2IBean>(); lsDadosRelatorio = new ArrayList<RelatorioW2IBean>();
@ -40,7 +46,7 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio {
Integer origemID = (Integer) parametros.get("ORIGEN_ID"); Integer origemID = (Integer) parametros.get("ORIGEN_ID");
Integer destinoID = (Integer) parametros.get("DESTINO_ID"); Integer destinoID = (Integer) parametros.get("DESTINO_ID");
String sql = getSql(puntosVentaIdsList.size(), empresaID, origemID, destinoID); String sql = getSql(isTodasAgencias ? 0 : puntosVentaIdsList.size(), empresaID, origemID, destinoID);
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
@ -60,11 +66,12 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio {
stmt.setInt("ORIGEN_ID", destinoID); stmt.setInt("ORIGEN_ID", destinoID);
int paramIndex = 0; int paramIndex = 0;
if(!isTodasAgencias) {
for (Integer id : puntosVentaIdsList) { for (Integer id : puntosVentaIdsList) {
stmt.setInt("PUNTO_VENTA_"+paramIndex, id); stmt.setInt("PUNTO_VENTA_"+paramIndex, id);
paramIndex++; paramIndex++;
} }
}
rset = stmt.executeQuery(); rset = stmt.executeQuery();
@ -136,7 +143,7 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio {
sql.append("AND po.parada_id = :ORIGEN_ID "); sql.append("AND po.parada_id = :ORIGEN_ID ");
if(destinoID != null) if(destinoID != null)
sql.append("AND pd.parada_id = :DESTINO_ID "); sql.append("AND pd.parada_id = :DESTINO_ID ");
if(numPuntosVentaIds > 0)
gerarBindPuntoVenta(numPuntosVentaIds, sql); gerarBindPuntoVenta(numPuntosVentaIds, sql);
sql.append(" UNION "); sql.append(" UNION ");
@ -171,6 +178,7 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio {
if(destinoID != null) if(destinoID != null)
sql.append("AND pd.parada_id = :DESTINO_ID "); sql.append("AND pd.parada_id = :DESTINO_ID ");
if(numPuntosVentaIds > 0)
gerarBindPuntoVenta(numPuntosVentaIds, sql); gerarBindPuntoVenta(numPuntosVentaIds, sql);
sql.append("ORDER BY dataVenda ASC "); sql.append("ORDER BY dataVenda ASC ");