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

bug#10637 

dev:julio
qua:marcelo


git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@79261 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2018-02-28 16:49:05 +00:00
parent d5d26d8fa9
commit 646c24e67b
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java
View File

@ -403,8 +403,8 @@ public class RelatorioFinanceiroAnalitico extends Relatorio {
sql.append(" sum( case when tee.tipoeventoextra_id in (43) and indtipo = 1 then cdp.importe else 0 end) as receita_dif_dif_tarifa_maior, ");
sql.append(" sum( case when tee.tipoeventoextra_id in (44) and indtipo = 0 then cdp.importe else 0 end) as receita_dif_dif_tarifa_menor, ");
sql.append(" sum( case when tee.tipoeventoextra_id not in (44) and indtipo = 0 then cdp.importe else 0 end) as despesas, ");
sql.append(" sum( case when (formapago_id in (2,25) and tee.tipoeventoextra_id in (2,25,82,41,43,103,99978,99999) and indtipo = 1) then cdp.importe else 0 end) as cartao_credito_ee, ");
sql.append(" sum( case when (formapago_id in (3,26) and tee.tipoeventoextra_id in (2,25,82,41,43,103,99978,99999) and indtipo = 1) then cdp.importe else 0 end) as cartao_debito_ee ");
sql.append(" sum( case when (ee.formapago_id in (2,25) and tee.tipoeventoextra_id in (2,25,82,41,43,103,99978,99999) and indtipo = 1) then cdp.importe else 0 end) as cartao_credito_ee, ");
sql.append(" sum( case when (ee.formapago_id in (3,26) and tee.tipoeventoextra_id in (2,25,82,41,43,103,99978,99999) and indtipo = 1) then cdp.importe else 0 end) as cartao_debito_ee ");
sql.append(" from caja_diversos cd ");
sql.append(" join evento_extra ee on ee.eventoextra_id = cd.eventoextra_id ");
sql.append(" join tipo_evento_extra tee on tee.tipoeventoextra_id = ee.tipoeventoextra_id ");

4
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java
View File

@ -409,8 +409,8 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
sql.append(" sum( case when tee.tipoeventoextra_id in (43) and indtipo = 1 then cdp.importe else 0 end) as receita_dif_dif_tarifa_maior, ");
sql.append(" sum( case when tee.tipoeventoextra_id in (44) and indtipo = 0 then cdp.importe else 0 end) as receita_dif_dif_tarifa_menor, ");
sql.append(" sum( case when tee.tipoeventoextra_id not in (44) and indtipo = 0 then cdp.importe else 0 end) as despesas, ");
sql.append(" sum( case when (formapago_id in (2,25) and tee.tipoeventoextra_id in (2,25,82,41,43,103,99978,99999) and indtipo = 1) then cdp.importe else 0 end) as cartao_credito_ee, ");
sql.append(" sum( case when (formapago_id in (3,26) and tee.tipoeventoextra_id in (2,25,82,41,43,103,99978,99999) and indtipo = 1) then cdp.importe else 0 end) as cartao_debito_ee ");
sql.append(" sum( case when (ee.formapago_id in (2,25) and tee.tipoeventoextra_id in (2,25,82,41,43,103,99978,99999) and indtipo = 1) then cdp.importe else 0 end) as cartao_credito_ee, ");
sql.append(" sum( case when (ee.formapago_id in (3,26) and tee.tipoeventoextra_id in (2,25,82,41,43,103,99978,99999) and indtipo = 1) then cdp.importe else 0 end) as cartao_debito_ee ");
sql.append(" from caja_diversos cd ");
sql.append(" join evento_extra ee on ee.eventoextra_id = cd.eventoextra_id ");
sql.append(" join tipo_evento_extra tee on tee.tipoeventoextra_id = ee.tipoeventoextra_id ");

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

Binary file not shown.

4
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroAnalitico.jrxml
View File

@ -66,10 +66,10 @@
<variable name="somaTxEmb" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{txEmb}]]></variableExpression>
</variable>
<variable name="somaPedagio" class="java.math.BigDecimal" incrementType="Column">
<variable name="somaPedagio" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{pedagio}]]></variableExpression>
</variable>
<variable name="somaSegFacult" class="java.math.BigDecimal" incrementType="Column">
<variable name="somaSegFacult" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{segFacult}]]></variableExpression>
</variable>
<variable name="somaTotalTerceiros" class="java.math.BigDecimal" calculation="Sum">

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

Binary file not shown.

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioFinanceiroSintetico" pageWidth="1295" pageHeight="595" orientation="Landscape" columnWidth="1295" leftMargin="0" rightMargin="0" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="1a307341-ad36-4306-8e8d-c8b55fb6bcc6">
<property name="ireport.zoom" value="1.771561000000001"/>
<property name="ireport.x" value="0"/>
<property name="ireport.x" value="648"/>
<property name="ireport.y" value="0"/>
<parameter name="nombempresa" class="java.lang.String"/>
<parameter name="inicio" class="java.util.Date"/>
@ -65,10 +65,10 @@
<variable name="somaTxEmb" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{txEmb}]]></variableExpression>
</variable>
<variable name="somaPedagio" class="java.math.BigDecimal" incrementType="Column">
<variable name="somaPedagio" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{pedagio}]]></variableExpression>
</variable>
<variable name="somaSegFacult" class="java.math.BigDecimal" incrementType="Column">
<variable name="somaSegFacult" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{segFacult}]]></variableExpression>
</variable>
<variable name="somaTotalTerceiros" class="java.math.BigDecimal" calculation="Sum">