diff --git a/pom.xml b/pom.xml index f76ebaed9..724aee00e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.148.0 + 1.149.0 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java index fe4e96f57..4bdd5fd5b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java @@ -13,6 +13,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import org.apache.commons.lang.StringUtils; + import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioPassagensAGRBean; @@ -150,7 +152,9 @@ public class RelatorioPassagensAGR extends Relatorio { } public String getMesAno(String data) { - if(!data.isEmpty()) { + if(StringUtils.isBlank(data)) { + return ""; + } data = getData(data); DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); Date dateFormatada = null; @@ -162,13 +166,11 @@ public class RelatorioPassagensAGR extends Relatorio { DateFormat outputFormat = new SimpleDateFormat("dd/MM"); String dataDiaMes = outputFormat.format(dateFormatada); return dataDiaMes; - } - - return ""; + } public static String mascaraDOC(String document) { - if (document == null || document.isEmpty()) { + if(StringUtils.isBlank(document)) { return ""; } String numericOnly = document.replaceAll("[^0-9]", ""); @@ -250,14 +252,23 @@ public class RelatorioPassagensAGR extends Relatorio { } private String getDataCompleta(String data) { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - LocalDateTime dateTime = LocalDateTime.parse(data, formatter); - String formattedDate = dateTime.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")); - return formattedDate; + + if(StringUtils.isBlank(data)) { + return ""; + } + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime dateTime = LocalDateTime.parse(data, formatter); + String formattedDate = dateTime.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")); + return formattedDate; } public String getHora(String data) { - if(!data.isEmpty()) { + + if(StringUtils.isBlank(data)) { + return ""; + } + data = getData(data); DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); Date dateFormatada = null; @@ -269,8 +280,7 @@ public class RelatorioPassagensAGR extends Relatorio { DateFormat outputFormat = new SimpleDateFormat("HH:mm"); String dataDiaMes = outputFormat.format(dateFormatada); return dataDiaMes; - } - return ""; + } @Override @@ -341,7 +351,6 @@ public class RelatorioPassagensAGR extends Relatorio { sql.append("WHERE "); sql.append(" ( b.motivocancelacion_id NOT IN ( 4 ) "); sql.append(" OR b.motivocancelacion_id IS NULL ) "); - sql.append(" AND r.orgaoconcedente_id = 16 "); if( fecInicioVenda != null && fecFinalVenda !=null ){ sql.append(" AND b.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda ");