fixes bug#0012147

dev: fabricio
qua: 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@85412 d1611594-4594-4d17-8e1d-87c2c4800839

src/com/rjconsultores/ventaboletos/dao/OrgaoEmpParamDAO.java

@@ -0,0 +1,15 @@
+package com.rjconsultores.ventaboletos.dao;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.OrgaoEmpParam;
+
+public interface OrgaoEmpParamDAO extends GenericDAO<OrgaoEmpParam, Integer>  {
+
+    public List<OrgaoEmpParam> obterPorOrgao(Integer orgaoConcedenteId);
+    
+    public List<OrgaoEmpParam> obterPorEmpresa(Integer empresaId);
+    
+    public OrgaoEmpParam obterPorOrgaoEmpresa(Integer orgaoConcedenteId, Integer empresaId);
+
+}

src/com/rjconsultores/ventaboletos/dao/RutaDAO.java

@@ -54,6 +54,8 @@ public interface RutaDAO extends GenericDAO<Ruta, Integer> {
 
 	public List<Ruta> buscaRuta(String palavraPesquisaRuta);
 	
+	public List<Ruta> buscaRuta(String palavraPesquisaRuta, OrgaoConcedente orgao);
+	
 	public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao);
 
 	public List<Ruta> buscarPorRutaPorEmpresas(List<Empresa> lsEmpresas);

src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoEmpParamHibernateDAO.java

@@ -0,0 +1,56 @@
+package com.rjconsultores.ventaboletos.dao.hibernate;
+
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import com.rjconsultores.ventaboletos.dao.OrgaoEmpParamDAO;
+import com.rjconsultores.ventaboletos.entidad.OrgaoEmpParam;
+
+@Repository("orgaoEmpParamDAO")
+public class OrgaoEmpParamHibernateDAO extends GenericHibernateDAO<OrgaoEmpParam, Integer> implements OrgaoEmpParamDAO {
+
+    @Autowired
+    public OrgaoEmpParamHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+        setSessionFactory(factory);
+    }
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<OrgaoEmpParam> obterPorOrgao(Integer orgaoConcedenteId) {
+		Criteria criteria = createCriteria();
+		criteria.add(Restrictions.eq("orgaoConcedente.orgaoConcedenteId", orgaoConcedenteId));
+
+        return criteria.list();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<OrgaoEmpParam> obterPorEmpresa(Integer empresaId) {
+		Criteria criteria = createCriteria();
+		criteria.add(Restrictions.eq("empresa.empresaId", empresaId));
+
+        return criteria.list();
+	}
+
+	@Override
+	public OrgaoEmpParam obterPorOrgaoEmpresa(Integer orgaoConcedenteId, Integer empresaId) {
+		Criteria criteria = createCriteria();
+		criteria.add(Restrictions.eq("orgaoConcedente.orgaoConcedenteId", orgaoConcedenteId));
+		criteria.add(Restrictions.eq("empresa.empresaId", empresaId));
+		
+        return (OrgaoEmpParam) criteria.uniqueResult();
+	}
+
+	private Criteria createCriteria() {
+		Criteria criteria = getSession().createCriteria(getPersistentClass());
+		criteria.add(Restrictions.eq("activo", Boolean.TRUE));
+		return criteria;
+	}
+
+}

src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java

@@ -185,18 +185,27 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
 	}
 
 	public List<Ruta> buscaRuta(String palavraPesquisaRuta) {
+		return buscaRuta(palavraPesquisaRuta, null);
+	}
 
-		StringBuffer hql = new StringBuffer();
+	@Override
+	public List<Ruta> buscaRuta(String palavraPesquisaRuta, OrgaoConcedente orgao) {
+		StringBuilder hql = new StringBuilder();
 		hql.append(" FROM  Ruta    ");
-		hql.append("      WHERE  lower(descruta) like :palavraPesquisaRuta  ");
+		hql.append("      WHERE  (lower(descruta) like :palavraPesquisaRuta  ");
 		hql.append("  OR  prefixo like :palavraPesquisaRuta  ");
-		hql.append("  OR  str(numRuta) like :palavraPesquisaRuta  ");
+		hql.append("  OR  str(numRuta) like :palavraPesquisaRuta)  ");
+		if (orgao != null) {
+			hql.append("  AND orgaoConcedente.orgaoConcedenteId = :orgaoId  ");
+		}
 
 		Query sq = getSession().createQuery(hql.toString());
 		sq.setParameter("palavraPesquisaRuta", palavraPesquisaRuta.toLowerCase() + '%');
+		if (orgao != null) {
+			sq.setParameter("orgaoId", orgao.getOrgaoConcedenteId());
+		}
 
-		List<Ruta> lsRuta = sq.list();
+		return sq.list();
-		return lsRuta;
 	}
 
 	public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao) {

src/com/rjconsultores/ventaboletos/service/OrgaoEmpParamService.java

@@ -0,0 +1,15 @@
+package com.rjconsultores.ventaboletos.service;
+
+import java.util.List;
+
+import com.rjconsultores.ventaboletos.entidad.OrgaoEmpParam;
+
+public interface OrgaoEmpParamService {
+
+    public List<OrgaoEmpParam> obterPorOrgao(Integer orgaoConcedenteId);
+    
+    public List<OrgaoEmpParam> obterPorEmpresa(Integer empresaId);
+    
+    public OrgaoEmpParam obterPorOrgaoEmpresa(Integer orgaoConcedenteId, Integer empresaId);
+
+}

src/com/rjconsultores/ventaboletos/service/RutaService.java

@@ -85,6 +85,8 @@ public interface RutaService {
 
 	public List<Ruta> buscaRuta(String palavraPesquisaRuta);
 	
+	public List<Ruta> buscaRuta(String palavraPesquisaRuta, OrgaoConcedente orgao);
+	
 	public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao);
 	
 	public List<Ruta> buscarTodosEstos(Integer[] idRutas);

src/com/rjconsultores/ventaboletos/service/impl/OrgaoEmpParamServiceImpl.java

@@ -0,0 +1,33 @@
+package com.rjconsultores.ventaboletos.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.rjconsultores.ventaboletos.dao.OrgaoEmpParamDAO;
+import com.rjconsultores.ventaboletos.entidad.OrgaoEmpParam;
+import com.rjconsultores.ventaboletos.service.OrgaoEmpParamService;
+
+@Service("orgaoEmpParamService")
+public class OrgaoEmpParamServiceImpl implements OrgaoEmpParamService {
+
+	@Autowired
+	private OrgaoEmpParamDAO dao;
+
+	@Override
+	public List<OrgaoEmpParam> obterPorOrgao(Integer orgaoConcedenteId) {
+		return dao.obterPorOrgao(orgaoConcedenteId);
+	}
+
+	@Override
+	public List<OrgaoEmpParam> obterPorEmpresa(Integer empresaId) {
+		return dao.obterPorEmpresa(empresaId);
+	}
+
+	@Override
+	public OrgaoEmpParam obterPorOrgaoEmpresa(Integer orgaoConcedenteId, Integer empresaId) {
+		return dao.obterPorOrgaoEmpresa(orgaoConcedenteId, empresaId);
+	}
+
+}

src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java

@@ -500,6 +500,11 @@ public class RutaServiceImpl implements RutaService {
 		return rutaDAO.buscaRuta(palavraPesquisaRuta);
 	}
 
+	@Override
+	public List<Ruta> buscaRuta(String palavraPesquisaRuta, OrgaoConcedente orgao) {
+		return rutaDAO.buscaRuta(palavraPesquisaRuta, orgao);
+	}
+
 	public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao) {
 		return rutaDAO.buscaRutasFromOrgao(orgao);
 	}