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

Merge pull request 'fixes bug#AL-4410' (!556) from AL-4410 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/556
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master 1.87.1
Célio de Souza Ribeiro JR 2024-06-20 17:49:42 +00:00
parent f2e9fb1af9 4ce3f1f45d
commit d892aebe60
2 changed files with 7 additions and 7 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.87.0</version> <version>1.87.1</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

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

@ -49,19 +49,19 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio {
java.sql.Date dataInicial = new java.sql.Date(DateUtil.normalizarToFecha((Date) parametros.get("DATA_INICIAL")).getTime()); java.sql.Date dataInicial = new java.sql.Date(DateUtil.normalizarToFecha((Date) parametros.get("DATA_INICIAL")).getTime());
java.sql.Date dataFinal = new java.sql.Date(DateUtil.normalizarToFecha((Date) parametros.get("DATA_FINAL")).getTime()); java.sql.Date dataFinal = new java.sql.Date(DateUtil.normalizarToFecha((Date) parametros.get("DATA_FINAL")).getTime());
stmt.setDate(":DATA_INICIAL", dataInicial); stmt.setDate("DATA_INICIAL", dataInicial);
stmt.setDate(":DATA_FINAL", dataFinal); stmt.setDate("DATA_FINAL", dataFinal);
if (empresaID != null) if (empresaID != null)
stmt.setInt(":EMPRESA_ID", empresaID); stmt.setInt("EMPRESA_ID", empresaID);
if (origemID != null) if (origemID != null)
stmt.setInt(":ORIGEN_ID", origemID); stmt.setInt("ORIGEN_ID", origemID);
if (destinoID != null) if (destinoID != null)
stmt.setInt(":ORIGEN_ID", destinoID); stmt.setInt("ORIGEN_ID", destinoID);
int paramIndex = 0; int paramIndex = 0;
for (Integer id : puntosVentaIdsList) { for (Integer id : puntosVentaIdsList) {
stmt.setInt(":PUNTO_VENTA_"+paramIndex, id); stmt.setInt("PUNTO_VENTA_"+paramIndex, id);
paramIndex++; paramIndex++;
} }