diff --git a/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoDAO.java b/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoDAO.java index 1457a8aa5..4bb806a7e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/PricingEspecificoDAO.java @@ -11,7 +11,7 @@ import java.util.List; * * @author Rafius */ -public interface PricingEspecificoDAO extends GenericDAO { +public interface PricingEspecificoDAO extends GenericDAO { public List buscarPorNome(PricingEspecifico pricingEspecifico); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoHibernateDAO.java index d67178826..fb77e1a24 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoHibernateDAO.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Repository; * @author Rafius */ @Repository("pricingEspecificoDAO") -public class PricingEspecificoHibernateDAO extends GenericHibernateDAO +public class PricingEspecificoHibernateDAO extends GenericHibernateDAO implements PricingEspecificoDAO { @Autowired diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java b/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java index c9e87c351..b784a90d0 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java @@ -6,15 +6,22 @@ package com.rjconsultores.ventaboletos.entidad; import java.io.Serializable; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collections; import java.util.Date; +import java.util.List; + import javax.persistence.Basic; +import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Temporal; @@ -77,6 +84,8 @@ public class PricingEspecifico implements Serializable { private Categoria categoria; @Column(name = "CORRIDA_ID") private Integer corridaId; + @OneToMany(mappedBy = "pricingEspecifico", cascade = CascadeType.ALL, fetch = FetchType.LAZY) + private List pricingEspecificoOcupacionsList; public PricingEspecifico() { } @@ -221,6 +230,20 @@ public class PricingEspecifico implements Serializable { this.corridaId = corridaId; } + public List getPricingEspecificoOcupacionsList() { + List peoList = new ArrayList(); + for (PricingEspecificoOcupacion peo : this.pricingEspecificoOcupacionsList) { + if (peo.getActivo()) { + peoList.add(peo); + } + } + return peoList; + } + + public void setPricingEspecificoOcupacionsList(List pricingEspecificoOcupacionsList) { + this.pricingEspecificoOcupacionsList = pricingEspecificoOcupacionsList; + } + @Override public int hashCode() { int hash = 0; diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoOcupacion.java b/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoOcupacion.java new file mode 100644 index 000000000..8b7128824 --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoOcupacion.java @@ -0,0 +1,146 @@ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; +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 = "PRICING_ESPECIFICO_OCUP_SEQ", sequenceName = "PRICING_ESPECIFICO_OCUP_SEQ", allocationSize = 1) +@Table(name = "PRICING_ESPECIFICO_OCUPACION") +public class PricingEspecificoOcupacion implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PRICING_ESPECIFICO_OCUP_SEQ") + @Column(name = "PRICINGESPECIFICOOCUPACION_ID") + private Integer pricingEspecificoOcupacionId; + @Column(name = "OCUPACIONINICIAL") + private BigDecimal ocupacioninicial; + @Column(name = "OCUPACIONFINAL") + private BigDecimal ocupacionfinal; + @Column(name = "TARIFA") + private BigDecimal tarifa; + @Basic(optional = false) + @Column(name = "ACTIVO") + private Boolean activo; + @Basic(optional = false) + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + @Basic(optional = false) + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + @JoinColumn(name = "PRICINGESPECIFICO_ID", referencedColumnName = "PRICINGESPECIFICO_ID") + @ManyToOne + private PricingEspecifico pricingEspecifico; + + public Integer getPricingEspecificoOcupacionId() { + return pricingEspecificoOcupacionId; + } + + public void setPricingEspecificoOcupacionId(Integer pricingEspecificoOcupacionId) { + this.pricingEspecificoOcupacionId = pricingEspecificoOcupacionId; + } + + public BigDecimal getOcupacioninicial() { + return ocupacioninicial; + } + + public void setOcupacioninicial(BigDecimal ocupacioninicial) { + this.ocupacioninicial = ocupacioninicial; + } + + public BigDecimal getOcupacionfinal() { + return ocupacionfinal; + } + + public void setOcupacionfinal(BigDecimal ocupacionfinal) { + this.ocupacionfinal = ocupacionfinal; + } + + public BigDecimal getTarifa() { + return tarifa; + } + + public void setTarifa(BigDecimal tarifa) { + this.tarifa = tarifa; + } + + 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 PricingEspecifico getPricingEspecifico() { + return pricingEspecifico; + } + + public void setPricingEspecifico(PricingEspecifico pricingEspecifico) { + this.pricingEspecifico = pricingEspecifico; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((pricingEspecificoOcupacionId == null) ? 0 : pricingEspecificoOcupacionId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PricingEspecificoOcupacion other = (PricingEspecificoOcupacion) obj; + if (pricingEspecificoOcupacionId == null) { + if (other.pricingEspecificoOcupacionId != null) + return false; + } else if (!pricingEspecificoOcupacionId.equals(other.pricingEspecificoOcupacionId)) + return false; + return true; + } + + @Override + public String toString() { + return "PricingEspecificoOcupacion [pricingEspecificoOcupacionId=" + pricingEspecificoOcupacionId + ", ocupacioninicial=" + ocupacioninicial + ", ocupacionfinal=" + ocupacionfinal + ", tarifa=" + tarifa + ", activo=" + activo + ", fecmodif=" + fecmodif + ", usuarioId=" + usuarioId + ", pricingEspecifico=" + pricingEspecifico + "]"; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/PricingEspecificoService.java b/src/com/rjconsultores/ventaboletos/service/PricingEspecificoService.java index b32edfc99..21f72cc2e 100644 --- a/src/com/rjconsultores/ventaboletos/service/PricingEspecificoService.java +++ b/src/com/rjconsultores/ventaboletos/service/PricingEspecificoService.java @@ -11,7 +11,7 @@ import java.util.List; * * @author Rafius */ -public interface PricingEspecificoService extends GenericService { +public interface PricingEspecificoService extends GenericService { public List buscarPorNome(PricingEspecifico pricingEspecifico); } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoServiceImpl.java index 07519f2e2..220abbb37 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoServiceImpl.java @@ -28,7 +28,7 @@ public class PricingEspecificoServiceImpl implements PricingEspecificoService { return pricingEspecificoDAO.obtenerTodos(); } - public PricingEspecifico obtenerID(Integer id) { + public PricingEspecifico obtenerID(Long id) { return pricingEspecificoDAO.obtenerID(id); }