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

fixes bug#AL-5034

master
wallace.henrique 2024-10-01 18:15:49 -03:00
parent 9a0a55a5c8
commit 4bb158bc7c
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.148.0</version> <version>1.149.0</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

20
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGR.java
View File

@ -150,7 +150,9 @@ public class RelatorioPassagensAGR extends Relatorio {
} }
public String getMesAno(String data) { public String getMesAno(String data) {
if(!data.isEmpty()) { if(data == null || data.isEmpty()) {
return "";
}
data = getData(data); data = getData(data);
DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
Date dateFormatada = null; Date dateFormatada = null;
@ -162,9 +164,7 @@ public class RelatorioPassagensAGR extends Relatorio {
DateFormat outputFormat = new SimpleDateFormat("dd/MM"); DateFormat outputFormat = new SimpleDateFormat("dd/MM");
String dataDiaMes = outputFormat.format(dateFormatada); String dataDiaMes = outputFormat.format(dateFormatada);
return dataDiaMes; return dataDiaMes;
}
return "";
} }
public static String mascaraDOC(String document) { public static String mascaraDOC(String document) {
@ -250,6 +250,11 @@ public class RelatorioPassagensAGR extends Relatorio {
} }
private String getDataCompleta(String data) { private String getDataCompleta(String data) {
if(data == null || data.isEmpty()) {
return "";
}
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime dateTime = LocalDateTime.parse(data, formatter); LocalDateTime dateTime = LocalDateTime.parse(data, formatter);
String formattedDate = dateTime.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")); String formattedDate = dateTime.format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
@ -257,7 +262,10 @@ public class RelatorioPassagensAGR extends Relatorio {
} }
public String getHora(String data) { public String getHora(String data) {
if(!data.isEmpty()) { if(data == null || data.isEmpty()) {
return "";
}
data = getData(data); data = getData(data);
DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
Date dateFormatada = null; Date dateFormatada = null;
@ -269,8 +277,7 @@ public class RelatorioPassagensAGR extends Relatorio {
DateFormat outputFormat = new SimpleDateFormat("HH:mm"); DateFormat outputFormat = new SimpleDateFormat("HH:mm");
String dataDiaMes = outputFormat.format(dateFormatada); String dataDiaMes = outputFormat.format(dateFormatada);
return dataDiaMes; return dataDiaMes;
}
return "";
} }
@Override @Override
@ -341,7 +348,6 @@ public class RelatorioPassagensAGR extends Relatorio {
sql.append("WHERE "); sql.append("WHERE ");
sql.append(" ( b.motivocancelacion_id NOT IN ( 4 ) "); sql.append(" ( b.motivocancelacion_id NOT IN ( 4 ) ");
sql.append(" OR b.motivocancelacion_id IS NULL ) "); sql.append(" OR b.motivocancelacion_id IS NULL ) ");
sql.append(" AND r.orgaoconcedente_id = 16 ");
if( fecInicioVenda != null && fecFinalVenda !=null ){ if( fecInicioVenda != null && fecFinalVenda !=null ){
sql.append(" AND b.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda "); sql.append(" AND b.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda ");