From 8b33e9d16a840a8c8d585dcc56e59c3937c0d850 Mon Sep 17 00:00:00 2001 From: ROGERIO CASSIMIRO DE SOUZA Date: Mon, 2 May 2016 12:06:17 -0300 Subject: [PATCH] redmine #ecm-release-0001-sprint3 correcoes pos merge --- cit-ecm-api/src/main/java/br/com/centralit/api/model/ConteudoTarja.java | 6 +++++- cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java | 4 ++-- cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java | 11 +++++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/ConteudoTarja.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/ConteudoTarja.java index b1c7d40..e5748c6 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/ConteudoTarja.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/ConteudoTarja.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.Type; import br.com.centralit.api.framework.json.ViewsEcm; import br.com.centralit.framework.json.Views; import br.com.centralit.framework.model.AnexoImagem; +import br.com.centralit.framework.model.arquitetura.PersistentObjectAudit; import com.fasterxml.jackson.annotation.JsonView; @@ -31,7 +32,10 @@ import com.fasterxml.jackson.annotation.JsonView; * */ @Entity -public class ConteudoTarja { +public class ConteudoTarja extends PersistentObjectAudit { + + /** Atributo serialVersionUID. */ + private static final long serialVersionUID = -7167017379907431453L; /** Atributo id. */ @Id diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java index 934e9c9..3fbf2b2 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java @@ -218,8 +218,8 @@ public class InicializarEcmServiceImpl extends UtilStartup { filesProcesso.add(new MenuFile("/cit-ecm-web/assets/js/angular/custom/repository/HistoricoAtribuicaoProcessoRepository.js", this.dominioJS, menuCadastroProcesso)); filesProcesso.add(new MenuFile("/cit-ecm-web/assets/js/angular/custom/repository/HistoricoAtribuicaoProcessoRepository.min.js", this.dominioJS, menuCadastroProcesso)); - filesProcesso.add(new MenuFile("/cit-ecm-web/assets/js/angular/custom/repository/MetadadoProcessoViewController.js", this.dominioJS, menuCadastroProcesso)); - filesProcesso.add(new MenuFile("/cit-ecm-web/assets/js/angular/custom/repository/MetadadoProcessoViewController.min.js", this.dominioJS, menuCadastroProcesso)); + filesProcesso.add(new MenuFile("/cit-ecm-web/assets/js/angular/custom/controller/MetadadoProcessoViewController.js", this.dominioJS, menuCadastroProcesso)); + filesProcesso.add(new MenuFile("/cit-ecm-web/assets/js/angular/custom/controller/MetadadoProcessoViewController.min.js", this.dominioJS, menuCadastroProcesso)); menuCadastroProcesso.setIncludes(filesProcesso); this.menuService.mergeIfNotExist(menuCadastroProcesso); diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java index f573020..69a4679 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java @@ -32,6 +32,7 @@ import br.com.centralit.api.model.UnidadeProcesso; import br.com.centralit.api.service.CredencialProcessoService; import br.com.centralit.api.service.DocumentoGedService; import br.com.centralit.api.service.DominioService; +import br.com.centralit.api.service.EstruturaOrganizacionalECMService; import br.com.centralit.api.service.GrupoService; import br.com.centralit.api.service.HistoricoAlteracaoProcessoService; import br.com.centralit.api.service.HistoricoAtribuicaoProcessoService; @@ -156,6 +157,9 @@ public class ProcessoServiceImpl extends GenericServiceImpl impl @Autowired private HistoricoAlteracaoProcessoService historicoAlteracaoProcessoService; + + @Autowired + private EstruturaOrganizacionalECMService estruturaOrganizacionalECMService; @Autowired public ProcessoServiceImpl( final ProcessoDao processoDao, @Qualifier("processoValidator") final Validator validator ) { @@ -628,8 +632,11 @@ public class ProcessoServiceImpl extends GenericServiceImpl impl } catch (final Exception e) { throw new BusinessException("ECM.VALIDACAO.ERRO_UNIDADE_ECM_VIGENTE_USUARIO", CodigoErro.REGRA_NEGOCIO.getValue()); } - - nup += unidadeVigenteUsuario.getCodigoSiorg() + "."; + if(UtilObjeto.isReferencia(unidadeVigenteUsuario) && UtilObjeto.isReferencia(unidadeVigenteUsuario.getId())){ + EstruturaOrganizacionalECM unidade = this.estruturaOrganizacionalECMService.getReference(unidadeVigenteUsuario.getId()); + nup += unidade.getCodigoSiorg() + "."; + } + nup += this.gerarSequencia() + "/"; nup += new GregorianCalendar().get(Calendar.YEAR) + "-"; processo.setNup(nup + this.calculaDvNupNovo(nup)); -- libgit2 0.21.2