Download as
Browse Code »

Commit d7f77322ffbc67eae86d1d88f12c64532ede3f5c

Authored by maycon.silva
2 parents 59527fab f678eb5b
Exists in master

Merge branch 'desenvolvimento' of http://ferramentasgo.centralit.com.br:8080/scm… 

…/git/cit-grp-ecm into desenvolvimento
Showing 3 changed files with 16 additions and 5 deletions   Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/model/ConteudoTarja.java
  Diff comments   View file @d7f7732
@@ -15,6 +15,7 @@ import org.hibernate.annotations.Type; @@ -15,6 +15,7 @@ import org.hibernate.annotations.Type;
15 import br.com.centralit.api.framework.json.ViewsEcm; 15 import br.com.centralit.api.framework.json.ViewsEcm;
16 import br.com.centralit.framework.json.Views; 16 import br.com.centralit.framework.json.Views;
17 import br.com.centralit.framework.model.AnexoImagem; 17 import br.com.centralit.framework.model.AnexoImagem;
  18 +import br.com.centralit.framework.model.arquitetura.PersistentObjectAudit;
18 19
19 import com.fasterxml.jackson.annotation.JsonView; 20 import com.fasterxml.jackson.annotation.JsonView;
20 21
@@ -31,7 +32,10 @@ import com.fasterxml.jackson.annotation.JsonView; @@ -31,7 +32,10 @@ import com.fasterxml.jackson.annotation.JsonView;
31 * 32 *
32 */ 33 */
33 @Entity 34 @Entity
34 -public class ConteudoTarja { 35 +public class ConteudoTarja extends PersistentObjectAudit {
  36 +
  37 + /** Atributo serialVersionUID. */
  38 + private static final long serialVersionUID = -7167017379907431453L;
35 39
36 /** Atributo id. */ 40 /** Atributo id. */
37 @Id 41 @Id
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java
  Diff comments   View file @d7f7732
@@ -218,8 +218,8 @@ public class InicializarEcmServiceImpl extends UtilStartup { @@ -218,8 +218,8 @@ public class InicializarEcmServiceImpl extends UtilStartup {
218 filesProcesso.add(new MenuFile("/cit-ecm-web/assets/js/angular/custom/repository/HistoricoAtribuicaoProcessoRepository.js", this.dominioJS, menuCadastroProcesso)); 218 filesProcesso.add(new MenuFile("/cit-ecm-web/assets/js/angular/custom/repository/HistoricoAtribuicaoProcessoRepository.js", this.dominioJS, menuCadastroProcesso));
219 filesProcesso.add(new MenuFile("/cit-ecm-web/assets/js/angular/custom/repository/HistoricoAtribuicaoProcessoRepository.min.js", this.dominioJS, menuCadastroProcesso)); 219 filesProcesso.add(new MenuFile("/cit-ecm-web/assets/js/angular/custom/repository/HistoricoAtribuicaoProcessoRepository.min.js", this.dominioJS, menuCadastroProcesso));
220 220
221 - filesProcesso.add(new MenuFile("/cit-ecm-web/assets/js/angular/custom/repository/MetadadoProcessoViewController.js", this.dominioJS, menuCadastroProcesso));  
222 - filesProcesso.add(new MenuFile("/cit-ecm-web/assets/js/angular/custom/repository/MetadadoProcessoViewController.min.js", this.dominioJS, menuCadastroProcesso)); 221 + filesProcesso.add(new MenuFile("/cit-ecm-web/assets/js/angular/custom/controller/MetadadoProcessoViewController.js", this.dominioJS, menuCadastroProcesso));
  222 + filesProcesso.add(new MenuFile("/cit-ecm-web/assets/js/angular/custom/controller/MetadadoProcessoViewController.min.js", this.dominioJS, menuCadastroProcesso));
223 223
224 menuCadastroProcesso.setIncludes(filesProcesso); 224 menuCadastroProcesso.setIncludes(filesProcesso);
225 this.menuService.mergeIfNotExist(menuCadastroProcesso); 225 this.menuService.mergeIfNotExist(menuCadastroProcesso);
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/ProcessoServiceImpl.java
  Diff comments   View file @d7f7732
@@ -32,6 +32,7 @@ import br.com.centralit.api.model.UnidadeProcesso; @@ -32,6 +32,7 @@ import br.com.centralit.api.model.UnidadeProcesso;
32 import br.com.centralit.api.service.CredencialProcessoService; 32 import br.com.centralit.api.service.CredencialProcessoService;
33 import br.com.centralit.api.service.DocumentoGedService; 33 import br.com.centralit.api.service.DocumentoGedService;
34 import br.com.centralit.api.service.DominioService; 34 import br.com.centralit.api.service.DominioService;
  35 +import br.com.centralit.api.service.EstruturaOrganizacionalECMService;
35 import br.com.centralit.api.service.GrupoService; 36 import br.com.centralit.api.service.GrupoService;
36 import br.com.centralit.api.service.HistoricoAlteracaoProcessoService; 37 import br.com.centralit.api.service.HistoricoAlteracaoProcessoService;
37 import br.com.centralit.api.service.HistoricoAtribuicaoProcessoService; 38 import br.com.centralit.api.service.HistoricoAtribuicaoProcessoService;
@@ -156,6 +157,9 @@ public class ProcessoServiceImpl extends GenericServiceImpl<Processo, Long> impl @@ -156,6 +157,9 @@ public class ProcessoServiceImpl extends GenericServiceImpl<Processo, Long> impl
156 157
157 @Autowired 158 @Autowired
158 private HistoricoAlteracaoProcessoService historicoAlteracaoProcessoService; 159 private HistoricoAlteracaoProcessoService historicoAlteracaoProcessoService;
  160 +
  161 + @Autowired
  162 + private EstruturaOrganizacionalECMService estruturaOrganizacionalECMService;
159 163
160 @Autowired 164 @Autowired
161 public ProcessoServiceImpl( final ProcessoDao processoDao, @Qualifier("processoValidator") final Validator validator ) { 165 public ProcessoServiceImpl( final ProcessoDao processoDao, @Qualifier("processoValidator") final Validator validator ) {
@@ -628,8 +632,11 @@ public class ProcessoServiceImpl extends GenericServiceImpl<Processo, Long> impl @@ -628,8 +632,11 @@ public class ProcessoServiceImpl extends GenericServiceImpl<Processo, Long> impl
628 } catch (final Exception e) { 632 } catch (final Exception e) {
629 throw new BusinessException("ECM.VALIDACAO.ERRO_UNIDADE_ECM_VIGENTE_USUARIO", CodigoErro.REGRA_NEGOCIO.getValue()); 633 throw new BusinessException("ECM.VALIDACAO.ERRO_UNIDADE_ECM_VIGENTE_USUARIO", CodigoErro.REGRA_NEGOCIO.getValue());
630 } 634 }
631 -  
632 - nup += unidadeVigenteUsuario.getCodigoSiorg() + "."; 635 + if(UtilObjeto.isReferencia(unidadeVigenteUsuario) && UtilObjeto.isReferencia(unidadeVigenteUsuario.getId())){
  636 + EstruturaOrganizacionalECM unidade = this.estruturaOrganizacionalECMService.getReference(unidadeVigenteUsuario.getId());
  637 + nup += unidade.getCodigoSiorg() + ".";
  638 + }
  639 +
633 nup += this.gerarSequencia() + "/"; 640 nup += this.gerarSequencia() + "/";
634 nup += new GregorianCalendar().get(Calendar.YEAR) + "-"; 641 nup += new GregorianCalendar().get(Calendar.YEAR) + "-";
635 processo.setNup(nup + this.calculaDvNupNovo(nup)); 642 processo.setNup(nup + this.calculaDvNupNovo(nup));