From 332439830fad61b89e4e33f880a2305d1445b9b3 Mon Sep 17 00:00:00 2001
From: leonardo <leonardo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 11 Aug 2017 20:34:13 +0000
Subject: [PATCH] fixes bug #9523

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@72575 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/dao/SecretariaDAO.java            |  2 ++
 .../dao/hibernate/SecretariaHibernateDAO.java      | 11 +++++++++++
 .../ventaboletos/entidad/Secretaria.java           | 14 +++++++++++++-
 .../ventaboletos/service/SecretariaService.java    |  2 ++
 .../service/impl/SecretariaServiceImpl.java        |  5 +++++
 5 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/SecretariaDAO.java b/src/com/rjconsultores/ventaboletos/dao/SecretariaDAO.java
index e01f04529..1125a4c7f 100644
--- a/src/com/rjconsultores/ventaboletos/dao/SecretariaDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/SecretariaDAO.java
@@ -16,4 +16,6 @@ public interface SecretariaDAO extends GenericDAO<Secretaria, Integer> {
     public List<Secretaria> buscar(String descsecretaria, String cvesecretaria);
 
     public List<Secretaria> buscar(String descsecretaria);
+    
+    public Secretaria buscarSecretariaVoucherRod();
 }
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java
index 561d80dd2..bc3ef9bf6 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java
@@ -53,4 +53,15 @@ public class SecretariaHibernateDAO extends GenericHibernateDAO<Secretaria, Inte
 
         return c.list();
     }
+
+	@Override
+	public Secretaria buscarSecretariaVoucherRod() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+
+        c.add(Restrictions.eq("activo", Boolean.TRUE));
+        c.add(Restrictions.eq("indVoucherRod", Boolean.TRUE));
+
+        List<Secretaria> result = c.list();
+        return result.isEmpty() ? null : (Secretaria)result.get(0);
+	}
 }
diff --git a/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java b/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java
index 2d716bdca..96d6d4ce9 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java
@@ -70,8 +70,11 @@ public class Secretaria implements Serializable {
 	@OneToMany(cascade = CascadeType.ALL, mappedBy = "secretaria")
 	@LazyCollection(LazyCollectionOption.FALSE)
 	private List<SecretariaEmpresa> empresas = new ArrayList<SecretariaEmpresa>();
-
+	@Column(name = "INDVOUCHERROD")
+	private Boolean indVoucherRod;
+	
 	public Secretaria() {
+		this.indVoucherRod = false;
 	}
 
 	public SecretariaEmpresa addEmpresa(Empresa e) {
@@ -100,6 +103,7 @@ public class Secretaria implements Serializable {
 
 	public Secretaria(Integer secretariaId) {
 		this.secretariaId = secretariaId;
+		this.indVoucherRod = false;
 	}
 
 	public Integer getSecretariaId() {
@@ -204,6 +208,14 @@ public class Secretaria implements Serializable {
 
 	public void setValidaSerieSubSerie(Boolean validaSerieSubSerie) {
 		this.validaSerieSubSerie = validaSerieSubSerie;
+	}	
+
+	public Boolean getIndVoucherRod() {
+		return indVoucherRod;
+	}
+
+	public void setIndVoucherRod(Boolean indVoucherRod) {
+		this.indVoucherRod = indVoucherRod;
 	}
 
 	@Override
diff --git a/src/com/rjconsultores/ventaboletos/service/SecretariaService.java b/src/com/rjconsultores/ventaboletos/service/SecretariaService.java
index bc39156ef..603bedec4 100644
--- a/src/com/rjconsultores/ventaboletos/service/SecretariaService.java
+++ b/src/com/rjconsultores/ventaboletos/service/SecretariaService.java
@@ -16,4 +16,6 @@ public interface SecretariaService extends GenericService<Secretaria, Integer> {
     public List<Secretaria> buscar(String descsecretaria, String cvesecretaria);
 
     public List<Secretaria> buscar(String descsecretaria);
+    
+    public Secretaria buscarSecretariaVoucherRod();
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SecretariaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/SecretariaServiceImpl.java
index a88ba68c8..e0295c64b 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/SecretariaServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/SecretariaServiceImpl.java
@@ -73,4 +73,9 @@ public class SecretariaServiceImpl implements SecretariaService {
     public List<Secretaria> buscar(String descsecretaria) {
          return secretariaDAO.buscar(descsecretaria);
     }
+
+	@Override
+	public Secretaria buscarSecretariaVoucherRod() {
+		return secretariaDAO.buscarSecretariaVoucherRod();
+	}
 }