diff --git a/.classpath b/.classpath index 772e70ca1..974c3578d 100644 --- a/.classpath +++ b/.classpath @@ -27,7 +27,7 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java index 6ffd5f4fb..30588c56f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java @@ -8,7 +8,7 @@ import java.sql.Statement; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; -import java.util.Date; +import java.util.Date; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; diff --git a/src/com/rjconsultores/ventaboletos/entidad/ClasseIndicePeaje.java b/src/com/rjconsultores/ventaboletos/entidad/ClasseIndicePeaje.java new file mode 100644 index 000000000..093da7764 --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/entidad/ClasseIndicePeaje.java @@ -0,0 +1,94 @@ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.math.BigDecimal; + +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.OneToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +import org.apache.commons.lang.builder.EqualsBuilder; + +@Entity +@SequenceGenerator(name = "CLASSE_INDICE_PEAJE_SEQ", sequenceName = "CLASSE_INDICE_PEAJE_SEQ", initialValue = 1) +@Table(name = "CLASSE_INDICE_PEAJE") +public class ClasseIndicePeaje implements Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "CLASSE_INDICE_PEAJE_ID") + @GeneratedValue(strategy = GenerationType.AUTO, generator = "CLASSE_INDICE_PEAJE_SEQ") + private Long id; + + @Column + private Boolean activo; + + @OneToOne + @JoinColumn(name = "CLASSE_SERVICIO_ID") + private ClaseServicio classeServicio; + + @ManyToOne + @JoinColumn(name = "ORGAOCONCEDENTE_ID") + private OrgaoConcedente orgaoConcedente; + + @Column(name = "INDICE_PEAJE") + private BigDecimal indicePeaje; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public ClaseServicio getClasseServicio() { + return classeServicio; + } + + public void setClasseServicio(ClaseServicio classeServicio) { + this.classeServicio = classeServicio; + } + + public OrgaoConcedente getOrgaoConcedente() { + return orgaoConcedente; + } + + public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } + + public BigDecimal getIndicePeaje() { + return indicePeaje; + } + + public void setIndicePeaje(BigDecimal indicePeaje) { + this.indicePeaje = indicePeaje; + } + + @Override + public boolean equals(Object obj) { + return new EqualsBuilder().append(this.id, ((ClasseIndicePeaje) obj).getId()).isEquals(); + } + + @Override + public String toString() { + return classeServicio.getDescclase() + " " + indicePeaje.toString(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/OrgaoCancelacion.java b/src/com/rjconsultores/ventaboletos/entidad/OrgaoCancelacion.java index 97f9923f0..7c8b5e595 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OrgaoCancelacion.java +++ b/src/com/rjconsultores/ventaboletos/entidad/OrgaoCancelacion.java @@ -18,8 +18,8 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; @Entity -@SequenceGenerator(name = "ORGAO_CANCELACION_SEQ", sequenceName = "ORGAO_CANCELACION_SEQ", allocationSize = 1) @Table(name = "ORGAO_CANCELACION") +@SequenceGenerator(name = "ORGAO_CANCELACION_SEQ", sequenceName = "ORGAO_CANCELACION_SEQ", allocationSize = 1) public class OrgaoCancelacion implements Serializable { private static final long serialVersionUID = 1L; @@ -119,4 +119,6 @@ public class OrgaoCancelacion implements Serializable { public void setIndnaopermitetransferencia(Boolean indnaopermitetransferencia) { this.indnaopermitetransferencia = indnaopermitetransferencia; } + + } diff --git a/src/com/rjconsultores/ventaboletos/entidad/OrgaoConcedente.java b/src/com/rjconsultores/ventaboletos/entidad/OrgaoConcedente.java index 8e679ec9d..cadcff8e4 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OrgaoConcedente.java +++ b/src/com/rjconsultores/ventaboletos/entidad/OrgaoConcedente.java @@ -2,10 +2,12 @@ package com.rjconsultores.ventaboletos.entidad; import java.io.Serializable; import java.math.BigDecimal; +import java.util.ArrayList; 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.GeneratedValue; @@ -20,7 +22,7 @@ import javax.persistence.TemporalType; @Entity @SequenceGenerator(name = "ORGAO_CONCEDENTE_SEQ", sequenceName = "ORGAO_CONCEDENTE_SEQ", allocationSize = 1) @Table(name = "ORGAO_CONCEDENTE") -public class OrgaoConcedente implements Serializable { +public class OrgaoConcedente implements Serializable { private static final long serialVersionUID = 1L; public final static Integer CODIGO_ARTESP = 21; @@ -47,18 +49,21 @@ public class OrgaoConcedente implements Serializable { @Column(name = "INDNOMDOCOBLIGATORIO") private Boolean indNomDocObligatorio; @OneToMany(mappedBy = "orgao") - private List orgaoCancelacionList; + private List orgaoCancelacionList; @Column(name = "INDICEPEAJE") private BigDecimal indicePeaje; - - public void addParametro(OrgaoCancelacion param){ + + @OneToMany(mappedBy = "orgaoConcedente", cascade = CascadeType.ALL) + private List classesIndicePeaje; + + public void addParametro(OrgaoCancelacion param) { this.orgaoCancelacionList.add(param); } - - public void removeParametro(OrgaoCancelacion param){ + + public void removeParametro(OrgaoCancelacion param) { this.orgaoCancelacionList.remove(param); } - + public Integer getOrgaoConcedenteId() { return orgaoConcedenteId; } @@ -114,8 +119,6 @@ public class OrgaoConcedente implements Serializable { public void setUsuarioId(Integer usuarioId) { this.usuarioId = usuarioId; } - - public List getCategoriaOrgaoList() { return categoriaOrgaoList; @@ -132,7 +135,7 @@ public class OrgaoConcedente implements Serializable { public void setIndNomDocObligatorio(Boolean indNomDocObligatorio) { this.indNomDocObligatorio = indNomDocObligatorio; } - + public List getOrgaoCancelacionList() { return orgaoCancelacionList; } @@ -149,6 +152,20 @@ public class OrgaoConcedente implements Serializable { this.indicePeaje = indicePeaje; } + public List getClassesIndicePeaje() { + List lsClasseIndicePeaje = new ArrayList(); + for (ClasseIndicePeaje classeIndicePeaje : this.classesIndicePeaje) { + if (classeIndicePeaje.getActivo()) { + lsClasseIndicePeaje.add(classeIndicePeaje); + } + } + return this.classesIndicePeaje = lsClasseIndicePeaje; + } + + public void setClassesIndicePeaje(List classesIndicePeaje) { + this.classesIndicePeaje = classesIndicePeaje; + } + @Override public String toString() { return descOrgao; @@ -178,4 +195,5 @@ public class OrgaoConcedente implements Serializable { return false; return true; } + }