From 11ae5e29aa16fd2582277ae1301b72734db7cba0 Mon Sep 17 00:00:00 2001
From: leonardo <leonardo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 3 Jul 2014 21:38:05 +0000
Subject: [PATCH] Catalogo Conf. OCD (fixed bug #5415)

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@36374 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/dao/OCDParamDAO.java             |  1 +
 .../dao/hibernate/OCDParamHibernateDAO.java       | 15 ++++++++++++++-
 .../ventaboletos/service/OCDParamService.java     |  1 +
 .../service/impl/OCDParamServiceImpl.java         | 10 ++++++++++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/OCDParamDAO.java b/src/com/rjconsultores/ventaboletos/dao/OCDParamDAO.java
index f7b638636..207f272c9 100644
--- a/src/com/rjconsultores/ventaboletos/dao/OCDParamDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/OCDParamDAO.java
@@ -7,6 +7,7 @@ import com.rjconsultores.ventaboletos.entidad.OCDParam;
 
 public interface OCDParamDAO extends GenericDAO<OCDParam, Integer> {
 	
+	public OCDParam suscribirActualizar(OCDParam entidad);
 	public OCDParam buscaOCDParamPorEmpresa(Empresa empresa);
 	public List<OCDParam> buscaOCDParams(Empresa empresa);
 }
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDParamHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDParamHibernateDAO.java
index a29f3d312..560b92a64 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDParamHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDParamHibernateDAO.java
@@ -3,6 +3,7 @@ package com.rjconsultores.ventaboletos.dao.hibernate;
 import java.util.List;
 
 import org.hibernate.Criteria;
+import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.criterion.Restrictions;
@@ -47,6 +48,18 @@ public class OCDParamHibernateDAO extends GenericHibernateDAO<OCDParam, Integer>
 		return params;
 	}
 
-	
+	@Override
+	public OCDParam suscribirActualizar(OCDParam entidad){
+		try {
+			if (entidad.getOcdparamId() != null){
+				this.getHibernateTemplate().merge(entidad);
+			} else {
+				this.getHibernateTemplate().save(entidad);
+			}
+			return entidad;
+		} catch (final HibernateException ex) {
+			throw convertHibernateAccessException(ex);
+		}
+	}
 
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/OCDParamService.java b/src/com/rjconsultores/ventaboletos/service/OCDParamService.java
index 6b56382c0..c17bbaa75 100644
--- a/src/com/rjconsultores/ventaboletos/service/OCDParamService.java
+++ b/src/com/rjconsultores/ventaboletos/service/OCDParamService.java
@@ -7,6 +7,7 @@ import com.rjconsultores.ventaboletos.entidad.OCDParam;
 
 public interface OCDParamService extends GenericService<OCDParam, Integer>  {
 	
+	public OCDParam suscribirActualizar(OCDParam entidad);
 	public OCDParam buscaOCDParamPorEmpresa(Empresa empresa);
 	public List<OCDParam> buscaOCDParams(Empresa empresa);
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/OCDParamServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/OCDParamServiceImpl.java
index 6d45a19b2..19e46e1bc 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/OCDParamServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/OCDParamServiceImpl.java
@@ -36,6 +36,16 @@ public class OCDParamServiceImpl implements OCDParamService {
 		OCDParam param = ocdParamDAO.obtenerID(id);		
 		return param;
 	}
+	
+	@Transactional
+	public OCDParam suscribirActualizar(OCDParam entidad){
+		OCDParam param = null;
+		
+		if (ocdParamDAO.buscaOCDParamPorEmpresa(entidad.getEmpresa()) == null){
+			param = ocdParamDAO.suscribirActualizar(entidad);
+		} 
+		return param;
+	}
 
 	@Transactional
 	public OCDParam suscribir(OCDParam entidad) {