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

Merge pull request 'fixes bug#AL-3502' (!125) from AL-3502 into master 

Reviewed-on: adm/ModelWeb#125
Reviewed-by: Julio Heredia <julio@rjconsultores.com.br>
master
wallace 2023-12-01 19:44:06 +00:00
parent e7646b27c6 9ee788d8dd
commit 77f5cb2d5e
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId> <artifactId>ModelWeb</artifactId>
<version>1.26.4</version> <version>1.26.5</version>
<distributionManagement> <distributionManagement>
<repository> <repository>

16
src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java
View File

@ -1018,9 +1018,6 @@ public class CorridaServiceImpl implements CorridaService {
Boolean isFeriado = this.isFeriado(data, esquemaCorrida); Boolean isFeriado = this.isFeriado(data, esquemaCorrida);
corrida = generarCorrida(esquemaCorrida, dataGeracao, false, isFeriado); corrida = generarCorrida(esquemaCorrida, dataGeracao, false, isFeriado);
if(corrida != null) {
generarCorridaInfo(corrida, esquemaCorrida);
}
corridaPisoExtra = null; corridaPisoExtra = null;
corridaPisoExtra2 = null; corridaPisoExtra2 = null;
@ -1108,7 +1105,9 @@ public class CorridaServiceImpl implements CorridaService {
isFeriado); isFeriado);
} }
if(corrida != null) {
generarCorridaInfo(corrida, esquemaCorrida);
}
if (cantCorridaGenerada >= cantCorridaCommit) { if (cantCorridaGenerada >= cantCorridaCommit) {
cantCorridaGenerada = 0; cantCorridaGenerada = 0;
@ -1834,8 +1833,14 @@ public class CorridaServiceImpl implements CorridaService {
private void generarCorridaInfo(Corrida corrida, EsquemaCorrida esquemaCorrida) { private void generarCorridaInfo(Corrida corrida, EsquemaCorrida esquemaCorrida) {
if(corrida != null && corrida.getId() != null && corrida.getId().getFeccorrida() != null && corrida.getId().getCorridaId() != null) {
if(esquemaCorrida != null) {
List<EsquemaCorridaInfo> lsEsquemaCorridaInfo = esquemaCorridaInfoService.obtenerPorEsquemaCorrida(esquemaCorrida); List<EsquemaCorridaInfo> lsEsquemaCorridaInfo = esquemaCorridaInfoService.obtenerPorEsquemaCorrida(esquemaCorrida);
if(lsEsquemaCorridaInfo != null) {
for (EsquemaCorridaInfo esquemaCorridaInfo : lsEsquemaCorridaInfo) { for (EsquemaCorridaInfo esquemaCorridaInfo : lsEsquemaCorridaInfo) {
CorridaInfo corridaInfo = new CorridaInfo(); CorridaInfo corridaInfo = new CorridaInfo();
@ -1845,8 +1850,11 @@ public class CorridaServiceImpl implements CorridaService {
corridaInfo.setInfoCorrida(esquemaCorridaInfo.getInfoCorrida()); corridaInfo.setInfoCorrida(esquemaCorridaInfo.getInfoCorrida());
corridaInfoService.suscribir(corridaInfo); corridaInfoService.suscribir(corridaInfo);
} }
}
} }
}
}
} }