From 251e2369f71d71e5f903072f0cd0527c2076a2d9 Mon Sep 17 00:00:00 2001 From: thiago Date: Wed, 17 Feb 2016 20:22:17 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7107=20-=20Cria=C3=A7=C3=A3o=20d?= =?UTF-8?q?e=20relat=C3=B3rio=20de=20dep=C3=B3sitos=20detalhados.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@53019 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioDepositosDetalhado.java | 138 ++++++++++-------- .../RelatorioDepositosDetalhado.jasper | Bin 33330 -> 34172 bytes .../RelatorioDepositosDetalhado.jrxml | 15 +- .../RelatorioArquivoBGMController.java | 4 +- ...elatorioDepositosDetalhadosController.java | 32 ++++ web/WEB-INF/i3-label_es_MX.label | 3 + web/WEB-INF/i3-label_pt_BR.label | 1 + .../filtroRelatorioDepositosDetalhados.zul | 6 + 8 files changed, 131 insertions(+), 68 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java index f832bfc71..d6b27f2fb 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java @@ -33,6 +33,7 @@ public class RelatorioDepositosDetalhado extends Relatorio { private Timestamp fecInicio; private Timestamp fecFinal; private Integer marcaId; + private Integer instFinanceira; public RelatorioDepositosDetalhado(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); @@ -47,6 +48,9 @@ public class RelatorioDepositosDetalhado extends Relatorio { if(parametros.get("MARCA_ID")!=null){ marcaId = Integer.valueOf(parametros.get("MARCA_ID").toString()); } + if(parametros.get("INST_FINANCEIRA")!=null){ + instFinanceira = Integer.valueOf(parametros.get("INST_FINANCEIRA").toString()); + } Connection conexao = this.relatorio.getConexao(); processarDepositosDetalhados(conexao); @@ -95,6 +99,9 @@ public class RelatorioDepositosDetalhado extends Relatorio { if(marcaId != null){ stmt.setInt("MARCA_ID", marcaId); } + if(instFinanceira != null){ + stmt.setInt("INST_FINANCEIRA", instFinanceira); + } return stmt; } @@ -118,73 +125,76 @@ public class RelatorioDepositosDetalhado extends Relatorio { StringBuilder sQuery = new StringBuilder(); sQuery.append(" SELECT "); - sQuery.append(" E.NOMBEMPRESA Empresa, "); - sQuery.append(" PV.NOMBPUNTOVENTA Ponto_de_venda, "); - sQuery.append(" TO_CHAR(FD.FECHA_DEPOSITO,'dd/MM/yyyy') data_deposito, "); - sQuery.append(" FD.NUMDEPOSITO Numero_deposito, "); - sQuery.append(" TO_CHAR(FD.FECMODIF,'dd/MM/yyyy') DATA_LANCAMENTO_DEPOSITO, "); - sQuery.append(" if.NOME Banco, "); - sQuery.append(" EC.NUMCONTA Conta, "); - sQuery.append(" EC.NUMAGENCIA Agencia, "); - sQuery.append(" FD.VALOR valor_deposito "); - sQuery.append(" FROM "); - sQuery.append(" FECHAMENTO_DEPOSITO fd "); - sQuery.append(" JOIN FECHAMENTO_CCT_DEPOSITO fcd "); - sQuery.append(" ON "); - sQuery.append(" FCD.FECHAMENTODEPOSITO_ID = FD.FECHAMENTODEPOSITO_ID "); - sQuery.append(" JOIN FECHAMENTO_CNTCORRENTE fc "); - sQuery.append(" ON "); - sQuery.append(" FCD.FECHAMENTOCNTCORRENTE_ID = FC.FECHAMENTOCNTCORRENTE_ID "); - sQuery.append(" JOIN EMPRESA e "); - sQuery.append(" ON "); - sQuery.append(" E.EMPRESA_ID = FC.EMPRESA_ID "); - sQuery.append(" JOIN PUNTO_VENTA pv "); - sQuery.append(" ON "); - sQuery.append(" PV.PUNTOVENTA_ID = FC.PUNTOVENTA_ID "); - sQuery.append(" LEFT JOIN PTOVTA_EMPRESA pve "); - sQuery.append(" ON "); - sQuery.append(" PVE.EMPRESA_ID = e.empresa_id "); - sQuery.append(" AND PVE.PUNTOVENTA_ID = PV.PUNTOVENTA_ID "); - sQuery.append(" AND PVE.activo = 1 "); - sQuery.append(" LEFT OUTER JOIN EMPRESA_CONTABANCARIA ec "); - sQuery.append(" ON "); - sQuery.append(" EC.EMPRESA_ID = PVE.EMPRESA_ID "); - sQuery.append(" AND EC.EMPRESACONTABANCARIA_ID = PVE.EMPRESACONTABANCARIA_ID "); - sQuery.append(" AND EC.ACTIVO = 1 "); - sQuery.append(" LEFT JOIN INSTI_FINANCEIRA IF "); - sQuery.append(" ON "); - sQuery.append(" if.INSTIFINANCEIRA_ID = EC.INSTIFINANCEIRA_ID "); - sQuery.append(" WHERE "); - sQuery.append(" FD.ACTIVO = 1 "); - sQuery.append(" AND FCD.ACTIVO = 1 "); - sQuery.append(" AND FC.ACTIVO = 1 "); - sQuery.append(" AND E.ACTIVO = 1 "); - sQuery.append(" AND PV.ACTIVO = 1 "); + sQuery.append(" E.NOMBEMPRESA Empresa, "); + sQuery.append(" PV.NOMBPUNTOVENTA Ponto_de_venda, "); + sQuery.append(" TO_CHAR(FD.FECHA_DEPOSITO,'dd/MM/yyyy') data_deposito, "); + sQuery.append(" FD.NUMDEPOSITO Numero_deposito, "); + sQuery.append(" TO_CHAR(FD.FECMODIF,'dd/MM/yyyy') DATA_LANCAMENTO_DEPOSITO, "); + sQuery.append(" if.NOME Banco, "); + sQuery.append(" EC.NUMCONTA Conta, "); + sQuery.append(" EC.NUMAGENCIA Agencia, "); + sQuery.append(" FD.VALOR valor_deposito "); + sQuery.append(" FROM "); + sQuery.append(" FECHAMENTO_DEPOSITO fd "); + sQuery.append(" JOIN FECHAMENTO_CCT_DEPOSITO fcd "); + sQuery.append(" ON "); + sQuery.append(" FCD.FECHAMENTODEPOSITO_ID = FD.FECHAMENTODEPOSITO_ID "); + sQuery.append(" JOIN FECHAMENTO_CNTCORRENTE fc "); + sQuery.append(" ON "); + sQuery.append(" FCD.FECHAMENTOCNTCORRENTE_ID = FC.FECHAMENTOCNTCORRENTE_ID "); + sQuery.append(" JOIN EMPRESA e "); + sQuery.append(" ON "); + sQuery.append(" E.EMPRESA_ID = FC.EMPRESA_ID "); + sQuery.append(" JOIN PUNTO_VENTA pv "); + sQuery.append(" ON "); + sQuery.append(" PV.PUNTOVENTA_ID = FC.PUNTOVENTA_ID "); + sQuery.append(" JOIN INSTI_FINANCEIRA IF "); + sQuery.append(" ON "); + sQuery.append(" if.INSTIFINANCEIRA_ID = FD.INSTIFINANCEIRA_ID "); + sQuery.append(" JOIN EMPRESA_CONTABANCARIA ec "); + sQuery.append(" ON "); + sQuery.append(" EC.EMPRESA_ID = FC.EMPRESA_ID "); + sQuery.append(" AND EC.INSTIFINANCEIRA_ID = if.INSTIFINANCEIRA_ID "); + sQuery.append(" AND EC.ACTIVO = 1 "); + sQuery.append(" JOIN PTOVTA_EMPRESA pve "); + sQuery.append(" ON "); + sQuery.append(" PVE.EMPRESA_ID = e.empresa_id "); + sQuery.append(" AND PVE.PUNTOVENTA_ID = PV.PUNTOVENTA_ID "); + sQuery.append(" and EC.EMPRESACONTABANCARIA_ID = PVE.EMPRESACONTABANCARIA_ID "); + sQuery.append(" AND PVE.activo = 1 "); + sQuery.append(" WHERE "); + sQuery.append(" FD.ACTIVO = 1 "); + sQuery.append(" AND FCD.ACTIVO = 1 "); + sQuery.append(" AND FC.ACTIVO = 1 "); + sQuery.append(" AND E.ACTIVO = 1 "); + sQuery.append(" AND PV.ACTIVO = 1 "); if(parametros.get("MARCA_ID")!= null){ - sQuery.append(" and e.empresa_id =:MARCA_ID "); + sQuery.append(" and e.empresa_id =:MARCA_ID "); + } + if(parametros.get("INST_FINANCEIRA")!= null){ + sQuery.append(" and if.INSTIFINANCEIRA_ID =:INST_FINANCEIRA "); } sQuery.append(" and FD.FECMODIF between :fecInicio and :fecFinal"); - sQuery.append(" GROUP BY "); - sQuery.append(" E.NOMBEMPRESA, "); - sQuery.append(" PV.NOMBPUNTOVENTA, "); - sQuery.append(" FD.FECHA_DEPOSITO, "); - sQuery.append(" FD.NUMDEPOSITO, "); - sQuery.append(" FD.FECMODIF, "); - sQuery.append(" if.NOME, "); - sQuery.append(" EC.NUMCONTA, "); - sQuery.append(" EC.NUMAGENCIA, "); - sQuery.append(" FD.VALOR "); - sQuery.append(" ORDER BY "); - sQuery.append(" E.NOMBEMPRESA, "); - sQuery.append(" FD.FECHA_DEPOSITO, "); - sQuery.append(" FD.FECMODIF, "); - sQuery.append(" PV.NOMBPUNTOVENTA, "); - sQuery.append(" FD.NUMDEPOSITO, "); - sQuery.append(" if.NOME, "); - sQuery.append(" EC.NUMCONTA, "); - sQuery.append(" EC.NUMAGENCIA, "); - sQuery.append(" FD.VALOR "); - + sQuery.append(" GROUP BY "); + sQuery.append(" E.NOMBEMPRESA, "); + sQuery.append(" PV.NOMBPUNTOVENTA, "); + sQuery.append(" FD.FECHA_DEPOSITO, "); + sQuery.append(" FD.NUMDEPOSITO, "); + sQuery.append(" FD.FECMODIF, "); + sQuery.append(" if.NOME, "); + sQuery.append(" EC.NUMCONTA, "); + sQuery.append(" EC.NUMAGENCIA, "); + sQuery.append(" FD.VALOR "); + sQuery.append(" ORDER BY "); + sQuery.append(" FD.FECHA_DEPOSITO, "); + sQuery.append(" FD.FECMODIF, "); + sQuery.append(" E.NOMBEMPRESA, "); + sQuery.append(" PV.NOMBPUNTOVENTA, "); + sQuery.append(" FD.NUMDEPOSITO, "); + sQuery.append(" if.NOME, "); + sQuery.append(" EC.NUMCONTA, "); + sQuery.append(" EC.NUMAGENCIA, "); + sQuery.append(" FD.VALOR "); return sQuery.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jasper index c262af989d15b77e2d401f03c7ada20e0374bae7..d6ca013f69330befd0193cb05748bc8ba6d82cce 100644 GIT binary patch delta 8728 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 K5-Ve`8u(AT0+o3H delta 8273 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 HZVUP!TW}ZX diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jrxml index 770e73cc6..8c40c9706 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jrxml @@ -1,12 +1,13 @@ - + + @@ -26,7 +27,7 @@ - <band height="61" splitType="Stretch"> + <band height="82" splitType="Stretch"> <textField> <reportElement uuid="43b2c28d-4760-4890-b00d-25e931e79c74" x="0" y="0" width="620" height="20"/> <textElement markup="none"> @@ -58,6 +59,16 @@ <textElement/> <text><![CDATA[Empresa:]]></text> </staticText> + <textField> + <reportElement uuid="a0d7c1c5-7a17-477e-929a-b0d9665b409c" x="53" y="61" width="263" height="20"/> + <textElement/> + <textFieldExpression><![CDATA[$P{banco}]]></textFieldExpression> + </textField> + <staticText> + <reportElement uuid="2a1c0967-7154-4aa5-bc93-577d682a1e5a" x="0" y="61" width="53" height="20"/> + <textElement/> + <text><![CDATA[Banco:]]></text> + </staticText> </band> diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioArquivoBGMController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioArquivoBGMController.java index fd097c542..32b93d562 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioArquivoBGMController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioArquivoBGMController.java @@ -29,7 +29,6 @@ import com.rjconsultores.integracaoreceitadespesa.dao.Totalbus; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEmpresa; -import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @@ -124,7 +123,8 @@ public class RelatorioArquivoBGMController extends MyGenericForwardComposer { origem.close(); saida.close(); } catch(IOException e) { - throw new IOException(e.getMessage()); + log.error(e.getMessage()); + throw new IOException(e.getMessage()); } } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDepositosDetalhadosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDepositosDetalhadosController.java index 07c483cc2..99c55db5a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDepositosDetalhadosController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDepositosDetalhadosController.java @@ -23,9 +23,11 @@ import org.zkoss.zul.Datebox; import org.zkoss.zul.Messagebox; import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.InstiFinanceira; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioDepositosDetalhado; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.service.InstiFinanceiraService; import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @@ -46,8 +48,13 @@ private static final long serialVersionUID = 1L; @Autowired private EmpresaService empresaService; + @Autowired + private InstiFinanceiraService ptovtaBancoService; + private MyComboboxEstandar cmbEmpresa; private List lsEmpresa; + private MyComboboxEstandar cmbBanco; + private List lsBanco; private Datebox dataInicial; private Datebox dataFinal; @@ -55,6 +62,7 @@ private static final long serialVersionUID = 1L; @Override public void doAfterCompose(Component comp) throws Exception { setLsEmpresa(empresaService.obtenerTodos()); + setLsBanco(ptovtaBancoService.obtenerTodos()); super.doAfterCompose(comp); } @@ -63,6 +71,7 @@ private static final long serialVersionUID = 1L; Date dataDe = dataInicial.getValue(); Date dataAte = dataFinal.getValue(); + Timestamp fecVentaInicial = new Timestamp(DateUtil.inicioFecha(dataDe).getTime()); Timestamp fecVentaFinal = new Timestamp(DateUtil.fimFecha(dataAte).getTime()); @@ -82,6 +91,7 @@ private static final long serialVersionUID = 1L; parametros.put("dataFiltroFinal", fecVentaFinal); Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); + if (itemEmpresa != null) { Empresa empresa = (Empresa) itemEmpresa.getValue(); parametros.put("MARCA_ID", empresa.getEmpresaId()); @@ -89,6 +99,14 @@ private static final long serialVersionUID = 1L; } else{ parametros.put("empresa", "Todas;"); } + Comboitem itemBanco = cmbBanco.getSelectedItem(); + if (itemBanco != null) { + InstiFinanceira banco = (InstiFinanceira) itemBanco.getValue(); + parametros.put("INST_FINANCEIRA", banco.getInstFinanceiraId()); + parametros.put("banco", banco.getNome()); + } else{ + parametros.put("banco", "Todos;"); + } Relatorio relatorio = new RelatorioDepositosDetalhado(parametros, dataSourceRead.getConnection()); @@ -113,4 +131,18 @@ private static final long serialVersionUID = 1L; this.lsEmpresa = lsEmpresa; } + /** + * @return the lsBanco + */ + public List getLsBanco() { + return lsBanco; + } + + /** + * @param lsBanco the lsBanco to set + */ + public void setLsBanco(List lsBanco) { + this.lsBanco = lsBanco; + } + } diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 45aa9e8a1..e45ebfd02 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -5931,6 +5931,9 @@ relatorioVendasComissaoController.lbEmpresa.value = Empresa relatorioDepositosDetalhadosController.lbDataIni.value = Fecha Inicio relatorioDepositosDetalhadosController.lbDataFin.value = Fecha Final relatorioDepositosDetalhadosController.lbEmpresa.value = Empresa +relatorioDepositosDetalhadosController.lbBanco.value = Banco +relatorioDepositosDetalhadosController.window.title=Depositos Detallados +relatorioDepositosDetalhadosController.MSG.busquedaPeriodo = Fecha de inicio retrasado hasta la fecha final. # Calculo Comissao busquedaCalculoComissaoController.window.title = Cálculo de Comisión diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index c4e21048b..2f9ea5238 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -6074,6 +6074,7 @@ relatorioVendasComissaoController.lbEmpresa.value = Empresa relatorioDepositosDetalhadosController.lbDataIni.value = Data Início relatorioDepositosDetalhadosController.lbDataFin.value = Data Final relatorioDepositosDetalhadosController.lbEmpresa.value = Empresa +relatorioDepositosDetalhadosController.lbBanco.value = Banco relatorioDepositosDetalhadosController.window.title=Depósitos Detalhados relatorioDepositosDetalhadosController.MSG.busquedaPeriodo = Data de início posterior a data Final. diff --git a/web/gui/relatorios/filtroRelatorioDepositosDetalhados.zul b/web/gui/relatorios/filtroRelatorioDepositosDetalhados.zul index 78b537546..37127d060 100644 --- a/web/gui/relatorios/filtroRelatorioDepositosDetalhados.zul +++ b/web/gui/relatorios/filtroRelatorioDepositosDetalhados.zul @@ -37,6 +37,12 @@ model="@{winFiltroRelatorioDepositosDetalhados$composer.lsEmpresa}" width="95%" /> + +