From 6ab00d1f9ab780a3926f19a4989ee28524991918 Mon Sep 17 00:00:00 2001 From: thiago Date: Tue, 6 Oct 2015 13:46:38 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#6699=20-=20Inclus=C3=A3o=20de=20?= =?UTF-8?q?filtro=20empresas=20em=20relat=C3=B3rio=20de=20vendas=20por=20c?= =?UTF-8?q?omiss=C3=A3o.?= 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@48677 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendasComissao.java | 14 +++- .../templates/RelatorioVendasComissao.jasper | Bin 35760 -> 36561 bytes .../templates/RelatorioVendasComissao.jrxml | 77 +++++++++++------- .../RelatorioVendasComissaoController.java | 36 ++++++++ web/WEB-INF/i3-label_es_MX.label | 1 + web/WEB-INF/i3-label_pt_BR.label | 1 + .../filtroRelatorioVendasComissao.zul | 9 ++ 7 files changed, 105 insertions(+), 33 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java index 59834036c..9f378fed1 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java @@ -30,6 +30,7 @@ public class RelatorioVendasComissao extends Relatorio { private Date fecInicio; private Date fecFinal; + private Integer marcaId; public RelatorioVendasComissao(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); @@ -41,6 +42,9 @@ public class RelatorioVendasComissao extends Relatorio { Map parametros = this.relatorio.getParametros(); fecInicio = new java.sql.Date(sdf.parse(parametros.get("fecInicio").toString()).getTime()); fecFinal = new java.sql.Date(sdf.parse(parametros.get("fecFinal").toString()).getTime()); + if(parametros.get("MARCA_ID")!=null){ + marcaId = Integer.valueOf(parametros.get("MARCA_ID").toString()); + } Connection conexao = this.relatorio.getConexao(); processarVendasComissao(conexao); @@ -151,6 +155,9 @@ public class RelatorioVendasComissao extends Relatorio { if(fecFinal != null) { stmt.setDate("fecFinal", fecFinal); } + if(marcaId != null){ + stmt.setInt("MARCA_ID", marcaId); + } return stmt; } @@ -165,8 +172,11 @@ public class RelatorioVendasComissao extends Relatorio { .append("JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = C.PUNTOVENTA_ID ") .append("LEFT JOIN PUNTO_VENTA PV1 ON PV1.PUNTOVENTA_ID = C.PTOVTAVENTA_ID ") .append("WHERE (C.INDSTATUSBOLETO = 'V' OR (C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C')) ") - .append("AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal ") - .append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA, PV1.NOMBPUNTOVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID ") + .append("AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal "); + if(parametros.get("MARCA_ID")!= null){ + sQuery.append("AND C.MARCA_ID =:MARCA_ID "); + } + sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA, PV1.NOMBPUNTOVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID ") .append("ORDER BY PV.NUMPUNTOVENTA, PV1.NUMPUNTOVENTA, C.INDSTATUSBOLETO"); return sQuery.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jasper index 9ee107a0a4b22e712e63112110832bdb8177d2f2..4d8c3cfdb023fdd74b4de6ed3412ebf065247f89 100644 GIT binary patch delta 9405 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml index d3ee0334f..829616695 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml @@ -6,6 +6,7 @@ + @@ -39,34 +40,44 @@ - <band height="41" splitType="Stretch"> + <band height="61" splitType="Stretch"> <textField> - <reportElement x="0" y="0" width="620" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/> + <reportElement uuid="43b2c28d-4760-4890-b00d-25e931e79c74" x="0" y="0" width="620" height="20"/> <textElement markup="none"> <font size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement x="638" y="0" width="164" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/> + <reportElement uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5" x="638" y="0" width="164" height="20"/> <textElement textAlignment="Right"> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="20" width="620" height="20" uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b"/> + <reportElement uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b" x="0" y="20" width="620" height="20"/> <textElement> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{fecInicio} + " " + $R{cabecalho.periodoA} + " " + $P{fecFinal}]]></textFieldExpression> </textField> + <textField> + <reportElement uuid="8fa1c53b-1da7-4d4d-a75c-ab1543acae2a" x="53" y="41" width="139" height="20"/> + <textElement/> + <textFieldExpression><![CDATA[$P{empresa}]]></textFieldExpression> + </textField> + <staticText> + <reportElement uuid="a91f6081-4740-4e36-8965-41b6cde4cc20" x="0" y="41" width="53" height="20"/> + <textElement/> + <text><![CDATA[Empresa:]]></text> + </staticText> </band> - + @@ -77,44 +88,46 @@ - + + - + - + - + - + - + - + - + - + + @@ -122,41 +135,43 @@ - + - + - + + - + - + - + - + - + + @@ -170,52 +185,52 @@ - + - + - + - + - + - + - + - + @@ -224,7 +239,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java index 4521a97cc..d061967a0 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java @@ -3,6 +3,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import javax.sql.DataSource; @@ -13,10 +14,14 @@ import org.springframework.stereotype.Controller; import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; +import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioVendasComissao; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @Controller("relatorioVendasComissaoController") @@ -28,11 +33,18 @@ public class RelatorioVendasComissaoController extends MyGenericForwardComposer @Autowired private DataSource dataSourceRead; + @Autowired + private EmpresaService empresaService; + + private MyComboboxEstandar cmbEmpresa; + private List lsEmpresa; + private Datebox dataInicial; private Datebox dataFinal; @Override public void doAfterCompose(Component comp) throws Exception { + setLsEmpresa(empresaService.obtenerTodos()); super.doAfterCompose(comp); } @@ -45,6 +57,16 @@ public class RelatorioVendasComissaoController extends MyGenericForwardComposer parametros.put("fecInicio", sdf.format(dataDe)); parametros.put("fecFinal", sdf.format(dataAte)); + + Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); + if (itemEmpresa != null) { + Empresa empresa = (Empresa) itemEmpresa.getValue(); + parametros.put("MARCA_ID", empresa.getEmpresaId()); + parametros.put("empresa", empresa.getNombempresa()); + } else{ + parametros.put("empresa", "Todas;"); + } + Relatorio relatorio = new RelatorioVendasComissao(parametros, dataSourceRead.getConnection()); Map args = new HashMap(); @@ -53,5 +75,19 @@ public class RelatorioVendasComissaoController extends MyGenericForwardComposer openWindow("/component/reportView.zul", Labels.getLabel("indexController.mniRelatorioVendasComissao.label"), args, MODAL); } + + /** + * @return the lsEmpresa + */ + public List getLsEmpresa() { + return lsEmpresa; + } + + /** + * @param lsEmpresa the lsEmpresa to set + */ + public void setLsEmpresa(List lsEmpresa) { + this.lsEmpresa = lsEmpresa; + } } diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 1dbaddba1..3fbff93b4 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -5692,6 +5692,7 @@ editarPracaPedagioController.btnFechar.MSG.borrarOK = Praça de Pedágio Excluid # Relatorio de Vendas para Comissao relatorioVendasComissaoController.lbDataIni.value = Fecha Inicio relatorioVendasComissaoController.lbDataFin.value = Fecha Final +relatorioVendasComissaoController.lbEmpresa.value = Empresa # Calculo Comissao busquedaCalculoComissaoController.window.title = Cálculo de Comissão diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 22bb08f4e..b1bd1410d 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -5833,6 +5833,7 @@ editarPracaPedagioController.btnFechar.MSG.borrarOK = Praça de Pedágio Excluid # Relatorio de Vendas para Comissao relatorioVendasComissaoController.lbDataIni.value = Data Início relatorioVendasComissaoController.lbDataFin.value = Data Final +relatorioVendasComissaoController.lbEmpresa.value = Empresa # Calculo Comissao busquedaCalculoComissaoController.window.title = Cálculo de Comisión diff --git a/web/gui/relatorios/filtroRelatorioVendasComissao.zul b/web/gui/relatorios/filtroRelatorioVendasComissao.zul index 0afb480d8..d5e7aa37d 100644 --- a/web/gui/relatorios/filtroRelatorioVendasComissao.zul +++ b/web/gui/relatorios/filtroRelatorioVendasComissao.zul @@ -28,6 +28,15 @@ format="dd/MM/yyyy" lenient="false" constraint="no empty" maxlength="10" /> + +