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

Merge pull request 'fixes bug#AL-4214' (!243) from AL-4214 into master 

Reviewed-on: adm/ModelWeb#243
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master
Célio de Souza Ribeiro JR 2024-08-09 10:49:41 +00:00
parent 6ef6f7daa2 5f87be4994
commit d6076db704
2 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId> <artifactId>ModelWeb</artifactId>
<version>1.91.0</version> <version>1.92.0</version>
<distributionManagement> <distributionManagement>
<repository> <repository>

69
src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtra.java
View File

@ -98,6 +98,8 @@ public class TipoEventoExtra implements Serializable {
private String natureza; private String natureza;
@Column(name = "CONTACONTABIL") @Column(name = "CONTACONTABIL")
private String contaContabil; private String contaContabil;
@Column(name="INDQUANTVIASIMPRIMIR")
private Integer indQuantViasImp;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "tipoeventoextra") @OneToMany(cascade = CascadeType.ALL, mappedBy = "tipoeventoextra")
@LazyCollection(LazyCollectionOption.FALSE) @LazyCollection(LazyCollectionOption.FALSE)
private List<TipoEventoExtraEmpresa> empresas = new ArrayList<TipoEventoExtraEmpresa>(); private List<TipoEventoExtraEmpresa> empresas = new ArrayList<TipoEventoExtraEmpresa>();
@ -355,35 +357,7 @@ public class TipoEventoExtra implements Serializable {
public void setIndoperacion(Short indoperacion) { public void setIndoperacion(Short indoperacion) {
this.indoperacion = indoperacion; this.indoperacion = indoperacion;
} }
@Override
public int hashCode() {
int hash = 0;
hash += (tipoeventoextraId != null ? tipoeventoextraId.hashCode() : 0);
return hash;
}
@Override
public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof TipoEventoExtra)) {
return false;
}
TipoEventoExtra other = (TipoEventoExtra) object;
if ((this.tipoeventoextraId == null && other.tipoeventoextraId != null)
|| (this.tipoeventoextraId != null && !this.tipoeventoextraId
.equals(other.tipoeventoextraId))) {
return false;
}
return true;
}
@Override
public String toString() {
return descTipoEvento;
}
public String getNatureza() { public String getNatureza() {
return natureza; return natureza;
} }
@ -476,4 +450,41 @@ public class TipoEventoExtra implements Serializable {
this.impresionLayoutConfig = impresionLayoutConfig; this.impresionLayoutConfig = impresionLayoutConfig;
} }
public Integer getIndQuantViasImp() {
return indQuantViasImp;
}
public void setIndQuantViasImp(Integer indQuantViasImp) {
this.indQuantViasImp = indQuantViasImp;
}
@Override
public int hashCode() {
int hash = 0;
hash += (tipoeventoextraId != null ? tipoeventoextraId.hashCode() : 0);
return hash;
}
@Override
public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof TipoEventoExtra)) {
return false;
}
TipoEventoExtra other = (TipoEventoExtra) object;
if ((this.tipoeventoextraId == null && other.tipoeventoextraId != null)
|| (this.tipoeventoextraId != null && !this.tipoeventoextraId
.equals(other.tipoeventoextraId))) {
return false;
}
return true;
}
@Override
public String toString() {
return descTipoEvento;
}
} }