diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaCtrl.java b/src/com/rjconsultores/ventaboletos/entidad/CategoriaCtrl.java index d84bca2c5..c62270b78 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CategoriaCtrl.java +++ b/src/com/rjconsultores/ventaboletos/entidad/CategoriaCtrl.java @@ -71,7 +71,8 @@ public class CategoriaCtrl implements Serializable, Cloneable { private List categoriaOrgaoList; @OneToMany(cascade = CascadeType.ALL, mappedBy = "categoriaCtrl") private List categoriaRutaList; - + @OneToMany(cascade = CascadeType.ALL, mappedBy = "categoriaCtrl") + private List categoriaRutaExcecaoList; public CategoriaCtrl() { } @@ -193,6 +194,19 @@ public class CategoriaCtrl implements Serializable, Cloneable { return tmp; } + + public List getCategoriaRutaExcecaoList() { + List tmp = new ArrayList(); + if (categoriaRutaExcecaoList != null) { + for (CategoriaRutaExcecao cm : categoriaRutaExcecaoList) { + if (cm.getActivo()) { + tmp.add(cm); + } + } + } + + return tmp; + } public void setCategoriaorgaoList(List categoriaOrgaoList) { this.categoriaOrgaoList = categoriaOrgaoList; @@ -201,6 +215,10 @@ public class CategoriaCtrl implements Serializable, Cloneable { public void setCategoriarutaList(List categoriaRutaList) { this.categoriaRutaList = categoriaRutaList; } + + public void setCategoriarutaExcecaoList(List categoriaRutaExcecaoList) { + this.categoriaRutaExcecaoList = categoriaRutaExcecaoList; + } public List getCategoriaMarcaList() { //return categoriaMarcaList; @@ -310,6 +328,14 @@ public class CategoriaCtrl implements Serializable, Cloneable { } return lsCategoriaRuta; } + + public List addNuevoCloneCategoriaRutaExcecao(List lsCategoriaRutaExcecao, CategoriaCtrl nuevo) { + for (CategoriaRutaExcecao categoriaRutaExcecao : lsCategoriaRutaExcecao) { + categoriaRutaExcecao.setCategoriaCtrl(nuevo); + categoriaRutaExcecao.setCategoriaRutaExcecaoId(null); + } + return lsCategoriaRutaExcecao; + } public List addNuevoCloneCategoriaCorrida(List lsCategoriaCorrida, CategoriaCtrl nuevo) { for (CategoriaCorrida categoriaCorrida : lsCategoriaCorrida) { diff --git a/src/com/rjconsultores/ventaboletos/entidad/CategoriaRutaExcecao.java b/src/com/rjconsultores/ventaboletos/entidad/CategoriaRutaExcecao.java new file mode 100644 index 000000000..f3dbe069d --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/entidad/CategoriaRutaExcecao.java @@ -0,0 +1,131 @@ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity +@SequenceGenerator(name = "CATEGORIA_RUTA_EXCECAO_SEQ", sequenceName = "CATEGORIA_RUTA_EXCECAO_SEQ", allocationSize = 1) +@Table(name = "CATEGORIA_RUTA_EXCECAO") +public class CategoriaRutaExcecao implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CATEGORIA_RUTA_EXCECAO_SEQ") + @Column(name = "CATEGORIARUTAEXCECAO_ID") + private Integer categoriaRutaExcecaoId; + @Column(name = "ACTIVO") + private Boolean activo; + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Column(name = "USUARIO_ID") + private Integer usuarioId; + @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") + @ManyToOne + private Ruta ruta; + @JoinColumn(name = "CATEGORIACTRL_ID", referencedColumnName = "CATEGORIACTRL_ID") + @ManyToOne + private CategoriaCtrl categoriaCtrl; + + public CategoriaRutaExcecao() { + } + + public CategoriaRutaExcecao(Integer categoriaRutaExcecaoId) { + this.categoriaRutaExcecaoId = categoriaRutaExcecaoId; + } + + public Integer getCategoriaRutaExcecaoId() { + return categoriaRutaExcecaoId; + } + + public void setCategoriaRutaExcecaoId(Integer categoriaRutaExcecaoId) { + this.categoriaRutaExcecaoId = categoriaRutaExcecaoId; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + public CategoriaCtrl getCategoriaCtrl() { + return categoriaCtrl; + } + + public void setCategoriaCtrl(CategoriaCtrl categoriaCtrl) { + this.categoriaCtrl = categoriaCtrl; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final CategoriaRutaExcecao other = (CategoriaRutaExcecao) obj; + if (this.ruta != other.ruta && (this.ruta == null || !this.ruta.equals(other.ruta))) { + return false; + } + if (this.categoriaCtrl != other.categoriaCtrl && (this.categoriaCtrl == null || !this.categoriaCtrl.equals(other.categoriaCtrl))) { + return false; + } + return true; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 97 * hash + (this.ruta != null ? this.ruta.hashCode() : 0); + hash = 97 * hash + (this.categoriaCtrl != null ? this.categoriaCtrl.hashCode() : 0); + return hash; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.CategoriaRutaExcecao[categoriaRutaExcecaoId=" + categoriaRutaExcecaoId + "]"; + } +}