diff --git a/src/com/rjconsultores/ventaboletos/entidad/EmpresaContaBancaria.java b/src/com/rjconsultores/ventaboletos/entidad/EmpresaContaBancaria.java index 52834ebae..87a00cb7b 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EmpresaContaBancaria.java +++ b/src/com/rjconsultores/ventaboletos/entidad/EmpresaContaBancaria.java @@ -131,7 +131,7 @@ public class EmpresaContaBancaria implements Serializable { if(this.getInstituicaoFinandeira().equals(oldObject.getInstituicaoFinandeira()) && this.getNumAgencia().equals(oldObject.getNumAgencia()) && this.getNumConta().equals(oldObject.getNumConta()) && - this.getNumIntegracion().equals(oldObject.getNumIntegracion()) && + (this.getNumIntegracion() != null && this.getNumIntegracion().equals(oldObject.getNumIntegracion())) && this.getActivo().equals(oldObject.getActivo())) { return true; } diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java b/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java index 78ed9043a..cbe6eaf74 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java @@ -69,6 +69,9 @@ public class PtovtaEmpresa implements Serializable { @JoinColumn(name = "EMPRESACONTABANCARIA_ID", referencedColumnName = "EMPRESACONTABANCARIA_ID") @ManyToOne private EmpresaContaBancaria empresaContaBancaria; + + @Column(name = "INDIMPCOMPCARTAO") + private Boolean indImpCompCartao; public PtovtaEmpresa() { } @@ -135,30 +138,27 @@ public class PtovtaEmpresa implements Serializable { @Override public int hashCode() { - int hash = 0; - hash += (ptovtaempresaId != null ? ptovtaempresaId.hashCode() : 0); - return hash; + final int prime = 31; + int result = 1; + result = prime * result + ((ptovtaempresaId == null) ? 0 : ptovtaempresaId.hashCode()); + return result; } @Override public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final PtovtaEmpresa other = (PtovtaEmpresa) obj; - if (this.activo != other.activo && (this.activo == null || !this.activo.equals(other.activo))) { - return false; - } - if (this.empresa != other.empresa && (this.empresa == null || !this.empresa.equals(other.empresa))) { - return false; - } - if (this.puntoVenta != other.puntoVenta && (this.puntoVenta == null || !this.puntoVenta.equals(other.puntoVenta))) { - return false; - } - return true; + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PtovtaEmpresa other = (PtovtaEmpresa) obj; + if (ptovtaempresaId == null) { + if (other.ptovtaempresaId != null) + return false; + } else if (!ptovtaempresaId.equals(other.ptovtaempresaId)) + return false; + return true; } @Override @@ -202,5 +202,14 @@ public class PtovtaEmpresa implements Serializable { public void setNumeroSitef(String numeroSitef) { this.numeroSitef = numeroSitef; - } + } + + public Boolean getIndImpCompCartao() { + return indImpCompCartao; + } + + public void setIndImpCompCartao(Boolean indImpCompCartao) { + this.indImpCompCartao = indImpCompCartao; + } + } \ No newline at end of file