From ba04075eb2612fb2554f8339fda262814f0ccdce Mon Sep 17 00:00:00 2001 From: "igor.rodrigo" Date: Mon, 17 Oct 2016 22:09:55 +0000 Subject: [PATCH] fixes bug #8112 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@61716 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/entidad/EsquemaCorrida.java | 13 +++++++++++++ .../service/impl/CorridaServiceImpl.java | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java b/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java index c4bde6eb5..0062e0a64 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java +++ b/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java @@ -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; + } + } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java index eb62ad1a5..d477bd636 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java @@ -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());