fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug #7867 - indice pegadagio por classe 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@60095 d1611594-4594-4d17-8e1d-87c2c4800839
master
edgar 2016-09-08 14:26:47 +00:00
parent 8d16dde676
commit 4a62420fab
5 changed files with 128 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -27,7 +27,7 @@
<classpathentry kind="lib" path="/LibreriasAdmVenta/ehcache-1.2.3.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/fckez.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/iText-2.1.7.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/javassist-3.9.0.GA.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/javassist-3.9.0.GA.jar" sourcepath="C:/Users/vpaiva/.m2/repository/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/jcommon.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/jdbc2_0-stdext.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/js.jar"/>
@ -89,7 +89,7 @@
<classpathentry kind="lib" path="/LibreriasAdmVenta/zcommon.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/zcommons-el.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/zhtml.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/zk.jar" sourcepath="C:/Users/rjgw/.m2/repository/org/zkoss/zk/zk/5.0.9/zk-5.0.9-sources.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/zk.jar" sourcepath="C:/Users/vpaiva/.m2/repository/org/zkoss/zk/zk/5.0.9/zk-5.0.9-sources.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/zkplus.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/zul.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/zweb.jar"/>

2
src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
View File

@ -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;

94
src/com/rjconsultores/ventaboletos/entidad/ClasseIndicePeaje.java 100644
View File

@ -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();
}
}

4
src/com/rjconsultores/ventaboletos/entidad/OrgaoCancelacion.java
View File

@ -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;
}
}

38
src/com/rjconsultores/ventaboletos/entidad/OrgaoConcedente.java
View File

@ -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<OrgaoCancelacion> orgaoCancelacionList;
private List<OrgaoCancelacion> orgaoCancelacionList;
@Column(name = "INDICEPEAJE")
private BigDecimal indicePeaje;
public void addParametro(OrgaoCancelacion param){
@OneToMany(mappedBy = "orgaoConcedente", cascade = CascadeType.ALL)
private List<ClasseIndicePeaje> 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<CategoriaOrgao> getCategoriaOrgaoList() {
return categoriaOrgaoList;
@ -132,7 +135,7 @@ public class OrgaoConcedente implements Serializable {
public void setIndNomDocObligatorio(Boolean indNomDocObligatorio) {
this.indNomDocObligatorio = indNomDocObligatorio;
}
public List<OrgaoCancelacion> getOrgaoCancelacionList() {
return orgaoCancelacionList;
}
@ -149,6 +152,20 @@ public class OrgaoConcedente implements Serializable {
this.indicePeaje = indicePeaje;
}
public List<ClasseIndicePeaje> getClassesIndicePeaje() {
List<ClasseIndicePeaje> lsClasseIndicePeaje = new ArrayList<ClasseIndicePeaje>();
for (ClasseIndicePeaje classeIndicePeaje : this.classesIndicePeaje) {
if (classeIndicePeaje.getActivo()) {
lsClasseIndicePeaje.add(classeIndicePeaje);
}
}
return this.classesIndicePeaje = lsClasseIndicePeaje;
}
public void setClassesIndicePeaje(List<ClasseIndicePeaje> classesIndicePeaje) {
this.classesIndicePeaje = classesIndicePeaje;
}
@Override
public String toString() {
return descOrgao;
@ -178,4 +195,5 @@ public class OrgaoConcedente implements Serializable {
return false;
return true;
}
}