From 93188963a3522cd9a3586aa1ab0e951f10adb95b Mon Sep 17 00:00:00 2001 From: leonardo Date: Mon, 4 Sep 2017 14:04:28 +0000 Subject: [PATCH] fixes bug #9413 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73474 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioCancelamentoTransacao.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoTransacao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoTransacao.java index 495c9b5ff..95335355a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoTransacao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoTransacao.java @@ -66,8 +66,8 @@ public class RelatorioCancelamentoTransacao extends Relatorio { private String getSql() { StringBuilder sql = new StringBuilder(); - sql.append("SELECT B.BOLETO_ID, OCD.FECINC AS DATASOLICITACAOCLIENTE, E.NOMBEMPRESA AS EMPRESA, B.NOMBPASAJERO AS NOMEPASSAGEIRO, B.FECHORVENTA AS DATACOMPRA, ") - .append("B.NUMFOLIOSISTEMA AS NUMEROPASSAGEM, B.NUMOPERACION AS LOCALIZADOR, B.FECHORVIAJE AS DATAVIAGEM, B.CORRIDA_ID AS SERVICO, B.NUMASIENTO AS ASSENTO, ") + sql.append("SELECT B.BOLETO_ID, OCD.FECINC AS DATASOLICITACAOCLIENTE, E.NOMBEMPRESA AS EMPRESA, B.NOMBPASAJERO AS NOMEPASSAGEIRO, COALESCE(BORIGINAL.FECHORVENTA, B.FECHORVENTA) AS DATACOMPRA, ") + .append("B.NUMFOLIOSISTEMA AS NUMEROPASSAGEM, COALESCE(BORIGINAL.NUMOPERACION, B.NUMOPERACION) AS LOCALIZADOR, B.FECHORVIAJE AS DATAVIAGEM, B.CORRIDA_ID AS SERVICO, B.NUMASIENTO AS ASSENTO, ") .append("(COALESCE(B.PRECIOPAGADO,0) + COALESCE(B.IMPORTEOUTROS,0) + COALESCE(B.IMPORTEPEDAGIO,0) + COALESCE(B.IMPORTESEGURO,0) + COALESCE(B.IMPORTETAXAEMBARQUE,0)) AS VALORCOMPRA, ") .append("( ") .append(" SELECT SUM(COALESCE(B1.PRECIOPAGADO,0) + COALESCE(B1.IMPORTEOUTROS,0) + COALESCE(B1.IMPORTEPEDAGIO,0) + COALESCE(B1.IMPORTESEGURO,0) + COALESCE(B1.IMPORTETAXAEMBARQUE,0)) ") @@ -77,6 +77,7 @@ public class RelatorioCancelamentoTransacao extends Relatorio { .append(") AS VALORTOTALCOMPRA, ") .append("VALOR_TARJETA AS VALORASERRESTITUIDO ") .append("FROM BOLETO B ") + .append("LEFT JOIN BOLETO BORIGINAL ON BORIGINAL.BOLETO_ID = B.BOLETOORIGINAL_ID ") .append("INNER JOIN OCD OCD ON OCD.BOLETO_ID = B.BOLETO_ID ") .append("INNER JOIN MARCA M ON M.MARCA_ID = B.MARCA_ID ") .append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ")