From 6772e1cad4870748e5734c338e8498e9be621aab Mon Sep 17 00:00:00 2001 From: fabio Date: Thu, 22 Mar 2018 20:32:18 +0000 Subject: [PATCH] bug #10773 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@80147 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioFinanceiroSintetico.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java index 5fa5c3c9a..e2811ee2e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java @@ -167,11 +167,11 @@ public class RelatorioFinanceiroSintetico extends Relatorio { sql.append(" cdv.codigo, "); sql.append(" cdv.puntoventaId, "); sql.append(" cdv.empresaId, "); - sql.append(" SUM( CASE WHEN (cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F' AND cdv.motivocancelacion_id IS NULL) THEN cdv.pedagio ELSE 0 END) AS pedagio, "); - sql.append(" SUM( CASE WHEN (cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F' AND cdv.motivocancelacion_id IS NULL) THEN cdv.taxaEmbarque ELSE 0 END) AS taxaEmbarque, "); + sql.append(" SUM( CASE WHEN (cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F' ) THEN (CASE WHEN motivocancelacion_id IS NULL THEN 1 ELSE -1 END * cdv.pedagio) ELSE 0 END) AS pedagio, "); + sql.append(" SUM( CASE WHEN (cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F' ) THEN (CASE WHEN motivocancelacion_id IS NULL THEN 1 ELSE -1 END * cdv.taxaEmbarque) ELSE 0 END) AS taxaEmbarque, "); sql.append(" SUM( CASE WHEN (cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F' AND cdv.motivocancelacion_id IS NULL) THEN cdv.valorpago ELSE 0 END) AS receita_bpr, "); - sql.append(" SUM( CASE WHEN (cdv.indreimpresion = 0 AND cdv.indstatusboleto IN ('V', 'T') AND cdv.tipoventa_id IN (5,12,18,49)) THEN cdv.valorpago ELSE 0 END) AS receita_gap, "); - sql.append(" SUM( CASE WHEN (cdv.indreimpresion = 1 AND cdv.indstatusboleto = 'E' AND cdv.tipoventa_id IN (5,12,18,49)) THEN cdv.valorpago ELSE 0 END) AS entrega_gap, "); + sql.append(" SUM( CASE WHEN (cdv.indreimpresion = 0 AND cdv.tipoventa_id IN (18) ) THEN (CASE WHEN motivocancelacion_id IS NULL THEN 1 ELSE -1 END * (cdv.tarifa+cdv.taxaEmbarque+cdv.pedagio+cdv.seguro+cdv.outros)) ELSE 0 END) AS receita_gap, "); + sql.append(" SUM( CASE WHEN (cdv.indreimpresion = 1 AND cdv.indstatusboleto = 'E' ) THEN (CASE WHEN motivocancelacion_id IS NULL THEN 1 ELSE -1 END * (cdv.tarifa+cdv.taxaEmbarque+cdv.pedagio+cdv.seguro+cdv.outros)) ELSE 0 END) AS entrega_gap, "); sql.append(" SUM( (SELECT sum(CASE WHEN cdv.MOTIVOCANCELACION_ID IS NULL THEN 1 ELSE -1 END * cfp.importe) FROM caja_formapago cfp WHERE cfp.caja_id = cdv.cajaid AND cfp.activo = 1 AND cfp.FORMAPAGO_ID IN (2,31,38) AND cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F' AND cdv.tipoventa_id <> 6) ) AS cartao_credito, "); sql.append(" SUM( (SELECT sum(CASE WHEN cdv.MOTIVOCANCELACION_ID IS NULL THEN 1 ELSE -1 END * cfp.importe) FROM caja_formapago cfp WHERE cfp.caja_id = cdv.cajaid AND cfp.activo = 1 AND cfp.FORMAPAGO_ID IN (3) AND cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F' AND cdv.tipoventa_id <> 6) ) AS cartao_debito, "); sql.append(" SUM( (SELECT sum(CASE WHEN cdv.MOTIVOCANCELACION_ID IS NULL THEN 1 ELSE -1 END * cfp.importe) FROM caja_formapago cfp WHERE cfp.caja_id = cdv.cajaid AND cfp.activo = 1 AND cfp.FORMAPAGO_ID IN (1) AND cdv.indreimpresion = 0 AND cdv.indstatusoperacion = 'F' AND cdv.tipoventa_id <> 6) ) AS boleto_bnc ");