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

fixes bug#22092 

qua:
dev: Lucas Taia

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@106365 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2021-04-23 21:36:23 +00:00
parent f28c2f3eab
commit 577099e5ef
2 changed files with 91 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
View File

@ -268,7 +268,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
BigDecimal valorIsenta = BigDecimal.ZERO;
BigDecimal pedagio = new BigDecimal(db.getVcomp02() == null ? "0.0" : db.getVcomp02()) ;
BigDecimal pedagio = new BigDecimal(db.getVcomp02() == null ? "0.0" : db.getVcomp02());
BigDecimal pedagioIsento = isInterEstadual && !db.getIndPedadioEstdual() ? pedagio : BigDecimal.ZERO;
if (pedagioIsento.compareTo(BigDecimal.ZERO) == 0)
pedagioIsento = !isInterEstadual && !db.getIndPedagioMunicipal() ? pedagio : BigDecimal.ZERO;
@ -278,11 +278,11 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
if (taxaEmbarqueIsento.compareTo(BigDecimal.ZERO) == 0)
taxaEmbarqueIsento = !isInterEstadual && !db.getIndTxEmbarqueMunicipal() ? taxaEmbarque : BigDecimal.ZERO;
BigDecimal seguro = new BigDecimal(db.getVcomp04() == null ? "0.0" : db.getVcomp04()) ;
BigDecimal seguro = new BigDecimal(db.getVcomp04() == null ? "0.0" : db.getVcomp04());
BigDecimal seguroIsento = isInterEstadual && !db.getIndSeguroEstadual() ? seguro : BigDecimal.ZERO;
if (seguroIsento.compareTo(BigDecimal.ZERO) == 0)
seguroIsento = isInterEstadual && !db.getIndSeguroMunicipal() ? seguro : BigDecimal.ZERO;
valorIsenta = MoneyHelper.somar(valorIsenta, pedagioIsento, taxaEmbarqueIsento, seguroIsento);
BigDecimal baseCalculoICMS = new BigDecimal(vBC == null ? "0.0" : vBC);
@ -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(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CMUNINI ELSE BPEORI.CMUNINI END AS CMUNINI, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CMUNFIM ELSE BPEORI.CMUNFIM END AS CMUNFIM, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.UFINI ELSE BPEORI.UFINI END AS UFINI, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.UFFIM ELSE BPEORI.UFFIM END AS UFFIM, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.NBP ELSE BPEORI.NBP END AS NBP, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.DHEMB ELSE BPEORI.DHEMB END AS DHEMB, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CST00 ELSE BPEORI.CST00 END AS CST00, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CST20 ELSE BPEORI.CST20 END AS CST20, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CST45 ELSE BPEORI.CST45 END AS CST45, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CST90 ELSE BPEORI.CST90 END AS CST90, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CSTOUTRAUF ELSE BPEORI.CSTOUTRAUF END AS CSTOUTRAUF, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CSTSN ELSE BPEORI.CSTSN END AS CSTSN, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VBC00 ELSE BPEORI.VBC00 END AS VBC00, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.PICMS00 ELSE BPEORI.PICMS00 END AS PICMS00, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VICMS00 ELSE BPEORI.VICMS00 END AS VICMS00, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VBC20 ELSE BPEORI.VBC20 END AS VBC20, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.PICMS20 ELSE BPEORI.PICMS20 END AS PICMS20, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VICMS20 ELSE BPEORI.VICMS20 END AS VICMS20, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VBP ELSE BPEORI.VBP END AS VBP, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VDESCONTO ELSE BPEORI.VDESCONTO END AS VDESCONTO, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VPGTO ELSE BPEORI.VPGTO END AS VPGTO, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP01 ELSE BPEORI.TPCOMP01 END AS TPCOMP01, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP02 ELSE BPEORI.TPCOMP02 END AS TPCOMP02, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP03 ELSE BPEORI.TPCOMP03 END AS TPCOMP03, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP04 ELSE BPEORI.TPCOMP04 END AS TPCOMP04, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP05 ELSE BPEORI.TPCOMP05 END AS TPCOMP05, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP06 ELSE BPEORI.TPCOMP06 END AS TPCOMP06, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP99 ELSE BPEORI.TPCOMP99 END AS TPCOMP99, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP01 ELSE BPEORI.VCOMP01 END AS VCOMP01, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP02 ELSE BPEORI.VCOMP02 END AS VCOMP02, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP03 ELSE BPEORI.VCOMP03 END AS VCOMP03, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP04 ELSE BPEORI.VCOMP04 END AS VCOMP04, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP05 ELSE BPEORI.VCOMP05 END AS VCOMP05, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP06 ELSE BPEORI.VCOMP06 END AS VCOMP06, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP99 ELSE BPEORI.VCOMP99 END AS VCOMP99, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.PREDBC ELSE BPEORI.PREDBC END AS PREDBC ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CMUNINI ELSE BPEORI.CMUNINI END AS CMUNINI, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CMUNFIM ELSE BPEORI.CMUNFIM END AS CMUNFIM, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.UFINI ELSE BPEORI.UFINI END AS UFINI, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.UFFIM ELSE BPEORI.UFFIM END AS UFFIM, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.NBP ELSE BPEORI.NBP END AS NBP, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.DHEMB ELSE BPEORI.DHEMB END AS DHEMB, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CST00 ELSE BPEORI.CST00 END AS CST00, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CST20 ELSE BPEORI.CST20 END AS CST20, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CST45 ELSE BPEORI.CST45 END AS CST45, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CST90 ELSE BPEORI.CST90 END AS CST90, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CSTOUTRAUF ELSE BPEORI.CSTOUTRAUF END AS CSTOUTRAUF, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.CSTSN ELSE BPEORI.CSTSN END AS CSTSN, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VBC00 ELSE BPEORI.VBC00 END AS VBC00, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.PICMS00 ELSE BPEORI.PICMS00 END AS PICMS00, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VICMS00 ELSE BPEORI.VICMS00 END AS VICMS00, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VBC20 ELSE BPEORI.VBC20 END AS VBC20, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.PICMS20 ELSE BPEORI.PICMS20 END AS PICMS20, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VICMS20 ELSE BPEORI.VICMS20 END AS VICMS20, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VBP ELSE BPEORI.VBP END AS VBP, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VDESCONTO ELSE BPEORI.VDESCONTO END AS VDESCONTO, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VPGTO ELSE BPEORI.VPGTO END AS VPGTO, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP01 ELSE BPEORI.TPCOMP01 END AS TPCOMP01, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP02 ELSE BPEORI.TPCOMP02 END AS TPCOMP02, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP03 ELSE BPEORI.TPCOMP03 END AS TPCOMP03, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP04 ELSE BPEORI.TPCOMP04 END AS TPCOMP04, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP05 ELSE BPEORI.TPCOMP05 END AS TPCOMP05, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP06 ELSE BPEORI.TPCOMP06 END AS TPCOMP06, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.TPCOMP99 ELSE BPEORI.TPCOMP99 END AS TPCOMP99, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP01 ELSE BPEORI.VCOMP01 END AS VCOMP01, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP02 ELSE BPEORI.VCOMP02 END AS VCOMP02, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP03 ELSE BPEORI.VCOMP03 END AS VCOMP03, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP04 ELSE BPEORI.VCOMP04 END AS VCOMP04, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP05 ELSE BPEORI.VCOMP05 END AS VCOMP05, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP06 ELSE BPEORI.VCOMP06 END AS VCOMP06, ");
sql.append(" CASE WHEN BPE.UFINI IS NOT NULL THEN BPE.VCOMP99 ELSE BPEORI.VCOMP99 END AS VCOMP99, ");
sql.append(" CASE 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 ");
@ -599,41 +599,41 @@ 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(" 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.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 ");
@ -955,7 +955,6 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
sql.append(empresaId == null ? "" : "AND E.EMPRESA_ID IN (" + empresaId + ") ");
sql.append("AND B.CATEGORIA_ID NOT IN (SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = 'GRATUIDADE_CRIANCA') ");
sql.append("AND B.NUM_BPE IS NULL ");
sql.append("ORDER BY NOMB_EMPRESA, ESTADO, UF, FECHOR_DEVOLUCAO, NUMFOLIOSISTEMA");
return sql.toString();

22
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDevolucaoBilhetesController.java
View File

@ -147,20 +147,32 @@ public class RelatorioDevolucaoBilhetesController extends MyGenericForwardCompos
parametros.put("isBpe", bpe);
parametros.put("isConsultaOtimizada", consultaOtimizada.isChecked());
boolean isPuntoVentaTodos = false;
filtro.append("Agência(s): ");
if (puntoVentaSelList.getListData().size() > 0) {
List<PuntoVenta> puntoVentas = new ArrayList<PuntoVenta>();
for (Object obj : puntoVentaSelList.getListData()) {
puntoVentas.add((PuntoVenta) obj);
}
parametros.put("PUNTOVENTAS", puntoVentas);
parametros.put("ISNUMPUNTOVENTATODOS", "N");
filtro.append(puntoVentaSelList.getListData().size() + " selecionada(s);");
} else {
for (PuntoVenta pv : puntoVentas) {
if (pv.getPuntoventaId() == -1) {
isPuntoVentaTodos = true;
}
}
if (!isPuntoVentaTodos) {
parametros.put("PUNTOVENTAS", puntoVentas);
parametros.put("ISNUMPUNTOVENTATODOS", "N");
filtro.append(puntoVentaSelList.getListData().size() + " selecionada(s);");
}
}
if (isPuntoVentaTodos || !(puntoVentaSelList.getListData().size() > 0)) {
parametros.put("ISNUMPUNTOVENTATODOS", "S");
filtro.append("Todas");
}
filtro.append("; Estado(s): ");
if (estadoList.getSelectedsItens().size() > 0) {
parametros.put("ESTADOS", estadoList.getSelectedsItens());