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..66d864c62 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java @@ -150,7 +150,9 @@ public class RelatorioPassagensAGR extends Relatorio { } public String getMesAno(String data) { - if(!data.isEmpty()) { + if(data == null || data.isEmpty()) { + return ""; + } data = getData(data); DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); Date dateFormatada = null; @@ -162,9 +164,7 @@ 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) { @@ -250,14 +250,22 @@ 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(data == null || data.isEmpty()) { + 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(data == null || data.isEmpty()) { + return ""; + } + data = getData(data); DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); Date dateFormatada = null; @@ -269,8 +277,7 @@ public class RelatorioPassagensAGR extends Relatorio { DateFormat outputFormat = new SimpleDateFormat("HH:mm"); String dataDiaMes = outputFormat.format(dateFormatada); return dataDiaMes; - } - return ""; + } @Override @@ -341,7 +348,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 ");