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

fixes bug #7379 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@58791 d1611594-4594-4d17-8e1d-87c2c4800839
master
edgar 2016-08-05 14:13:02 +00:00
parent 15ee106eb4
commit fa8b4a6617
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java
View File

@ -483,7 +483,7 @@ public class EsquemaCorrida implements Serializable {
this.indCorridaExtra = indCorridaExtra; this.indCorridaExtra = indCorridaExtra;
} }
public void clone(EsquemaCorrida other){ /* public void clone(EsquemaCorrida other){
this.activo = other.activo; this.activo = other.activo;
this.cantDiasGeneracion = other.cantDiasGeneracion; this.cantDiasGeneracion = other.cantDiasGeneracion;
this.cantparados = other.cantparados; this.cantparados = other.cantparados;
@ -559,8 +559,7 @@ public class EsquemaCorrida implements Serializable {
} }
esquemaAsientoList.add(a); esquemaAsientoList.add(a);
} }
}*/
}
public Boolean getIndDiaSimDiaNao() { public Boolean getIndDiaSimDiaNao() {
return indDiaSimDiaNao; return indDiaSimDiaNao;

20
src/com/rjconsultores/ventaboletos/entidad/EsquemaTramo.java
View File

@ -26,7 +26,7 @@ import javax.persistence.SequenceGenerator;
@Entity @Entity
@SequenceGenerator(name = "ESQUEMA_TRAMO_SEQ", sequenceName = "ESQUEMA_TRAMO_SEQ", allocationSize = 1) @SequenceGenerator(name = "ESQUEMA_TRAMO_SEQ", sequenceName = "ESQUEMA_TRAMO_SEQ", allocationSize = 1)
@Table(name = "ESQUEMA_TRAMO") @Table(name = "ESQUEMA_TRAMO")
public class EsquemaTramo implements Serializable { public class EsquemaTramo implements Serializable, Comparable<EsquemaTramo> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@ -34,26 +34,34 @@ public class EsquemaTramo implements Serializable {
@Column(name = "ESQUEMATRAMO_ID") @Column(name = "ESQUEMATRAMO_ID")
@GeneratedValue(strategy = GenerationType.AUTO, generator = "ESQUEMA_TRAMO_SEQ") @GeneratedValue(strategy = GenerationType.AUTO, generator = "ESQUEMA_TRAMO_SEQ")
private Integer esquematramoId; private Integer esquematramoId;
@Column(name = "NUMSECUENCIA") @Column(name = "NUMSECUENCIA")
private Short numsecuencia; private Short numsecuencia;
@Column(name = "ACTIVO") @Column(name = "ACTIVO")
private Boolean activo; private Boolean activo;
@Column(name = "FECMODIF") @Column(name = "FECMODIF")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date fecmodif; private Date fecmodif;
@Column(name = "USUARIO_ID") @Column(name = "USUARIO_ID")
private Integer usuarioId; private Integer usuarioId;
@Column(name = "TIEMPOESTANCIA") @Column(name = "TIEMPOESTANCIA")
@Temporal(javax.persistence.TemporalType.TIMESTAMP) @Temporal(javax.persistence.TemporalType.TIMESTAMP)
private Date tiempoEstancia; private Date tiempoEstancia;
@JoinColumn(name = "TRAMO_ID", referencedColumnName = "TRAMO_ID") @JoinColumn(name = "TRAMO_ID", referencedColumnName = "TRAMO_ID")
@ManyToOne @ManyToOne
private Tramo tramo; private Tramo tramo;
@JoinColumn(name = "ESQUEMACORRIDA_ID", referencedColumnName = "ESQUEMACORRIDA_ID") @JoinColumn(name = "ESQUEMACORRIDA_ID", referencedColumnName = "ESQUEMACORRIDA_ID")
@ManyToOne @ManyToOne
private EsquemaCorrida esquemaCorrida; private EsquemaCorrida esquemaCorrida;
@Column(name = "PLATAFORMA") @Column(name = "PLATAFORMA")
private String plataforma; private String plataforma;
@Column(name = "EXCEPCIONRECORRIDO") @Column(name = "EXCEPCIONRECORRIDO")
private Date excepcionRecorrido; private Date excepcionRecorrido;
@ -167,4 +175,14 @@ public class EsquemaTramo implements Serializable {
public String toString() { public String toString() {
return "com.rjconsultores.ventaboletos.entidad.test.EsquemaTramo[esquematramoId=" + esquematramoId + "]"; return "com.rjconsultores.ventaboletos.entidad.test.EsquemaTramo[esquematramoId=" + esquematramoId + "]";
} }
@Override
public int compareTo(EsquemaTramo o) {
if (this.numsecuencia > o.getNumsecuencia()) {
return 1;
} else if (this.numsecuencia < o.getNumsecuencia()) {
return -1;
}
return 0;
}
} }