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

bug #6669 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49577 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2015-10-29 12:49:18 +00:00
parent 1d58c533a6
commit ce20ac7f43
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCalculoComissao.jasper
View File

Binary file not shown.

6
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCalculoComissao.jrxml
View File

@ -32,8 +32,8 @@
<parameter name="empresa" class="java.lang.String"/> <parameter name="empresa" class="java.lang.String"/>
<parameter name="puntoventa" class="java.lang.String"/> <parameter name="puntoventa" class="java.lang.String"/>
<parameter name="periodo" class="java.util.Date"/> <parameter name="periodo" class="java.util.Date"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false"> <parameter name="subReport" class="java.lang.String">
<defaultValueExpression><![CDATA["C:\\Users\\rjgw\\Eclipse workspace\\workspace_adm_trunk\\ventaboletosadm\\src\\java\\com\\rjconsultores\\ventaboletos\\relatorios\\templates\\"]]></defaultValueExpression> <defaultValueExpression><![CDATA[]]></defaultValueExpression>
</parameter> </parameter>
<field name="comissaoPagar" class="java.math.BigDecimal"/> <field name="comissaoPagar" class="java.math.BigDecimal"/>
<field name="comissaoBPR" class="java.math.BigDecimal"/> <field name="comissaoBPR" class="java.math.BigDecimal"/>
@ -257,7 +257,7 @@
<subreport isUsingCache="true"> <subreport isUsingCache="true">
<reportElement x="0" y="111" width="802" height="42" uuid="4a6bdca5-1ca5-4ee2-bd92-9c8eb2080bf7"/> <reportElement x="0" y="111" width="802" height="42" uuid="4a6bdca5-1ca5-4ee2-bd92-9c8eb2080bf7"/>
<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{lsReceitas})]]></dataSourceExpression> <dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{lsReceitas})]]></dataSourceExpression>
<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "RelatorioCalculoComissaoReceitas.jasper"]]></subreportExpression> <subreportExpression><![CDATA[$P{subReport}]]></subreportExpression>
</subreport> </subreport>
<textField pattern="R$ ###0.00" isBlankWhenNull="true"> <textField pattern="R$ ###0.00" isBlankWhenNull="true">
<reportElement x="702" y="40" width="100" height="20" uuid="235abf59-1771-4161-b6ea-adf9d0aadb27"/> <reportElement x="702" y="40" width="100" height="20" uuid="235abf59-1771-4161-b6ea-adf9d0aadb27"/>

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCalculoComissaoReceitas.jasper
View File

Binary file not shown.

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaCalculoComissaoController.java
View File

@ -95,12 +95,15 @@ public class BusquedaCalculoComissaoController extends MyGenericForwardComposer
Empresa empresa = (Empresa) (cmbEmpresa.getSelectedItem() != null ? cmbEmpresa.getSelectedItem().getValue() : null); Empresa empresa = (Empresa) (cmbEmpresa.getSelectedItem() != null ? cmbEmpresa.getSelectedItem().getValue() : null);
Date periodo = datMes.getValue(); Date periodo = datMes.getValue();
String subReport = "/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCalculoComissaoReceitas.jasper";
RegistroCalculo rc = calculoComissaoService.relatorioCalculoComissao(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), periodo); RegistroCalculo rc = calculoComissaoService.relatorioCalculoComissao(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), periodo);
Map<String, Object> parametros = new HashMap<String, Object>(); Map<String, Object> parametros = new HashMap<String, Object>();
parametros.put("puntoventa", puntoVenta.getNombpuntoventa()); parametros.put("puntoventa", puntoVenta.getNombpuntoventa());
parametros.put("empresa", empresa.getNombempresa()); parametros.put("empresa", empresa.getNombempresa());
parametros.put("periodo", periodo); parametros.put("periodo", periodo);
parametros.put("subReport", subReport);
parametros.put("registroCalculo", rc); parametros.put("registroCalculo", rc);
Relatorio relatorio = new RelatorioCalculoComissao(parametros, dataSourceRead.getConnection()); Relatorio relatorio = new RelatorioCalculoComissao(parametros, dataSourceRead.getConnection());