From 5efce21efa8aa8ed1d726d6d1dd2675137487a1e Mon Sep 17 00:00:00 2001 From: "bruno.neves" Date: Thu, 31 Aug 2017 12:57:25 +0000 Subject: [PATCH] =?UTF-8?q?fixes=20bug=200009072=20-=20foi=20alterada=20a?= =?UTF-8?q?=20logica=20de=20inser=C3=A7=C3=A3o=20e=20remo=C3=A7=C3=A3o=20d?= =?UTF-8?q?o=20canal=20de=20venda=20e=20Agencia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@73359 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../entidad/PricingEspecificoAgencia.java | 37 ++++++++++++++++++- .../entidad/PricingEspecificoCanalVendas.java | 8 ++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoAgencia.java b/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoAgencia.java index a75f96901..f4f13fcc0 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoAgencia.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoAgencia.java @@ -92,6 +92,41 @@ public class PricingEspecificoAgencia implements Serializable { public void setPricingEspecifico(PricingEspecifico pricingEspecifico) { this.pricingEspecifico = pricingEspecifico; } - + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((activo == null) ? 0 : activo.hashCode()); + result = prime * result + ((pricingEspecifico == null) ? 0 : pricingEspecifico.hashCode()); + result = prime * result + ((puntoVenta == null) ? 0 : puntoVenta.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PricingEspecificoAgencia other = (PricingEspecificoAgencia) obj; + if (activo == null) { + if (other.activo != null) + return false; + } else if (!activo.equals(other.activo)) + return false; + if (pricingEspecifico == null) { + if (other.pricingEspecifico != null) + return false; + } else if (!pricingEspecifico.equals(other.pricingEspecifico)) + return false; + if (puntoVenta == null) { + if (other.puntoVenta != null) + return false; + } else if (!puntoVenta.equals(other.puntoVenta)) + return false; + return true; + } + } diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCanalVendas.java b/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCanalVendas.java index a0307d30d..8e8de1b93 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCanalVendas.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PricingEspecificoCanalVendas.java @@ -16,6 +16,10 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +/** + * @author Bruno Rodrigo + * + */ @Entity @SequenceGenerator(name = "PRICING_ESP_CANAL_SEQ", sequenceName = "PRICING_ESP_CANAL_SEQ", allocationSize = 1) @Table(name = "PRICING_ESP_CANAL_VENTA") @@ -128,6 +132,10 @@ public class PricingEspecificoCanalVendas implements Serializable { return false; return true; } + @Override + public String toString() { + return "PricingEspecificoCanalVendas [tipoPtovta=" + tipoPtovta + ", activo=" + activo + "]"; + } }