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

Merge pull request 'fixes bug#AL-2760' (!222) from AL-2760 into master 

Reviewed-on: adm/VentaBoletosAdm#222
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>
master 1.9.2
Gleison da Cruz 2023-07-14 15:06:43 +00:00
parent 3b2e91a770 294d9ff5b0
commit 52d3aef706
2 changed files with 11 additions and 9 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>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.9.1</version>
<version>1.9.2</version>
<packaging>war</packaging>
<properties>

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

@ -546,12 +546,13 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
sql.append(" INNER JOIN CIUDAD CD ON CD.CIUDAD_ID = PR.CIUDAD_ID ");
sql.append(" INNER JOIN ESTADO ES ON ES.ESTADO_ID = CD.ESTADO_ID ");
sql.append(" INNER JOIN TIPO_PTOVTA TP ON TP.TIPOPTOVTA_ID = PV.TIPOPTOVTA_ID");
sql.append(" WHERE PC.EMPRESA_ID = :EMPRESA_ID ");
sql.append(" WHERE PC.ACTIVO = 1 ");
sql.append(" AND PC.PUNTOVENTA_ID = :PUNTOVENTA_ID ");
sql.append(" AND PC.ACTIVO = 1 ");
if (empresaId > 0)
sql.append(" AND PC.EMPRESA_ID = :EMPRESA_ID ");
NamedParameterStatement stmt = new NamedParameterStatement(this.getConexao(), sql.toString());
stmt.setInt("PUNTOVENTA_ID", puntoVentaId);
if (empresaId > 0)
stmt.setInt("EMPRESA_ID", empresaId);
ResultSet rs = stmt.executeQuery();
@ -599,11 +600,12 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
sqlParam.append(" SELECT EM.NOMBEMPRESA, PV.NOMBPUNTOVENTA, PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA ");
sqlParam.append(" FROM EMPRESA EM, ");
sqlParam.append(" PUNTO_VENTA PV ");
sqlParam.append(" WHERE EM.EMPRESA_ID = :EMPRESA_ID ");
sqlParam.append(" AND PV.PUNTOVENTA_ID = :PUNTOVENTA_ID ");
sqlParam.append(" WHERE PV.PUNTOVENTA_ID = :PUNTOVENTA_ID ");
if (empresaId > 0)
sqlParam.append(" AND EM.EMPRESA_ID = :EMPRESA_ID ");
NamedParameterStatement stmtParam = new NamedParameterStatement(this.getConexao(), sqlParam.toString());
stmtParam.setInt("PUNTOVENTA_ID", puntoVentaId);
if (empresaId > 0)
stmtParam.setInt("EMPRESA_ID", empresaId);
ResultSet rsParam = stmtParam.executeQuery();