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

Merge pull request 'fixes bug#AL-5034' (!750) from AL-5034 into master 

Reviewed-on: adm/VentaBoletosAdm#750
Reviewed-by: aristides <aristides@rjconsultores.com.br>
master 1.149.0
wallace 2024-10-01 21:30:54 +00:00
parent 9a0a55a5c8 3dec725980
commit ebc460dd9e
2 changed files with 23 additions and 14 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>

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

@ -13,6 +13,8 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang.StringUtils;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioPassagensAGRBean; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioPassagensAGRBean;
@ -150,7 +152,9 @@ public class RelatorioPassagensAGR extends Relatorio {
} }
public String getMesAno(String data) { public String getMesAno(String data) {
if(!data.isEmpty()) { if(StringUtils.isBlank(data)) {
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,13 +166,11 @@ 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) {
if (document == null || document.isEmpty()) { if(StringUtils.isBlank(document)) {
return ""; return "";
} }
String numericOnly = document.replaceAll("[^0-9]", ""); String numericOnly = document.replaceAll("[^0-9]", "");
@ -250,14 +252,23 @@ public class RelatorioPassagensAGR extends Relatorio {
} }
private String getDataCompleta(String data) { private String getDataCompleta(String data) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime dateTime = LocalDateTime.parse(data, formatter); if(StringUtils.isBlank(data)) {
String formattedDate = dateTime.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")); return "";
return formattedDate; }
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) { public String getHora(String data) {
if(!data.isEmpty()) {
if(StringUtils.isBlank(data)) {
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 +280,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 +351,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 ");