From 613f8afeef23cb7d85a5c55d70330965b47db186 Mon Sep 17 00:00:00 2001
From: luis <luis@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 14 Nov 2017 17:36:45 +0000
Subject: [PATCH] Issue #10054: ESPEC 001 Santa Cruz - Arredondamento ARTESP

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@76414 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/dao/RedondeoCtrlDAO.java             |  3 ++-
 .../dao/hibernate/RedondeoCtrlHibernateDAO.java       | 11 ++++++++---
 .../ventaboletos/entidad/RedondeoCtrl.java            | 10 ++++++++++
 .../ventaboletos/service/RedondeoCtrlService.java     |  3 ++-
 .../service/impl/RedondeoCtrlServiceImpl.java         |  5 +++--
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/RedondeoCtrlDAO.java b/src/com/rjconsultores/ventaboletos/dao/RedondeoCtrlDAO.java
index f7b76b6c7..b917e593f 100644
--- a/src/com/rjconsultores/ventaboletos/dao/RedondeoCtrlDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/RedondeoCtrlDAO.java
@@ -16,5 +16,6 @@ public interface RedondeoCtrlDAO extends GenericDAO<RedondeoCtrl, Integer> {
 
     public List<RedondeoCtrl> buscar(RedondeoCtrl redondeoCtrl);
 
-    public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento, Boolean indaplicapricing);
+    public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento, 
+    		Boolean indaplicapricing, Boolean indaplicaAtersp);
 }
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoCtrlHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoCtrlHibernateDAO.java
index 1b474de64..f88743a62 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoCtrlHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoCtrlHibernateDAO.java
@@ -57,7 +57,8 @@ public class RedondeoCtrlHibernateDAO extends GenericHibernateDAO<RedondeoCtrl,
 
     }
 
-    public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento, Boolean indaplicapricing) {
+    public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento, 
+    		Boolean indaplicapricing, Boolean indaplicaAtersp) {
 
         String ids = "";
         for (int i = 0; i < iDMarcas.length; i++) {
@@ -70,7 +71,9 @@ public class RedondeoCtrlHibernateDAO extends GenericHibernateDAO<RedondeoCtrl,
         hql.append(" join rc.redondeoList r  ");
         hql.append(" join rc.redondeoMarcaList rm  ");
         hql.append(" where rc.activo = 1 and r.activo = 1 and rm.activo = 1 ");
-        if (indaplicadescuento && !indaplicapricing) {
+        if (indaplicaAtersp) {
+            hql.append(" and rc.indaplicaArtesp = :aplicaArtesp ");
+        } else if (indaplicadescuento && !indaplicapricing) {
             hql.append(" and rc.indaplicadescuento = :aplicaDescuento ");
         } else if (!indaplicadescuento && indaplicapricing) {
             hql.append(" and rc.indaplicapricing = :aplicaPricing  ");
@@ -90,7 +93,9 @@ public class RedondeoCtrlHibernateDAO extends GenericHibernateDAO<RedondeoCtrl,
         sq.setDouble("vlrIni", valorinicial.doubleValue());
         sq.setDouble("vlrFin", valorfinal.doubleValue());
 
-        if (indaplicadescuento && !indaplicapricing) {
+        if (indaplicaAtersp) {
+            sq.setBoolean("aplicaArtesp", indaplicaAtersp);
+        } else if (indaplicadescuento && !indaplicapricing) {
             sq.setBoolean("aplicaDescuento", indaplicadescuento);
         } else if (!indaplicadescuento && indaplicapricing) {
             sq.setBoolean("aplicaPricing", indaplicapricing);
diff --git a/src/com/rjconsultores/ventaboletos/entidad/RedondeoCtrl.java b/src/com/rjconsultores/ventaboletos/entidad/RedondeoCtrl.java
index 795f4ce88..61154f3c8 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/RedondeoCtrl.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/RedondeoCtrl.java
@@ -40,6 +40,8 @@ public class RedondeoCtrl implements Serializable {
     private Boolean indaplicadescuento;
     @Column(name = "INDAPLICAPRICING")
     private Boolean indaplicapricing;
+    @Column(name = "INDAPLICAARTESP")
+    private Boolean indaplicaArtesp;
     @Column(name = "ACTIVO")
     private Boolean activo;
     @Column(name = "FECMODIF")
@@ -159,4 +161,12 @@ public class RedondeoCtrl implements Serializable {
     public String toString() {
         return "com.rjconsultores.ventaboletos.entidad.RedondeoCtrl[redondeoctrlId=" + redondeoctrlId + "]";
     }
+
+	public Boolean getIndaplicaArtesp() {
+		return indaplicaArtesp;
+	}
+
+	public void setIndaplicaArtesp(Boolean indaplicaArtesp) {
+		this.indaplicaArtesp = indaplicaArtesp;
+	}
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/RedondeoCtrlService.java b/src/com/rjconsultores/ventaboletos/service/RedondeoCtrlService.java
index ccbb24269..57fcea718 100644
--- a/src/com/rjconsultores/ventaboletos/service/RedondeoCtrlService.java
+++ b/src/com/rjconsultores/ventaboletos/service/RedondeoCtrlService.java
@@ -16,5 +16,6 @@ public interface RedondeoCtrlService extends GenericService<RedondeoCtrl, Intege
 
     public List<RedondeoCtrl> buscar(RedondeoCtrl redondeoCtrl);
 
-    public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento, Boolean indaplicapricing);
+    public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento, 
+    		Boolean indaplicapricing, Boolean indaplicaAtersp);
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RedondeoCtrlServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/RedondeoCtrlServiceImpl.java
index 5e67b8bac..c1cc92727 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/RedondeoCtrlServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/RedondeoCtrlServiceImpl.java
@@ -80,7 +80,8 @@ public class RedondeoCtrlServiceImpl implements RedondeoCtrlService {
         return redondeoCtrlDAO.buscar(redondeoCtrl);
     }
 
-    public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento, Boolean indaplicapricing) {
-        return redondeoCtrlDAO.buscarTraslapa(iDMarcas, valorinicial, valorfinal, indaplicadescuento, indaplicapricing);
+    public List<RedondeoCtrl> buscarTraslapa(Short[] iDMarcas, BigDecimal valorinicial, BigDecimal valorfinal, Boolean indaplicadescuento, 
+    		Boolean indaplicapricing, Boolean indaplicaAtersp) {
+        return redondeoCtrlDAO.buscarTraslapa(iDMarcas, valorinicial, valorfinal, indaplicadescuento, indaplicapricing, indaplicaAtersp);
     }
 }