From b9cdce22ff5ad80fcf526269e3182fc942f040bb Mon Sep 17 00:00:00 2001
From: "lucas.taia" <lucas.taia@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 26 Nov 2013 13:18:36 +0000
Subject: [PATCH] Mantis 4730

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@32250 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/PricingOcupaAntecipaServiceImpl.java    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java
index 4045dbafe..ee499d678 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/PricingOcupaAntecipaServiceImpl.java
@@ -1,9 +1,9 @@
 package com.rjconsultores.ventaboletos.service.impl;
 
+import java.math.BigDecimal;
 import java.util.Calendar;
 import java.util.List;
 
-import org.jfree.util.Log;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,6 +75,11 @@ public class PricingOcupaAntecipaServiceImpl implements PricingOcupaAntecipaServ
 		Integer cantdiasmax = pricingOcupaAntecipa.getCantdiasmax();
 
 		boolean validaCantDias = ((cantdiasmin != null) && (cantdiasmax != null));
+		
+		BigDecimal cantdiasini = pricingOcupaAntecipa.getOcupacioninicial();
+		BigDecimal cantdiasfin = pricingOcupaAntecipa.getOcupacionfinal();
+		
+		boolean validaCantPorcentaje = ((cantdiasini != null) && (cantdiasfin != null));
 
 		for (PricingOcupaAntecipa poa : lsSalvos) {
 
@@ -91,8 +96,15 @@ public class PricingOcupaAntecipaServiceImpl implements PricingOcupaAntecipaServ
 					traslapaCantDias = TraslaparUtil.intersectNum(poa.getCantdiasmin(), poa.getCantdiasmax(), cantdiasmin, cantdiasmax);
 				}
 			}
+			
+			boolean traslapaCantPorcentaje = false;
+			if (validaCantPorcentaje) {
+				if ((poa.getOcupacioninicial() != null) && (poa.getOcupacionfinal() != null)) {
+					traslapaCantPorcentaje = TraslaparUtil.intersectNum(poa.getOcupacioninicial(), poa.getOcupacionfinal(), cantdiasini, cantdiasfin);
+				}
+			}
 
-			if (traslapaCantAsiento || traslapaCantDias) {
+			if (traslapaCantAsiento || traslapaCantDias || traslapaCantPorcentaje) {
 				log.info("registro que traslapa PricingOcupaAntecipa id =" + poa.getPricingocupaantecipaId());
 
 				traslapa = true;