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

fixes bug #8112 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@61716 d1611594-4594-4d17-8e1d-87c2c4800839
master
igor.rodrigo 2016-10-17 22:09:55 +00:00
parent 42fc9d0484
commit ba04075eb2
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java
View File

@ -125,6 +125,10 @@ public class EsquemaCorrida implements Serializable {
private Boolean indCorridaExtra;
@Column(name = "INDDIASIMDIANAO")
private Boolean indDiaSimDiaNao;
@JoinColumn(name = "AUTOBUS_ID", referencedColumnName = "AUTOBUS_ID")
@ManyToOne(cascade = CascadeType.ALL)
private Autobus autoBus;
public enum GerarFeriado {
// Declaração dos enum
GERARSEMPRE("GERAR SEMPRE", "S"),
@ -594,4 +598,13 @@ public class EsquemaCorrida implements Serializable {
public String toString() {
return "com.rjconsultores.ventaboletos.entidad.test.EsquemaCorrida[esquemacorridaId=" + esquemacorridaId + "]";
}
public Autobus getAutoBus() {
return autoBus;
}
public void setAutoBus(Autobus autoBus) {
this.autoBus = autoBus;
}
}

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

@ -521,7 +521,7 @@ public class CorridaServiceImpl implements CorridaService {
corrida.setId(id);
corrida.setEsquemaCorrida(esquemaCorrida);
corrida.setCorridaCtrl(corridaCtrl);
corrida.setAutobus(null);
corrida.setAutobus(esquemaCorrida.getAutoBus()!= null ? esquemaCorrida.getAutoBus() : null);
corrida.setClaseServicio(esquemaCorrida.getClaseServicio());
corrida.setConductor(null);
if (esquemaCorrida.getIndCorridaExtra()) {
@ -595,7 +595,7 @@ public class CorridaServiceImpl implements CorridaService {
CorridaTramo corridaTramo = new CorridaTramo();
corridaTramo.setAutobus(null);
corridaTramo.setAutobus(esquemaCorrida.getAutoBus()!= null ? esquemaCorrida.getAutoBus() : null);
corridaTramo.setConductor(null);
corridaTramo.setConductor1(null);
corridaTramo.setPlataforma(esquemaTramo.getPlataforma());