From 9ea53d5d55553de2adeb1dd29512aef2e5aee471 Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Thu, 26 Sep 2024 17:50:18 -0300 Subject: [PATCH] fixes bug#AL-4653 --- pom.xml | 2 +- .../impl/RelatorioBilhetesCancelados.java | 11 ++++------- .../RelatorioBilhetesCancelados.jasper | Bin 57940 -> 58086 bytes .../RelatorioBilhetesCancelados.jrxml | 11 ++++++----- ...RelatorioBilhetesCanceladosController.java | 3 ++- .../filtroRelatorioBilhetesCancelados.zul | 2 +- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 4767fc988..2bfbc6a28 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.145.6 + 1.145.7 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesCancelados.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesCancelados.java index 3ae36c480..b1172d084 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesCancelados.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesCancelados.java @@ -39,6 +39,7 @@ public class RelatorioBilhetesCancelados extends Relatorio { Map parametros = this.relatorio.getParametros(); StringBuilder sql = new StringBuilder(); sql.append(" select "); + sql.append(" mc.descmotivo, "); sql.append(" u.CVEUSUARIO CVEBILHETEIRO, "); sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, "); sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, "); @@ -87,10 +88,8 @@ public class RelatorioBilhetesCancelados extends Relatorio { sql.append(" left join ciudad co ON co.ciudad_id = p_origen.ciudad_id "); sql.append(" left join estado est ON est.estado_id = co.estado_id "); sql.append(" LEFT JOIN boleto utilizado ON (utilizado.boleto_id = b.transacaooriginal_id AND b.INDSTATUSBOLETO = 'E') "); - - sql.append(" WHERE "); - sql.append(" (b.indreimpresion = 0 OR b.INDSTATUSBOLETO = 'E') "); - sql.append(" and m.EMPRESA_ID = :EMPRESA_ID "); + sql.append(" LEFT JOIN motivo_cancelacion mc ON mc.motivocancelacion_id = b.motivocancelacion_id "); + sql.append(" WHERE m.EMPRESA_ID = :EMPRESA_ID "); if (parametros.get(DATA_INICIAL) != null && parametros.get(DATA_FINAL) != null) { if (parametros.get(TIPO_DATA) != null) { if ((parametros.get(TIPO_DATA).toString().equals(DATA_VENDA))) { @@ -178,9 +177,7 @@ public class RelatorioBilhetesCancelados extends Relatorio { dataResult.put("SENTIDO", rset.getInt("SENTIDO")); dataResult.put("COD_LINHA", rset.getString("COD_LINHA")); dataResult.put("DESC_LINHA", rset.getString("DESC_LINHA")); - if (rset.getString("STATUS_PASSAGEM") != null) { - dataResult.put("STATUS_PASSAGEM", IndStatusBoleto.valueOf(rset.getString("STATUS_PASSAGEM")).getValue()); - } + dataResult.put("DESCMOTIVO", rset.getString("DESCMOTIVO")); dataResult.put("TARIFA", rset.getString("TARIFA")); dataResult.put("TX_EMBARQUE", rset.getString("TX_EMBARQUE")); dataResult.put("PEDAGIO", rset.getString("PEDAGIO")); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesCancelados.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesCancelados.jasper index 383d2bedec7779540747f526e83b17b7b929c859..ef5501e24c00680ab3587b2e0d05b5726e5539af 100644 GIT binary patch delta 14023 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 nKcO0Uj`nwSnq3L8A^%}PCG;vSs!W - - + + @@ -68,6 +68,7 @@ + @@ -330,7 +331,7 @@ - + @@ -584,11 +585,11 @@ - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesCanceladosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesCanceladosController.java index e89476db9..928f665c4 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesCanceladosController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesCanceladosController.java @@ -41,6 +41,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject; import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioVendasBilheteiro; +import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioVendasBilheteiroSelecionados; @Controller("relatorioBilhetesCanceladosController") @Scope("prototype") @@ -86,7 +87,7 @@ public class RelatorioBilhetesCanceladosController extends MyGenericForwardCompo lsTiposCancelamento = motivoCancelacionService.obtenerTodosEspecificos(escolhidos); motivosCancelacionList.setData(lsTiposCancelamento); puntoVentaList.setItemRenderer(new RenderRelatorioVendasBilheteiro()); - + puntoVentaSelList.setItemRenderer(new RenderRelatorioVendasBilheteiroSelecionados()); } public List getLsEmpresa() { diff --git a/web/gui/relatorios/filtroRelatorioBilhetesCancelados.zul b/web/gui/relatorios/filtroRelatorioBilhetesCancelados.zul index 5b3da9370..9405749db 100644 --- a/web/gui/relatorios/filtroRelatorioBilhetesCancelados.zul +++ b/web/gui/relatorios/filtroRelatorioBilhetesCancelados.zul @@ -73,7 +73,7 @@ -