From 7ffa6bcc43f32c09fde1e600750fb1da784cfe32 Mon Sep 17 00:00:00 2001 From: valdevir Date: Mon, 29 Nov 2021 19:25:30 +0000 Subject: [PATCH] fixes bug#23717 qua: dev:Valdir git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@109785 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioCheckin.java | 15 ++++++++++-- .../RelatorioCheckinController.java | 7 +++++- web/WEB-INF/i3-label_en.label | 3 +++ web/WEB-INF/i3-label_es_MX.label | 3 +++ web/WEB-INF/i3-label_pt_BR.label | 3 +++ web/gui/relatorios/filtroRelatorioCheckin.zul | 23 ++++++++++++++++++- 6 files changed, 50 insertions(+), 4 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java index a003f5064..e220e0527 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java @@ -34,6 +34,9 @@ public class RelatorioCheckin extends Relatorio { Date fecFinal = (Date) getParametros().get("DATA_FINAL"); fecInicio = DateUtil.inicioFecha(fecInicio); fecFinal = DateUtil.fimFecha(fecFinal); + Boolean isCheckinEncerrado = (Boolean) getParametros().get("IS_CHECKIN_ENCERRADO"); + Boolean isCheckinAberto = (Boolean) getParametros().get("IS_CHECKIN_ABERTO"); + if (StringUtils.isNotBlank(idsBilheteiros)) { String []ls = idsBilheteiros.split(","); @@ -43,7 +46,7 @@ public class RelatorioCheckin extends Relatorio { } } - String sql = getSql(corridaId, origenId, idsBilheteiros); + String sql = getSql(corridaId, origenId, idsBilheteiros, isCheckinEncerrado, isCheckinAberto); PreparedStatement pstmt = getConexao().prepareStatement(sql); @@ -92,7 +95,7 @@ public class RelatorioCheckin extends Relatorio { this.setCollectionDataSource(new JRBeanCollectionDataSource(checkins)); } - private String getSql(Integer corridaId, Integer origenId, String idsBilheteiros) { + private String getSql(Integer corridaId, Integer origenId, String idsBilheteiros, Boolean indCheckinEncerrado, Boolean indCheckinAberto) { StringBuffer sql = new StringBuffer(); sql.append("select b.boleto_id, o.descparada, b.corrida_id, "); @@ -108,6 +111,14 @@ public class RelatorioCheckin extends Relatorio { sql.append(corridaId == null ? "" : " and b.corrida_id = ? "); sql.append(origenId == null ? "" : " and b.origen_id = ? "); sql.append((lsInt == null || lsInt.size() == 0) ? "" : " and u.USUARIO_ID in ( "+ createIn(lsInt.size()) + ") "); + if(indCheckinEncerrado) { + sql.append("and bc.INDCHECKINCERRADO = 1"); + }else { + if(indCheckinAberto) { + sql.append("and bc.INDCHECKINCERRADO = 0"); + } + } + sql.append(" order by bc.datacancelado desc"); return sql.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCheckinController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCheckinController.java index bde14ec10..6cce9952a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCheckinController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCheckinController.java @@ -16,6 +16,7 @@ import org.zkoss.zhtml.Messagebox; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Bandbox; +import org.zkoss.zul.Checkbox; import org.zkoss.zul.Comboitem; import org.zkoss.zul.ComboitemRenderer; import org.zkoss.zul.Datebox; @@ -52,9 +53,11 @@ public class RelatorioCheckinController extends MyGenericForwardComposer { private transient PagedListWrapper plwUsuario; private MyListbox usuarioList; private MyListbox usuarioSelList; - private MyComboboxParada cmbParadaOrigem; private MyComboboxParadaCve cmbParadaOrigemCve; + private Checkbox chcEncerrado; + private Checkbox chcAberto; + @Autowired private DataSource dataSourceRead; @@ -133,6 +136,8 @@ public class RelatorioCheckinController extends MyGenericForwardComposer { parametros.put("DATA_FINAL", datFinal.getValue()); parametros.put("ORIGEN_ID", origenId); parametros.put("ORIGEN", origen); + parametros.put("IS_CHECKIN_ENCERRADO", chcEncerrado.isChecked()); + parametros.put("IS_CHECKIN_ABERTO", chcAberto.isChecked()); parametros.put("NOME_RELATORIO", Labels.getLabel("indexController.mniRelatorioCheckin.label")); String usuariosIds = ""; diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label index 3f1d5fa4d..305c2d92a 100644 --- a/web/WEB-INF/i3-label_en.label +++ b/web/WEB-INF/i3-label_en.label @@ -7124,6 +7124,9 @@ relatorioCheckinController.btnPesquisa.label=Buscar relatorioCheckinController.btnLimpar.label=Limpar relatorioCheckinController.usuarioCVE.label=CVE relatorioCheckinController.usuarioNome.label=Nome +relatorioCheckinController.lblTipoCheckin.value = Tipo Checkin +relatorioCheckinController.chcCheckinAberto.value = Somente Aberto +relatorioCheckinController.chcCheckinEncerrado.value = Somente Encerrado # Editar Conexion #busquedaConexionController.btnNovo.tooltiptext=Novo diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 065591fd6..b5b927de6 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -7101,6 +7101,9 @@ relatorioCheckinController.btnPesquisa.label = Buscar relatorioCheckinController.btnLimpar.label = Limpiar relatorioCheckinController.usuarioCVE.label = CVE relatorioCheckinController.usuarioNome.label = Nombre +relatorioCheckinController.lblTipoCheckin.value = Tipo Checkin +relatorioCheckinController.chcCheckinAberto.value = Somente Aberto +relatorioCheckinController.chcCheckinEncerrado.value = Somente Encerrado # Editar Conexion #busquedaConexionController.btnNovo.tooltiptext = Nuevo diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index f6375facd..b9f68ac74 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -7614,6 +7614,9 @@ relatorioCheckinController.btnPesquisa.label = Buscar relatorioCheckinController.btnLimpar.label = Limpar relatorioCheckinController.usuarioCVE.label = CVE relatorioCheckinController.usuarioNome.label = Nome +relatorioCheckinController.lblTipoCheckin.value = Tipo Checkin +relatorioCheckinController.chcCheckinAberto.value = Somente Aberto +relatorioCheckinController.chcCheckinEncerrado.value = Somente Encerrado # Editar Conexion #busquedaConexionController.btnNovo.tooltiptext = Novo diff --git a/web/gui/relatorios/filtroRelatorioCheckin.zul b/web/gui/relatorios/filtroRelatorioCheckin.zul index 3e4ea29dc..9592c35b7 100644 --- a/web/gui/relatorios/filtroRelatorioCheckin.zul +++ b/web/gui/relatorios/filtroRelatorioCheckin.zul @@ -57,7 +57,28 @@ + + + +