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

Merge pull request 'fixes bug#AL-2771' (!239) from AL-2771 into master 

Reviewed-on: adm/VentaBoletosAdm#239
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
master 1.11.3
Gleison da Cruz 2023-08-02 19:22:29 +00:00
parent 6b26645216 e21fb4ddc7
commit 12aa083bae
3 changed files with 7 additions and 4 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.11.2</version> <version>1.11.3</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

4
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java
View File

@ -114,7 +114,7 @@ public class RelatorioBilhetesVendidos extends Relatorio {
} }
if (parametros.get("STATUS").toString().contains("C")) { if (parametros.get("STATUS").toString().contains("C")||parametros.get("STATUS").toString().contains("V")) {
if (parametros.get("IDAVOLTA").equals("1")) { if (parametros.get("IDAVOLTA").equals("1")) {
sql.append(" UNION ALL "); sql.append(" UNION ALL ");
} }
@ -226,7 +226,7 @@ public class RelatorioBilhetesVendidos extends Relatorio {
stmt.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime())); stmt.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime()));
} }
; ResultSet rset = stmt.executeQuery(); ResultSet rset = stmt.executeQuery();
while (rset.next()) { while (rset.next()) {

5
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java
View File

@ -214,8 +214,11 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
if (status.length() > 0) { if (status.length() > 0) {
status = status.substring(0, status.length() - 1); status = status.substring(0, status.length() - 1);
} else { } else {
status += "'" + IndStatusBoleto.V + "'"; if (!chkIdaVolta.isChecked()) //caso não tenha selecionado nada traz vendidos
status += "'" + IndStatusBoleto.V + "'";
} }
parametros.put("STATUS", status); parametros.put("STATUS", status);
filtro.append(" Empresa: "); filtro.append(" Empresa: ");