From 435eb6c13c76647f33795c10e125c9d7ef0a33f2 Mon Sep 17 00:00:00 2001 From: julio Date: Wed, 28 Aug 2019 18:13:57 +0000 Subject: [PATCH] fixes bug#15326 dev: julio qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@97061 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioDevolucaoBilhetes.java | 144 +++++++++--------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java index 2b8372da4..9d42bc2ac 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java @@ -487,42 +487,42 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append(" WHEN BPE.TIPOEVENTO IS NULL AND BPE.CHBPE_SUBSTITUICAO IS NOT NULL AND BPE.TIPOSUBSTITUICAO = '3' THEN 'TRANSFERENCIA/REMARCACAO' ELSE '' END AS TIPO_SIT, "); sql.append(" BPEORI.CHBPE AS CHBPE, "); sql.append(" BPE.CHBPE AS CHBPE_SUBSTITUICAO, "); - sql.append(" COALESCE(BPEORI.CMUNINI, BPE.CMUNINI) AS CMUNINI, "); - sql.append(" COALESCE(BPEORI.CMUNFIM, BPE.CMUNFIM) AS CMUNFIM, "); - sql.append(" COALESCE(BPEORI.UFINI, BPE.UFINI) AS UFINI, "); - sql.append(" COALESCE(BPEORI.UFFIM, BPE.UFFIM) AS UFFIM, "); - sql.append(" COALESCE(BPEORI.NBP, BPE.NBP) AS NBP, "); - sql.append(" COALESCE(BPEORI.DHEMB, BPE.DHEMB) AS DHEMB, "); - sql.append(" COALESCE(BPEORI.CST00, BPE.CST00) AS CST00, "); - sql.append(" COALESCE(BPEORI.CST20, BPE.CST20) AS CST20, "); - sql.append(" COALESCE(BPEORI.CST45, BPE.CST45) AS CST45, "); - sql.append(" COALESCE(BPEORI.CST90, BPE.CST90) AS CST90, "); - sql.append(" COALESCE(BPEORI.CSTOUTRAUF, BPE.CSTOUTRAUF) AS CSTOUTRAUF, "); - sql.append(" COALESCE(BPEORI.CSTSN, BPE.CSTSN) AS CSTSN, "); - sql.append(" COALESCE(BPEORI.VBC00, BPE.VBC00) AS VBC00, "); - sql.append(" COALESCE(BPEORI.PICMS00, BPE.PICMS00) AS PICMS00, "); - sql.append(" COALESCE(BPEORI.VICMS00, BPE.VICMS00) AS VICMS00, "); - sql.append(" COALESCE(BPEORI.VBC20, BPE.VBC20) AS VBC20, "); - sql.append(" COALESCE(BPEORI.PICMS20, BPE.PICMS20) AS PICMS20, "); - sql.append(" COALESCE(BPEORI.VICMS20, BPE.VICMS20) AS VICMS20, "); - sql.append(" COALESCE(BPEORI.VBP, BPE.VBP) AS VBP, "); - sql.append(" COALESCE(BPEORI.VDESCONTO, BPE.VDESCONTO) AS VDESCONTO, "); - sql.append(" COALESCE(BPEORI.VPGTO, BPE.VPGTO) AS VPGTO, "); - sql.append(" COALESCE(BPEORI.TPCOMP01, BPE.TPCOMP01) AS TPCOMP01, "); - sql.append(" COALESCE(BPEORI.TPCOMP02, BPE.TPCOMP02) AS TPCOMP02, "); - sql.append(" COALESCE(BPEORI.TPCOMP03, BPE.TPCOMP03) AS TPCOMP03, "); - sql.append(" COALESCE(BPEORI.TPCOMP04, BPE.TPCOMP04) AS TPCOMP04, "); - sql.append(" COALESCE(BPEORI.TPCOMP05, BPE.TPCOMP05) AS TPCOMP05, "); - sql.append(" COALESCE(BPEORI.TPCOMP06, BPE.TPCOMP06) AS TPCOMP06, "); - sql.append(" COALESCE(BPEORI.TPCOMP99, BPE.TPCOMP99) AS TPCOMP99, "); - sql.append(" COALESCE(BPEORI.VCOMP01, BPE.VCOMP01) AS VCOMP01, "); - sql.append(" COALESCE(BPEORI.VCOMP02, BPE.VCOMP02) AS VCOMP02, "); - sql.append(" COALESCE(BPEORI.VCOMP03, BPE.VCOMP03) AS VCOMP03, "); - sql.append(" COALESCE(BPEORI.VCOMP04, BPE.VCOMP04) AS VCOMP04, "); - sql.append(" COALESCE(BPEORI.VCOMP05, BPE.VCOMP05) AS VCOMP05, "); - sql.append(" COALESCE(BPEORI.VCOMP06, BPE.VCOMP06) AS VCOMP06, "); - sql.append(" COALESCE(BPEORI.VCOMP99, BPE.VCOMP99) AS VCOMP99, "); - sql.append(" COALESCE(BPEORI.PREDBC, BPE.PREDBC) AS PREDBC "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CMUNINI ELSE BPE.CMUNINI END AS CMUNINI, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CMUNFIM ELSE BPE.CMUNFIM END AS CMUNFIM, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.UFINI ELSE BPE.UFINI END AS UFINI, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.UFFIM ELSE BPE.UFFIM END AS UFFIM, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.NBP ELSE BPE.NBP END AS NBP, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.DHEMB ELSE BPE.DHEMB END AS DHEMB, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CST00 ELSE BPE.CST00 END AS CST00, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CST20 ELSE BPE.CST20 END AS CST20, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CST45 ELSE BPE.CST45 END AS CST45, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CST90 ELSE BPE.CST90 END AS CST90, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CSTOUTRAUF ELSE BPE.CSTOUTRAUF END AS CSTOUTRAUF, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.CSTSN ELSE BPE.CSTSN END AS CSTSN, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VBC00 ELSE BPE.VBC00 END AS VBC00, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.PICMS00 ELSE BPE.PICMS00 END AS PICMS00, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VICMS00 ELSE BPE.VICMS00 END AS VICMS00, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VBC20 ELSE BPE.VBC20 END AS VBC20, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.PICMS20 ELSE BPE.PICMS20 END AS PICMS20, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VICMS20 ELSE BPE.VICMS20 END AS VICMS20, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VBP ELSE BPE.VBP END AS VBP, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VDESCONTO ELSE BPE.VDESCONTO END AS VDESCONTO, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VPGTO ELSE BPE.VPGTO END AS VPGTO, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.TPCOMP01 ELSE BPE.TPCOMP01 END AS TPCOMP01, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.TPCOMP02 ELSE BPE.TPCOMP02 END AS TPCOMP02, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.TPCOMP03 ELSE BPE.TPCOMP03 END AS TPCOMP03, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.TPCOMP04 ELSE BPE.TPCOMP04 END AS TPCOMP04, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.TPCOMP05 ELSE BPE.TPCOMP05 END AS TPCOMP05, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.TPCOMP06 ELSE BPE.TPCOMP06 END AS TPCOMP06, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.TPCOMP99 ELSE BPE.TPCOMP99 END AS TPCOMP99, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VCOMP01 ELSE BPE.VCOMP01 END AS VCOMP01, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VCOMP02 ELSE BPE.VCOMP02 END AS VCOMP02, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VCOMP03 ELSE BPE.VCOMP03 END AS VCOMP03, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VCOMP04 ELSE BPE.VCOMP04 END AS VCOMP04, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VCOMP05 ELSE BPE.VCOMP05 END AS VCOMP05, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VCOMP06 ELSE BPE.VCOMP06 END AS VCOMP06, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.VCOMP99 ELSE BPE.VCOMP99 END AS VCOMP99, "); + sql.append(" CASE WHEN BPEORI.UFINI IS NOT NULL THEN BPEORI.PREDBC ELSE BPE.PREDBC END AS PREDBC "); sql.append("FROM BOLETO BORI "); sql.append(" INNER JOIN MARCA M ON M.MARCA_ID = BORI.MARCA_ID AND M.ACTIVO = 1 "); sql.append(" INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID "); @@ -599,42 +599,42 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { sql.append(" WHEN BPE.TIPOEVENTO IS NULL AND BPE.CHBPE_SUBSTITUICAO IS NOT NULL AND BPE.TIPOSUBSTITUICAO = '3' THEN 'TRANSFERENCIA/REMARCACAO' ELSE '' END AS TIPO_SIT, "); sql.append(" BPE.CHBPE AS CHBPE, "); sql.append(" '' AS CHBPE_SUBSTITUICAO, "); - sql.append(" COALESCE(BPEANT.CMUNINI, BPE.CMUNINI, BPEORI.CMUNINI) AS CMUNINI, "); - sql.append(" COALESCE(BPEANT.CMUNFIM, BPE.CMUNFIM, BPEORI.CMUNFIM) AS CMUNFIM, "); - sql.append(" COALESCE(BPEANT.UFINI, BPE.UFINI, BPEORI.UFINI) AS UFINI, "); - sql.append(" COALESCE(BPEANT.UFFIM, BPE.UFFIM, BPEORI.UFFIM) AS UFFIM, "); - sql.append(" COALESCE(BPEANT.NBP, BPE.NBP, BPEORI.NBP) AS NBP, "); - sql.append(" COALESCE(BPEANT.DHEMB, BPE.DHEMB, BPEORI.DHEMB) AS DHEMB, "); - sql.append(" COALESCE(BPEANT.CST00, BPE.CST00, BPEORI.CST00) AS CST00, "); - sql.append(" COALESCE(BPEANT.CST20, BPE.CST20, BPEORI.CST20) AS CST20, "); - sql.append(" COALESCE(BPEANT.CST45, BPE.CST45, BPEORI.CST45) AS CST45, "); - sql.append(" COALESCE(BPEANT.CST90, BPE.CST90, BPEORI.CST90) AS CST90, "); - sql.append(" COALESCE(BPEANT.CSTOUTRAUF, BPE.CSTOUTRAUF, BPEORI.CSTOUTRAUF) AS CSTOUTRAUF, "); - sql.append(" COALESCE(BPEANT.CSTSN, BPE.CSTSN, BPEORI.CSTSN) AS CSTSN, "); - sql.append(" COALESCE(BPEANT.VBC00, BPE.VBC00, BPEORI.VBC00) AS VBC00, "); - sql.append(" COALESCE(BPEANT.PICMS00, BPE.PICMS00, BPEORI.PICMS00) AS PICMS00, "); - sql.append(" COALESCE(BPEANT.VICMS00, BPE.VICMS00, BPEORI.VICMS00) AS VICMS00, "); - sql.append(" COALESCE(BPEANT.VBC20, BPE.VBC20, BPEORI.VBC20) AS VBC20, "); - sql.append(" COALESCE(BPEANT.PICMS20, BPE.PICMS20, BPEORI.PICMS20) AS PICMS20, "); - sql.append(" COALESCE(BPEANT.VICMS20, BPE.VICMS20, BPEORI.VICMS20) AS VICMS20, "); - sql.append(" COALESCE(BPEANT.VBP, BPE.VBP, BPEORI.VBP) AS VBP, "); - sql.append(" COALESCE(BPEANT.VDESCONTO, BPE.VDESCONTO, BPEORI.VDESCONTO) AS VDESCONTO, "); - sql.append(" COALESCE(BPEANT.VPGTO, BPE.VPGTO, BPEORI.VPGTO) AS VPGTO, "); - sql.append(" COALESCE(BPEANT.TPCOMP01, BPE.TPCOMP01, BPEORI.TPCOMP01) AS TPCOMP01, "); - sql.append(" COALESCE(BPEANT.TPCOMP02, BPE.TPCOMP02, BPEORI.TPCOMP02) AS TPCOMP02, "); - sql.append(" COALESCE(BPEANT.TPCOMP03, BPE.TPCOMP03, BPEORI.TPCOMP03) AS TPCOMP03, "); - sql.append(" COALESCE(BPEANT.TPCOMP04, BPE.TPCOMP04, BPEORI.TPCOMP04) AS TPCOMP04, "); - sql.append(" COALESCE(BPEANT.TPCOMP05, BPE.TPCOMP05, BPEORI.TPCOMP05) AS TPCOMP05, "); - sql.append(" COALESCE(BPEANT.TPCOMP06, BPE.TPCOMP06, BPEORI.TPCOMP06) AS TPCOMP06, "); - sql.append(" COALESCE(BPEANT.TPCOMP99, BPE.TPCOMP99, BPEORI.TPCOMP99) AS TPCOMP99, "); - sql.append(" COALESCE(BPEANT.VCOMP01, BPE.VCOMP01, BPEORI.VCOMP01) AS VCOMP01, "); - sql.append(" COALESCE(BPEANT.VCOMP02, BPE.VCOMP02, BPEORI.VCOMP02) AS VCOMP02, "); - sql.append(" COALESCE(BPEANT.VCOMP03, BPE.VCOMP03, BPEORI.VCOMP03) AS VCOMP03, "); - sql.append(" COALESCE(BPEANT.VCOMP04, BPE.VCOMP04, BPEORI.VCOMP04) AS VCOMP04, "); - sql.append(" COALESCE(BPEANT.VCOMP05, BPE.VCOMP05, BPEORI.VCOMP05) AS VCOMP05, "); - sql.append(" COALESCE(BPEANT.VCOMP06, BPE.VCOMP06, BPEORI.VCOMP06) AS VCOMP06, "); - sql.append(" COALESCE(BPEANT.VCOMP99, BPE.VCOMP99, BPEORI.VCOMP99) AS VCOMP99, "); - sql.append(" COALESCE(BPEANT.PREDBC, BPE.PREDBC, BPEORI.PREDBC) AS PREDBC "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.CMUNINI WHEN BPE.UFINI IS NOT NULL THEN BPE.CMUNINI ELSE BPEORI.CMUNINI END AS CMUNINI, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.CMUNFIM WHEN BPE.UFINI IS NOT NULL THEN BPE.CMUNFIM ELSE BPEORI.CMUNFIM END AS CMUNFIM, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.UFINI WHEN BPE.UFINI IS NOT NULL THEN BPE.UFINI ELSE BPEORI.UFINI END AS UFINI, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.UFFIM WHEN BPE.UFINI IS NOT NULL THEN BPE.UFFIM ELSE BPEORI.UFFIM END AS UFFIM, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.NBP WHEN BPE.UFINI IS NOT NULL THEN BPE.NBP ELSE BPEORI.NBP END AS NBP, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.DHEMB WHEN BPE.UFINI IS NOT NULL THEN BPE.DHEMB ELSE BPEORI.DHEMB END AS DHEMB, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.CST00 WHEN BPE.UFINI IS NOT NULL THEN BPE.CST00 ELSE BPEORI.CST00 END AS CST00, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.CST20 WHEN BPE.UFINI IS NOT NULL THEN BPE.CST20 ELSE BPEORI.CST20 END AS CST20, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.CST45 WHEN BPE.UFINI IS NOT NULL THEN BPE.CST45 ELSE BPEORI.CST45 END AS CST45, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.CST90 WHEN BPE.UFINI IS NOT NULL THEN BPE.CST90 ELSE BPEORI.CST90 END AS CST90, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.CSTOUTRAUF WHEN BPE.UFINI IS NOT NULL THEN BPE.CSTOUTRAUF ELSE BPEORI.CSTOUTRAUF END AS CSTOUTRAUF, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.CSTSN WHEN BPE.UFINI IS NOT NULL THEN BPE.CSTSN ELSE BPEORI.CSTSN END AS CSTSN, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.VBC00 WHEN BPE.UFINI IS NOT NULL THEN BPE.VBC00 ELSE BPEORI.VBC00 END AS VBC00, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.PICMS00 WHEN BPE.UFINI IS NOT NULL THEN BPE.PICMS00 ELSE BPEORI.PICMS00 END AS PICMS00, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.VICMS00 WHEN BPE.UFINI IS NOT NULL THEN BPE.VICMS00 ELSE BPEORI.VICMS00 END AS VICMS00, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.VBC20 WHEN BPE.UFINI IS NOT NULL THEN BPE.VBC20 ELSE BPEORI.VBC20 END AS VBC20, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.PICMS20 WHEN BPE.UFINI IS NOT NULL THEN BPE.PICMS20 ELSE BPEORI.PICMS20 END AS PICMS20, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.VICMS20 WHEN BPE.UFINI IS NOT NULL THEN BPE.VICMS20 ELSE BPEORI.VICMS20 END AS VICMS20, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.VBP WHEN BPE.UFINI IS NOT NULL THEN BPE.VBP ELSE BPEORI.VBP END AS VBP, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.VDESCONTO WHEN BPE.UFINI IS NOT NULL THEN BPE.VDESCONTO ELSE BPEORI.VDESCONTO END AS VDESCONTO, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.VPGTO WHEN BPE.UFINI IS NOT NULL THEN BPE.VPGTO ELSE BPEORI.VPGTO END AS VPGTO, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.TPCOMP01 WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP01 ELSE BPEORI.TPCOMP01 END AS TPCOMP01, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.TPCOMP02 WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP02 ELSE BPEORI.TPCOMP02 END AS TPCOMP02, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.TPCOMP03 WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP03 ELSE BPEORI.TPCOMP03 END AS TPCOMP03, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.TPCOMP04 WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP04 ELSE BPEORI.TPCOMP04 END AS TPCOMP04, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.TPCOMP05 WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP05 ELSE BPEORI.TPCOMP05 END AS TPCOMP05, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.TPCOMP06 WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP06 ELSE BPEORI.TPCOMP06 END AS TPCOMP06, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.TPCOMP99 WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP99 ELSE BPEORI.TPCOMP99 END AS TPCOMP99, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.VCOMP01 WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP01 ELSE BPEORI.VCOMP01 END AS VCOMP01, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.VCOMP02 WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP02 ELSE BPEORI.VCOMP02 END AS VCOMP02, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.VCOMP03 WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP03 ELSE BPEORI.VCOMP03 END AS VCOMP03, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.VCOMP04 WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP04 ELSE BPEORI.VCOMP04 END AS VCOMP04, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.VCOMP05 WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP05 ELSE BPEORI.VCOMP05 END AS VCOMP05, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.VCOMP06 WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP06 ELSE BPEORI.VCOMP06 END AS VCOMP06, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.VCOMP99 WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP99 ELSE BPEORI.VCOMP99 END AS VCOMP99, "); + sql.append(" CASE WHEN BPEANT.UFINI IS NOT NULL THEN BPEANT.PREDBC WHEN BPE.UFINI IS NOT NULL THEN BPE.PREDBC ELSE BPEORI.PREDBC END AS PREDBC "); sql.append("FROM BOLETO BORI "); sql.append(" INNER JOIN MARCA M ON M.MARCA_ID = BORI.MARCA_ID AND M.ACTIVO = 1 "); sql.append(" INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ");