Novo layout relatorio forma pagamento feat bug #AL-3565' (!388) from AL-3565 into master
Reviewed-on: adm/VentaBoletosAdm#388 Reviewed-by: aristides <aristides@rjconsultores.com.br>master 1.49.1
commit
df9e51550d
4
pom.xml
4
pom.xml
|
@ -4,11 +4,11 @@
|
||||||
<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.49.0</version>
|
<version>1.49.1</version>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<modelWeb.version>1.36.3</modelWeb.version>
|
<modelWeb.version>1.37.0</modelWeb.version>
|
||||||
<flyway.version>1.28.0</flyway.version>
|
<flyway.version>1.28.0</flyway.version>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
|
|
|
@ -10,6 +10,7 @@ import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
|
import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
|
||||||
|
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
|
||||||
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
|
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
|
||||||
|
|
||||||
public class RelatorioFormaPagamentoAgenciaNovo extends RelatorioDemandas {
|
public class RelatorioFormaPagamentoAgenciaNovo extends RelatorioDemandas {
|
||||||
|
@ -73,8 +74,8 @@ public class RelatorioFormaPagamentoAgenciaNovo extends RelatorioDemandas {
|
||||||
|
|
||||||
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString());
|
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString());
|
||||||
|
|
||||||
stmt.setDate("dataInicial", new java.sql.Date(dataInicial.getTime()));
|
stmt.setDate("dataInicial", DateUtil.inicioFechaSql(dataInicial));
|
||||||
stmt.setDate("dataFinal", new java.sql.Date(dataFinal.getTime()));
|
stmt.setDate("dataFinal", DateUtil.fimFechaSql(dataFinal));
|
||||||
|
|
||||||
if (empresa != null) {
|
if (empresa != null) {
|
||||||
stmt.setInt("empresaId", empresa);
|
stmt.setInt("empresaId", empresa);
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue