diff --git a/src/com/rjconsultores/ventaboletos/entidad/Pricing.java b/src/com/rjconsultores/ventaboletos/entidad/Pricing.java index 332fd67e3..15faeaacf 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Pricing.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Pricing.java @@ -226,10 +226,10 @@ public class Pricing implements Serializable { this.usuarioId = usuarioId; } - public List getPricingOcupaAntecipaList(Integer activo) { + public List getPricingOcupaAntecipaList() { List poaList = new ArrayList(); for (PricingOcupaAntecipa poa : this.pricingOcupaAntecipaList) { - if (poa.getActivo().equals(activo)) { + if (poa.getActivo() != EXCLUIDO.intValue()) { poaList.add(poa); } } @@ -240,10 +240,10 @@ public class Pricing implements Serializable { this.pricingOcupaAntecipaList = pricingOcupaAntecipaList; } - public List getPricingAsientoList(Integer activo) { + public List getPricingAsientoList() { List paList = new ArrayList(); for (PricingAsiento pa : this.pricingAsientoList) { - if (pa.getActivo().equals(activo)) { + if (pa.getActivo() != EXCLUIDO.intValue()) { paList.add(pa); } } @@ -255,10 +255,10 @@ public class Pricing implements Serializable { this.pricingAsientoList = pricingAsientoList; } - public List getPricingMercadoList(Integer activo) { + public List getPricingMercadoList() { List pmList = new ArrayList(); for (PricingMercado pm : this.pricingMercadoList) { - if (pm.getActivo().equals(activo)) { + if (pm.getActivo() != EXCLUIDO.intValue()) { pmList.add(pm); } } @@ -270,10 +270,10 @@ public class Pricing implements Serializable { this.pricingMercadoList = pricingMercadoList; } - public List getPricingMarcaList(Integer activo) { + public List getPricingMarcaList() { List pmList = new ArrayList(); for (PricingMarca pm : this.pricingMarcaList) { - if (pm.getActivo().equals(activo)) { + if (pm.getActivo() != EXCLUIDO.intValue()) { pmList.add(pm); } } @@ -293,10 +293,10 @@ public class Pricing implements Serializable { this.empresa = empresa; } - public List getPricingRutaList(Integer activo) { + public List getPricingRutaList() { List prList = new ArrayList(); for (PricingRuta pr : this.pricingRutaList) { - if (pr.getActivo().equals(activo)) { + if (pr.getActivo() != EXCLUIDO.intValue()) { prList.add(pr); } } @@ -308,10 +308,10 @@ public class Pricing implements Serializable { this.pricingRutaList = pricingRutaList; } - public List getPricingDiaList(Integer activo) { + public List getPricingDiaList() { List pdList = new ArrayList(); for (PricingDia pd : this.pricingDiaList) { - if (pd.getActivo().equals(activo)) { + if (pd.getActivo() != EXCLUIDO.intValue()) { pdList.add(pd); } } @@ -323,10 +323,10 @@ public class Pricing implements Serializable { this.pricingDiaList = pricingDiaList; } - public List getPricingImporteList(Integer activo) { + public List getPricingImporteList() { List piList = new ArrayList(); for (PricingImporte pi : this.pricingImporteList) { - if (pi.getActivo().equals(activo)) { + if (pi.getActivo() != EXCLUIDO.intValue()) { piList.add(pi); } } @@ -338,10 +338,10 @@ public class Pricing implements Serializable { this.pricingImporteList = pricingImporteList; } - public List getPricingTipoptovtaList(Integer activo) { + public List getPricingTipoptovtaList() { List ptList = new ArrayList(); for (PricingTipoPtoVta pt : this.pricingTipoptovtaList) { - if (pt.getActivo().equals(activo)) { + if (pt.getActivo() != EXCLUIDO.intValue()) { ptList.add(pt); } } @@ -353,10 +353,10 @@ public class Pricing implements Serializable { this.pricingTipoptovtaList = pricingTipoptovtaList; } - public List getPricingCategoriaList(Integer activo) { + public List getPricingCategoriaList() { List pcList = new ArrayList(); for (PricingCategoria pc : this.pricingCategoriaList) { - if (pc.getActivo().equals(activo)) { + if (pc.getActivo() != EXCLUIDO.intValue()) { pcList.add(pc); } } @@ -368,11 +368,11 @@ public class Pricing implements Serializable { this.pricingCategoriaList = pricingCategoriaList; } - public List getPricingVigenciaList(Integer activo) { + public List getPricingVigenciaList() { List pvList = new ArrayList(); if (this.pricingVigenciaList != null) { for (PricingVigencia pv : this.pricingVigenciaList) { - if (pv.getActivo().equals(activo)) { + if (pv.getActivo() != EXCLUIDO.intValue()) { pvList.add(pv); } } @@ -385,10 +385,10 @@ public class Pricing implements Serializable { this.pricingVigenciaList = pricingVigenciaList; } - public List getPricingClaseList(Integer activo) { + public List getPricingClaseList() { List pcList = new ArrayList(); for (PricingClase pc : this.pricingClaseList) { - if (pc.getActivo().equals(activo)) { + if (pc.getActivo() != EXCLUIDO.intValue()) { pcList.add(pc); } } @@ -400,14 +400,14 @@ public class Pricing implements Serializable { this.pricingClaseList = pricingClaseList; } - public List getPricingCorridaList(Integer activo) { + public List getPricingCorridaList() { List pcList = new ArrayList(); if (pricingCorridaList == null) { return null; } for (PricingCorrida pc : this.pricingCorridaList) { - if (pc.getActivo().equals(activo)) { + if (pc.getActivo() != EXCLUIDO.intValue()) { pcList.add(pc); } } @@ -419,10 +419,10 @@ public class Pricing implements Serializable { this.pricingCorridaList = pricingCorridaList; } - public List getPricingPuntoventaList(Integer activo) { + public List getPricingPuntoventaList() { List ppList = new ArrayList(); for (PricingPuntoVenta pp : this.pricingPuntoventaList) { - if (pp.getActivo().equals(activo)) { + if (pp.getActivo() != EXCLUIDO.intValue()) { ppList.add(pp); } } @@ -434,10 +434,10 @@ public class Pricing implements Serializable { this.pricingPuntoventaList = pricingPuntoventaList; } - public List getPricingTipoServicioList(Integer status) { + public List getPricingTipoServicioList() { List ppList = new ArrayList(); for (PricingTipoServicio pp : this.pricingTipoServicioList) { - if (pp.getActivo().equals(status)) { + if (pp.getActivo() != EXCLUIDO.intValue()) { ppList.add(pp); } } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/PricingServiceImpl.java index ac049f6ef..3dfa8fc0a 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PricingServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/PricingServiceImpl.java @@ -72,85 +72,85 @@ public class PricingServiceImpl implements PricingService { private void ativarInativarExcluirPricing(Pricing entidad, Integer statusPricing, Integer ativarInativarExcluir) { entidad = obtenerID(entidad.getPricingId()); - for (PricingAsiento pricingAsiento : entidad.getPricingAsientoList(statusPricing)) { + for (PricingAsiento pricingAsiento : entidad.getPricingAsientoList()) { pricingAsiento.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingAsiento.setFecmodif(Calendar.getInstance().getTime()); pricingAsiento.setActivo(ativarInativarExcluir); } - for (PricingCategoria pricingCategoria : entidad.getPricingCategoriaList(statusPricing)) { + for (PricingCategoria pricingCategoria : entidad.getPricingCategoriaList()) { pricingCategoria.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingCategoria.setFecmodif(Calendar.getInstance().getTime()); pricingCategoria.setActivo(ativarInativarExcluir); } - for (PricingClase pricingClase : entidad.getPricingClaseList(statusPricing)) { + for (PricingClase pricingClase : entidad.getPricingClaseList()) { pricingClase.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingClase.setFecmodif(Calendar.getInstance().getTime()); pricingClase.setActivo(ativarInativarExcluir); } - for (PricingCorrida pricingCorrida : entidad.getPricingCorridaList(statusPricing)) { + for (PricingCorrida pricingCorrida : entidad.getPricingCorridaList()) { pricingCorrida.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingCorrida.setFecmodif(Calendar.getInstance().getTime()); pricingCorrida.setActivo(ativarInativarExcluir); } - for (PricingDia pricingDia : entidad.getPricingDiaList(statusPricing)) { + for (PricingDia pricingDia : entidad.getPricingDiaList()) { pricingDia.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingDia.setFecmodif(Calendar.getInstance().getTime()); pricingDia.setActivo(ativarInativarExcluir); } - for (PricingImporte pricingImporte : entidad.getPricingImporteList(statusPricing)) { + for (PricingImporte pricingImporte : entidad.getPricingImporteList()) { pricingImporte.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingImporte.setFecmodif(Calendar.getInstance().getTime()); pricingImporte.setActivo(ativarInativarExcluir); } - for (PricingMarca pricingMarca : entidad.getPricingMarcaList(statusPricing)) { + for (PricingMarca pricingMarca : entidad.getPricingMarcaList()) { pricingMarca.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingMarca.setFecmodif(Calendar.getInstance().getTime()); pricingMarca.setActivo(ativarInativarExcluir); } - for (PricingMercado pricingMercado : entidad.getPricingMercadoList(statusPricing)) { + for (PricingMercado pricingMercado : entidad.getPricingMercadoList()) { pricingMercado.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingMercado.setFecmodif(Calendar.getInstance().getTime()); pricingMercado.setActivo(ativarInativarExcluir); } - for (PricingOcupaAntecipa pricingOcupaAntecipa : entidad.getPricingOcupaAntecipaList(statusPricing)) { + for (PricingOcupaAntecipa pricingOcupaAntecipa : entidad.getPricingOcupaAntecipaList()) { pricingOcupaAntecipa.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingOcupaAntecipa.setFecmodif(Calendar.getInstance().getTime()); pricingOcupaAntecipa.setActivo(ativarInativarExcluir); } - for (PricingPuntoVenta pricingPuntoVenta : entidad.getPricingPuntoventaList(statusPricing)) { + for (PricingPuntoVenta pricingPuntoVenta : entidad.getPricingPuntoventaList()) { pricingPuntoVenta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingPuntoVenta.setFecmodif(Calendar.getInstance().getTime()); pricingPuntoVenta.setActivo(ativarInativarExcluir); } - for (PricingRuta pricingRuta : entidad.getPricingRutaList(statusPricing)) { + for (PricingRuta pricingRuta : entidad.getPricingRutaList()) { pricingRuta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingRuta.setFecmodif(Calendar.getInstance().getTime()); pricingRuta.setActivo(ativarInativarExcluir); } - for (PricingTipoPtoVta pricingTipoPtoVta : entidad.getPricingTipoptovtaList(statusPricing)) { + for (PricingTipoPtoVta pricingTipoPtoVta : entidad.getPricingTipoptovtaList()) { pricingTipoPtoVta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingTipoPtoVta.setFecmodif(Calendar.getInstance().getTime()); pricingTipoPtoVta.setActivo(ativarInativarExcluir); } - for (PricingVigencia pricingVigencia : entidad.getPricingVigenciaList(statusPricing)) { + for (PricingVigencia pricingVigencia : entidad.getPricingVigenciaList()) { pricingVigencia.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingVigencia.setFecmodif(Calendar.getInstance().getTime()); pricingVigencia.setActivo(ativarInativarExcluir); } - for (PricingTipoServicio pricingTipoServicio : entidad.getPricingTipoServicioList(statusPricing)) { + for (PricingTipoServicio pricingTipoServicio : entidad.getPricingTipoServicioList()) { pricingTipoServicio.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingTipoServicio.setFecmodif(Calendar.getInstance().getTime()); pricingTipoServicio.setActivo(ativarInativarExcluir); @@ -242,10 +242,9 @@ public class PricingServiceImpl implements PricingService { private Pricing percorrerPricingAtivoParaClonar(Pricing pricing, Pricing clonePricing) { Integer ativar = Pricing.ATIVO; - Integer statusAtivo = Pricing.ATIVO; List pricingAsientoList = new ArrayList(); - for (PricingAsiento pricingAsiento : pricing.getPricingAsientoList(statusAtivo)) { + for (PricingAsiento pricingAsiento : pricing.getPricingAsientoList()) { PricingAsiento clonePricingAsiento = new PricingAsiento(); @@ -262,7 +261,7 @@ public class PricingServiceImpl implements PricingService { clonePricing.setPricingAsientoList(pricingAsientoList); List pricingCategoriaList = new ArrayList(); - for (PricingCategoria pricingCategoria : pricing.getPricingCategoriaList(statusAtivo)) { + for (PricingCategoria pricingCategoria : pricing.getPricingCategoriaList()) { PricingCategoria clonePricingCategoria = new PricingCategoria(); @@ -276,7 +275,7 @@ public class PricingServiceImpl implements PricingService { } clonePricing.setPricingCategoriaList(pricingCategoriaList); List pricingClaseList = new ArrayList(); - for (PricingClase pricingClase : pricing.getPricingClaseList(statusAtivo)) { + for (PricingClase pricingClase : pricing.getPricingClaseList()) { PricingClase clonePricingClase = new PricingClase(); @@ -291,7 +290,7 @@ public class PricingServiceImpl implements PricingService { clonePricing.setPricingClaseList(pricingClaseList); List pricingCorridaList = new ArrayList(); - for (PricingCorrida pricingCorrida : pricing.getPricingCorridaList(statusAtivo)) { + for (PricingCorrida pricingCorrida : pricing.getPricingCorridaList()) { PricingCorrida clonePricingCorrida = new PricingCorrida(); @@ -306,7 +305,7 @@ public class PricingServiceImpl implements PricingService { clonePricing.setPricingCorridaList(pricingCorridaList); List pricingDiaList = new ArrayList(); - for (PricingDia pricingDia : pricing.getPricingDiaList(statusAtivo)) { + for (PricingDia pricingDia : pricing.getPricingDiaList()) { PricingDia clonePricingDia = new PricingDia(); @@ -331,7 +330,7 @@ public class PricingServiceImpl implements PricingService { clonePricing.setPricingDiaList(pricingDiaList); List pricingImporteList = new ArrayList(); - for (PricingImporte pricingImporte : pricing.getPricingImporteList(statusAtivo)) { + for (PricingImporte pricingImporte : pricing.getPricingImporteList()) { PricingImporte clonePricingImporte = new PricingImporte(); @@ -347,7 +346,7 @@ public class PricingServiceImpl implements PricingService { clonePricing.setPricingImporteList(pricingImporteList); List pricingMarcaList = new ArrayList(); - for (PricingMarca pricingMarca : pricing.getPricingMarcaList(statusAtivo)) { + for (PricingMarca pricingMarca : pricing.getPricingMarcaList()) { PricingMarca clonePricingMarca = new PricingMarca(); @@ -362,7 +361,7 @@ public class PricingServiceImpl implements PricingService { clonePricing.setPricingMarcaList(pricingMarcaList); List pricingMercadoList = new ArrayList(); - for (PricingMercado pricingMercado : pricing.getPricingMercadoList(statusAtivo)) { + for (PricingMercado pricingMercado : pricing.getPricingMercadoList()) { PricingMercado clonePricingMercado = new PricingMercado(); @@ -378,7 +377,7 @@ public class PricingServiceImpl implements PricingService { clonePricing.setPricingMercadoList(pricingMercadoList); List pricingOcupaAntecipaList = new ArrayList(); - for (PricingOcupaAntecipa pricingOcupaAntecipa : pricing.getPricingOcupaAntecipaList(statusAtivo)) { + for (PricingOcupaAntecipa pricingOcupaAntecipa : pricing.getPricingOcupaAntecipaList()) { PricingOcupaAntecipa clonePricingOcupaAntecipa = new PricingOcupaAntecipa(); @@ -398,7 +397,7 @@ public class PricingServiceImpl implements PricingService { clonePricing.setPricingOcupaAntecipaList(pricingOcupaAntecipaList); List pricingPuntoVentaList = new ArrayList(); - for (PricingPuntoVenta pricingPuntoVenta : pricing.getPricingPuntoventaList(statusAtivo)) { + for (PricingPuntoVenta pricingPuntoVenta : pricing.getPricingPuntoventaList()) { PricingPuntoVenta clonePricingPuntoVenta = new PricingPuntoVenta(); @@ -413,7 +412,7 @@ public class PricingServiceImpl implements PricingService { clonePricing.setPricingPuntoventaList(pricingPuntoVentaList); List pricingRutaList = new ArrayList(); - for (PricingRuta pricingRuta : pricing.getPricingRutaList(statusAtivo)) { + for (PricingRuta pricingRuta : pricing.getPricingRutaList()) { PricingRuta clonePricingRuta = new PricingRuta(); @@ -428,7 +427,7 @@ public class PricingServiceImpl implements PricingService { clonePricing.setPricingRutaList(pricingRutaList); List pricingTipoPtoVtaList = new ArrayList(); - for (PricingTipoPtoVta pricingTipoPtoVta : pricing.getPricingTipoptovtaList(statusAtivo)) { + for (PricingTipoPtoVta pricingTipoPtoVta : pricing.getPricingTipoptovtaList()) { PricingTipoPtoVta clonePricingTipoPtoVta = new PricingTipoPtoVta(); @@ -443,7 +442,7 @@ public class PricingServiceImpl implements PricingService { clonePricing.setPricingTipoptovtaList(pricingTipoPtoVtaList); List pricingVigenciaList = new ArrayList(); - for (PricingVigencia pricingVigencia : pricing.getPricingVigenciaList(statusAtivo)) { + for (PricingVigencia pricingVigencia : pricing.getPricingVigenciaList()) { PricingVigencia clonePricingVigencia = new PricingVigencia(); @@ -461,7 +460,7 @@ public class PricingServiceImpl implements PricingService { clonePricing.setPricingVigenciaList(pricingVigenciaList); List pricingTipoServicioList = new ArrayList(); - for (PricingTipoServicio pricingTipoServicio : pricing.getPricingTipoServicioList(statusAtivo)) { + for (PricingTipoServicio pricingTipoServicio : pricing.getPricingTipoServicioList()) { PricingTipoServicio clonePricingTipoServicio = new PricingTipoServicio(); clonePricingTipoServicio.setTipoServicio(pricingTipoServicio.getTipoServicio());