From cde7cd7f7b94f8670c706f919ddcdefecd865ce9 Mon Sep 17 00:00:00 2001 From: wilian Date: Wed, 20 May 2020 21:17:12 +0000 Subject: [PATCH] fixes bug#19271 dev:thiago qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@101708 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/relatorios/impl/RelatorioBPe.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java index d7cf3e298..006759d9c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java @@ -117,7 +117,8 @@ public class RelatorioBPe extends Relatorio { sql.append(" when '100' then ( "); sql.append(" case "); - sql.append(" when bpe.tiposubstituicao is null and bpeSub.bpe_id is null then 'Autorizado' "); + sql.append(" when bpe.tiposubstituicao is null and bpeSub.bpe_id is null and bpe.indcontingencia = 0 then 'Autorizado' "); + sql.append(" when bpe.tiposubstituicao is null and bpeSub.bpe_id is null and bpe.indcontingencia = 1 then 'Aut.Conting.' "); sql.append(" when bpe.tiposubstituicao is not null then 'Autorizado/Substitução' "); sql.append(" when bpeSub.bpe_id is not null then 'Autorizado/Substituído' "); sql.append(" else 'Autorizado' "); @@ -191,7 +192,7 @@ public class RelatorioBPe extends Relatorio { } else if (status != null && status.equals("R")) {//Rejeitado sql.append(" AND bpe.CODSTAT NOT IN ('100','135','102','150','-1','-2') "); }else if (status != null && status.equals("AA")) {//Autorizado Contingencia - sql.append(" AND bpe.CODSTAT = '150' AND bol.ACTIVO = 1 "); + sql.append(" AND bpe.CODSTAT IN ('100', '150') AND bpe.INDCONTINGENCIA = 1 AND bol.ACTIVO = 1 "); }else if (status != null && status.equals("RC")) {//Rejeitado Envio Contingencia sql.append(" AND bpe.CODSTAT IN ('-10','-20') AND bol.ACTIVO = 1 "); } else if (status != null && status.equals("PE")) {//Pendente Envio