Download as
Browse Code »

Commit e883b630a06d7db695eddb7ee123b7393e423caa

Authored by rogerio.costa
1 parent 015a941a
Exists in master

[3790] - Implementação das Credencial de Acesso a processos e documentos

Showing 3 changed files with 9 additions and 8 deletions   Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/CredencialProcessoDaoHibernate.java
  Diff comments   View file @e883b63
@@ -3,9 +3,6 @@ package br.com.centralit.api.dao.impl; @@ -3,9 +3,6 @@ package br.com.centralit.api.dao.impl;
3 import java.util.Collection; 3 import java.util.Collection;
4 import java.util.LinkedList; 4 import java.util.LinkedList;
5 5
6 -import org.hibernate.Criteria;  
7 -import org.hibernate.Session;  
8 -import org.hibernate.criterion.Restrictions;  
9 import org.springframework.stereotype.Repository; 6 import org.springframework.stereotype.Repository;
10 7
11 import br.com.centralit.api.dao.CredencialProcessoDao; 8 import br.com.centralit.api.dao.CredencialProcessoDao;
@@ -14,9 +11,7 @@ import br.com.centralit.api.viewHelper.GrupoUsuarioVH; @@ -14,9 +11,7 @@ import br.com.centralit.api.viewHelper.GrupoUsuarioVH;
14 import br.com.centralit.framework.dao.arquitetura.CitGenericDAOImpl; 11 import br.com.centralit.framework.dao.arquitetura.CitGenericDAOImpl;
15 import br.com.centralit.framework.dao.arquitetura.SearchSeven; 12 import br.com.centralit.framework.dao.arquitetura.SearchSeven;
16 import br.com.centralit.framework.model.Grupo; 13 import br.com.centralit.framework.model.Grupo;
17 -import br.com.centralit.framework.model.Privilegio;  
18 import br.com.centralit.framework.model.Usuario; 14 import br.com.centralit.framework.model.Usuario;
19 -import br.com.centralit.framework.util.UtilColecao;  
20 import br.com.centralit.framework.util.UtilObjeto; 15 import br.com.centralit.framework.util.UtilObjeto;
21 16
22 /** 17 /**
@@ -144,7 +139,7 @@ public class CredencialProcessoDaoHibernate extends CitGenericDAOImpl implements @@ -144,7 +139,7 @@ public class CredencialProcessoDaoHibernate extends CitGenericDAOImpl implements
144 139
145 return this.searchUnique(searchSeven, persistentClass); 140 return this.searchUnique(searchSeven, persistentClass);
146 } 141 }
147 - 142 +
148 /** 143 /**
149 * <p> 144 * <p>
150 * <b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a> 145 * <b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a>
@@ -200,7 +195,7 @@ public class CredencialProcessoDaoHibernate extends CitGenericDAOImpl implements @@ -200,7 +195,7 @@ public class CredencialProcessoDaoHibernate extends CitGenericDAOImpl implements
200 195
201 searchSeven.addFilterEqual("usuario.id", idUsuario); 196 searchSeven.addFilterEqual("usuario.id", idUsuario);
202 197
203 - return UtilObjeto.isReferencia(this.search(searchSeven)); 198 + return UtilObjeto.isReferencia(this.searchUnique(searchSeven));
204 } 199 }
205 200
206 /** 201 /**
cit-ecm-api/src/main/java/br/com/centralit/api/model/UnidadeProcesso.java
  Diff comments   View file @e883b63
@@ -9,6 +9,7 @@ import javax.persistence.ManyToOne; @@ -9,6 +9,7 @@ import javax.persistence.ManyToOne;
9 9
10 import br.com.centralit.framework.json.Views; 10 import br.com.centralit.framework.json.Views;
11 import br.com.centralit.framework.model.Unidade; 11 import br.com.centralit.framework.model.Unidade;
  12 +import br.com.centralit.framework.model.Usuario;
12 import br.com.centralit.framework.model.arquitetura.PersistentObjectAudit; 13 import br.com.centralit.framework.model.arquitetura.PersistentObjectAudit;
13 14
14 import com.fasterxml.jackson.annotation.JsonView; 15 import com.fasterxml.jackson.annotation.JsonView;
@@ -67,6 +68,11 @@ public class UnidadeProcesso extends PersistentObjectAudit { @@ -67,6 +68,11 @@ public class UnidadeProcesso extends PersistentObjectAudit {
67 @JsonView({ Views.EnviarProcessoView.class }) 68 @JsonView({ Views.EnviarProcessoView.class })
68 private Unidade unidade; 69 private Unidade unidade;
69 70
  71 + /** Atributo usuarioResponsavel. */
  72 + @ManyToOne(fetch = FetchType.LAZY)
  73 + @JsonView({ Views.EnviarProcessoView.class })
  74 + private Usuario usuarioResponsavel;
  75 +
70 /** Atributo eviarEmail. */ 76 /** Atributo eviarEmail. */
71 @JsonView({ Views.EnviarProcessoView.class }) 77 @JsonView({ Views.EnviarProcessoView.class })
72 private Boolean enviarEmail; 78 private Boolean enviarEmail;
cit-ecm-web/src/main/webapp/html/credencialProcesso/credencialProcesso.jsp
  Diff comments   View file @e883b63
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 <tr ng-repeat="credencialProcesso in credenciais"> 73 <tr ng-repeat="credencialProcesso in credenciais">
74 74
75 <td class="text-center"><i class="{{credencialProcesso.icon}}" title="{{credencialProcesso.grupo ? $translate.instant('LABEL.GRUPO') : $translate.instant('LABEL.USUARIO')}}"></i></td> 75 <td class="text-center"><i class="{{credencialProcesso.icon}}" title="{{credencialProcesso.grupo ? $translate.instant('LABEL.GRUPO') : $translate.instant('LABEL.USUARIO')}}"></i></td>
76 - <td class="text-center">{{credencialProcesso.grupo.nome}}{{credencialProcesso.usuario.username}}{{credencialProcesso.version}}</td> 76 + <td class="text-center">{{credencialProcesso.grupo.nome}}{{credencialProcesso.usuario.username}}</td>
77 <td class="text-center">{{credencialProcesso.usuario.unidade.nome}}</td> 77 <td class="text-center">{{credencialProcesso.usuario.unidade.nome}}</td>
78 <td class="text-center">{{credencialProcesso.permiteCredenciar ? $translate.instant('LABEL.SIM') : $translate.instant('LABEL.NAO')}}</td> 78 <td class="text-center">{{credencialProcesso.permiteCredenciar ? $translate.instant('LABEL.SIM') : $translate.instant('LABEL.NAO')}}</td>
79 <td class="text-center"> 79 <td class="text-center">