From e883b630a06d7db695eddb7ee123b7393e423caa Mon Sep 17 00:00:00 2001 From: rogerio.costa Date: Wed, 30 Mar 2016 17:53:13 -0300 Subject: [PATCH] [3790] - Implementação das Credencial de Acesso a processos e documentos --- cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/CredencialProcessoDaoHibernate.java | 9 ++------- cit-ecm-api/src/main/java/br/com/centralit/api/model/UnidadeProcesso.java | 6 ++++++ cit-ecm-web/src/main/webapp/html/credencialProcesso/credencialProcesso.jsp | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/CredencialProcessoDaoHibernate.java b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/CredencialProcessoDaoHibernate.java index 7f14d83..579b7f5 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/CredencialProcessoDaoHibernate.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/CredencialProcessoDaoHibernate.java @@ -3,9 +3,6 @@ package br.com.centralit.api.dao.impl; import java.util.Collection; import java.util.LinkedList; -import org.hibernate.Criteria; -import org.hibernate.Session; -import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Repository; import br.com.centralit.api.dao.CredencialProcessoDao; @@ -14,9 +11,7 @@ import br.com.centralit.api.viewHelper.GrupoUsuarioVH; import br.com.centralit.framework.dao.arquitetura.CitGenericDAOImpl; import br.com.centralit.framework.dao.arquitetura.SearchSeven; import br.com.centralit.framework.model.Grupo; -import br.com.centralit.framework.model.Privilegio; import br.com.centralit.framework.model.Usuario; -import br.com.centralit.framework.util.UtilColecao; import br.com.centralit.framework.util.UtilObjeto; /** @@ -144,7 +139,7 @@ public class CredencialProcessoDaoHibernate extends CitGenericDAOImpl implements return this.searchUnique(searchSeven, persistentClass); } - + /** *

* Iniciativa(s): NUMERO_INICIATIVA @@ -200,7 +195,7 @@ public class CredencialProcessoDaoHibernate extends CitGenericDAOImpl implements searchSeven.addFilterEqual("usuario.id", idUsuario); - return UtilObjeto.isReferencia(this.search(searchSeven)); + return UtilObjeto.isReferencia(this.searchUnique(searchSeven)); } /** diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/UnidadeProcesso.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/UnidadeProcesso.java index 19013c3..689324d 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/UnidadeProcesso.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/UnidadeProcesso.java @@ -9,6 +9,7 @@ import javax.persistence.ManyToOne; import br.com.centralit.framework.json.Views; import br.com.centralit.framework.model.Unidade; +import br.com.centralit.framework.model.Usuario; import br.com.centralit.framework.model.arquitetura.PersistentObjectAudit; import com.fasterxml.jackson.annotation.JsonView; @@ -67,6 +68,11 @@ public class UnidadeProcesso extends PersistentObjectAudit { @JsonView({ Views.EnviarProcessoView.class }) private Unidade unidade; + /** Atributo usuarioResponsavel. */ + @ManyToOne(fetch = FetchType.LAZY) + @JsonView({ Views.EnviarProcessoView.class }) + private Usuario usuarioResponsavel; + /** Atributo eviarEmail. */ @JsonView({ Views.EnviarProcessoView.class }) private Boolean enviarEmail; diff --git a/cit-ecm-web/src/main/webapp/html/credencialProcesso/credencialProcesso.jsp b/cit-ecm-web/src/main/webapp/html/credencialProcesso/credencialProcesso.jsp index 9311ec3..a28fdf0 100644 --- a/cit-ecm-web/src/main/webapp/html/credencialProcesso/credencialProcesso.jsp +++ b/cit-ecm-web/src/main/webapp/html/credencialProcesso/credencialProcesso.jsp @@ -73,7 +73,7 @@ - {{credencialProcesso.grupo.nome}}{{credencialProcesso.usuario.username}}{{credencialProcesso.version}} + {{credencialProcesso.grupo.nome}}{{credencialProcesso.usuario.username}} {{credencialProcesso.usuario.unidade.nome}} {{credencialProcesso.permiteCredenciar ? $translate.instant('LABEL.SIM') : $translate.instant('LABEL.NAO')}} -- libgit2 0.21.2