diff --git a/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java b/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java index 809d44ac1..da646ffc8 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java +++ b/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java @@ -203,6 +203,37 @@ public class EsquemaCorrida implements Serializable, Auditavel { @Column(name = "MINUTOS_CONFIRMACAO") private Integer minutosParaConfirmacao; + @Column(name = "ISAUTOMACAOHORARIOEXTRA") + private Boolean isAutomacaoHorarioExtra; + + @Column(name = "TAXA_OCUPACAO") + private Integer taxaOcupacao; + + @Column(name = "HORAS_AUTOMACAO_HE_DE") + private Integer horasAutomacaoHEDe; + + @Column(name = "MINUTOS_AUTOMACAO_HE_DE") + private Integer minutosAutomacaoHEDe; + + @Column(name = "HORAS_AUTOMACAO_HE_ATE") + private Integer horasAutomacaoHEAte; + + @Column(name = "MINUTOS_AUTOMACAO_HE_ATE") + private Integer minutosAutomacaoHEAte; + + @JoinColumn(name = "ROLOPERATIVO_SERVICOEXTRA_ID", referencedColumnName = "ROLOPERATIVO_ID") + @ManyToOne(cascade = CascadeType.ALL) + private RolOperativo rolOperativoServicoExtra; + + @Column(name = "NUMCORRIDA_SERVICOEXTRA") + private Integer numCorridaServicoExtra; + + @Column(name = "BLOQUEIAINTERNET_HE") + private Boolean blolqueiaInternetHE; + + @Column(name = "PLATAFORMASERVICOEXTRA") + private String plataformaServicoExtra; + public enum GerarFeriado { // Declaração dos enum GERARSEMPRE("GERAR SEMPRE", "S"), @@ -546,84 +577,6 @@ public class EsquemaCorrida implements Serializable, Auditavel { this.indCorridaExtra = indCorridaExtra; } -/* public void clone(EsquemaCorrida other){ - this.activo = other.activo; - this.cantDiasGeneracion = other.cantDiasGeneracion; - this.cantparados = other.cantparados; - this.claseServicio = other.claseServicio; - this.claseServicio2 = other.claseServicio2; - this.diagramaAutobusId = other.diagramaAutobusId; - this.division = other.division; - this.empresa = other.empresa; - this.empresa1 = other.empresa1; - this.esquemaAgrupacionId = other.esquemaAgrupacionId; - this.esquemacorridaId = null; - this.esquemaCorridaRebote = other.esquemaCorridaRebote; - this.esquemaOperacional = other.esquemaOperacional; - this.fecmodif = other.fecmodif; - this.horasalida = other.horasalida; - this.indCorridaExtra = other.indCorridaExtra; - this.indDiaSimDiaNao = other.indDiaSimDiaNao; - this.inddomingo = other.inddomingo; - this.indGeneraFeriado = other.indGeneraFeriado; - this.indjueves = other.indjueves; - this.indlunes = other.indlunes; - this.indmartes = other.indmartes; - this.indmiercoles = other.indmiercoles; - this.indsabado = other.indsabado; - this.indviernes = other.indviernes; - this.infoCorrida = other.infoCorrida; - this.marca = other.marca; - this.numCorrida = other.numCorrida; - this.numCorridaPisoExtra = other.numCorridaPisoExtra; - this.pisoExtra = other.pisoExtra; - this.rolOperativo = other.rolOperativo; - this.rolOperativo2 = other.rolOperativo2; - this.ruta = other.ruta; - this.statusCorrida = other.statusCorrida; - this.tipocorrida = other.tipocorrida; - this.usuarioId = other.usuarioId; - - //this.esquemaAsientoList; - //this.esquemaTramoList; - - for (EsquemaTramo old : other.esquemaTramoList){ - EsquemaTramo et = new EsquemaTramo(); - et.setActivo(old.getActivo()); - et.setEsquemaCorrida(this); - et.setExcepcionRecorrido(old.getExcepcionRecorrido()); - et.setFecmodif(old.getFecmodif()); - et.setNumsecuencia(old.getNumsecuencia()); - et.setPlataforma(old.getPlataforma()); - et.setTiempoEstancia(old.getTiempoEstancia()); - et.setTramo(old.getTramo()); - et.setUsuarioId(old.getUsuarioId()); - if (esquemaTramoList == null){ - esquemaTramoList = new ArrayList(); - } - esquemaTramoList.add(et); - } - - for (EsquemaAsiento old : other.esquemaAsientoList){ - EsquemaAsiento a = new EsquemaAsiento(); - a.setActivo(old.getActivo()); - a.setDestino(old.getDestino()); - a.setEsquemaasientoId(null); - a.setEsquemaCorrida(this); - a.setFecmodif(old.getFecmodif()); - a.setIndvendible(old.getIndvendible()); - a.setMotivobloqueo(old.getMotivobloqueo()); - a.setNumasiento(old.getNumasiento()); - a.setParada(old.getParada()); - a.setTiempoLiberacion(old.getTiempoLiberacion()); - a.setUsuarioId(old.getUsuarioId()); - if (esquemaAsientoList == null){ - esquemaAsientoList = new ArrayList(); - } - esquemaAsientoList.add(a); - } - }*/ - public Boolean getIndDiaSimDiaNao() { return indDiaSimDiaNao; } @@ -813,6 +766,84 @@ public class EsquemaCorrida implements Serializable, Auditavel { public void setOcupacaoMinima(Integer ocupacaoMinima) { this.ocupacaoMinima = ocupacaoMinima; } - - + + public Boolean getIsAutomacaoHorarioExtra() { + return isAutomacaoHorarioExtra; + } + + public void setIsAutomacaoHorarioExtra(Boolean isAutomacaoHorarioExtra) { + this.isAutomacaoHorarioExtra = isAutomacaoHorarioExtra; + } + + public Integer getTaxaOcupacao() { + return taxaOcupacao; + } + + public void setTaxaOcupacao(Integer taxaOcupacao) { + this.taxaOcupacao = taxaOcupacao; + } + + public Integer getHorasAutomacaoHEDe() { + return horasAutomacaoHEDe; + } + + public void setHorasAutomacaoHEDe(Integer horasAutomacaoHEDe) { + this.horasAutomacaoHEDe = horasAutomacaoHEDe; + } + + public Integer getMinutosAutomacaoHEDe() { + return minutosAutomacaoHEDe; + } + + public void setMinutosAutomacaoHEDe(Integer minutosAutomacaoHEDe) { + this.minutosAutomacaoHEDe = minutosAutomacaoHEDe; + } + + public Integer getHorasAutomacaoHEAte() { + return horasAutomacaoHEAte; + } + + public void setHorasAutomacaoHEAte(Integer horasAutomacaoHEAte) { + this.horasAutomacaoHEAte = horasAutomacaoHEAte; + } + + public Integer getMinutosAutomacaoHEAte() { + return minutosAutomacaoHEAte; + } + + public void setMinutosAutomacaoHEAte(Integer minutosAutomacaoHEAte) { + this.minutosAutomacaoHEAte = minutosAutomacaoHEAte; + } + + public RolOperativo getRolOperativoServicoExtra() { + return rolOperativoServicoExtra; + } + + public void setRolOperativoServicoExtra(RolOperativo rolOperativoServicoExtra) { + this.rolOperativoServicoExtra = rolOperativoServicoExtra; + } + + public Integer getNumCorridaServicoExtra() { + return numCorridaServicoExtra; + } + + public void setNumCorridaServicoExtra(Integer numCorridaServicoExtra) { + this.numCorridaServicoExtra = numCorridaServicoExtra; + } + + public Boolean getBlolqueiaInternetHE() { + return blolqueiaInternetHE; + } + + public void setBlolqueiaInternetHE(Boolean blolqueiaInternetHE) { + this.blolqueiaInternetHE = blolqueiaInternetHE; + } + + public String getPlataformaServicoExtra() { + return plataformaServicoExtra; + } + + public void setPlataformaServicoExtra(String plataformaServicoExtra) { + this.plataformaServicoExtra = plataformaServicoExtra; + } } \ No newline at end of file