Download as
Browse Code »

Commit baf90fcf8264d91333d682dd9caf4949ab295e27

Authored by rogerio.costa
1 parent 10343821
Exists in master

#4199 Change Request. Atribuir Processos a um usuário.

Showing 2 changed files with 12 additions and 11 deletions   Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java
  Diff comments   View file @baf90fc
... ... @@ -176,7 +176,7 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl<DocumentoGed, Lo
176 176 entity.setConteudo(this.decrypted(entity.getConteudoCriptografado()));
177 177 }
178 178  
179   - // this.saveSolr(entity);
  179 + this.saveSolr(entity);
180 180  
181 181 this.verificaTemporalidadeProcesso(entity);
182 182  
... ... @@ -401,14 +401,15 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl<DocumentoGed, Lo
401 401 *
402 402 */
403 403 public void executarAcoesDocumentoOnline(DocumentoGed documentoGed) {
404   - //Verifica se é um documento online
  404 +
  405 + // Verifica se é um documento online
405 406 if (documentoGed.getFormaCriacao().getCodigo().equals(1L)) {
406   -
  407 +
407 408 if (documentoGed.isNew()) {
408 409  
409 410 this.gerarNumeroDocumentOnline(documentoGed);
410   - }else{
411   -
  411 + } else {
  412 +
412 413 this.substituirParametrosDinamicos(documentoGed);
413 414 }
414 415  
... ... @@ -584,16 +585,16 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl<DocumentoGed, Lo
584 585 this.gerarVersao(entity, versaoAnterior);
585 586  
586 587 this.executarAcoesDocumentoOnline(entity);
587   -
  588 +
588 589 entity.setDataEdicao(Calendar.getInstance());
589   -
  590 +
590 591 entity.setId(null);
591 592  
592 593 entity = super.merge(entity);
593 594  
594 595 entity.setConteudo(this.decrypted(entity.getConteudoCriptografado()));
595 596  
596   - // this.saveSolr(entity);
  597 + this.saveSolr(entity);
597 598  
598 599 try {
599 600 if (anexo != null) {
... ...
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/ProcessoController.js
  Diff comments   View file @baf90fc
... ... @@ -53,6 +53,7 @@ citApp.controller('ProcessoController', ['$scope', 'ProcessoRepository', 'Domini
53 53 }
54 54  
55 55 $scope.removerPropriedades();
  56 +
56 57 $scope.setLoadingSalva(true);
57 58  
58 59 ProcessoRepository.save($scope.processo).then(function(result) {
... ... @@ -67,7 +68,7 @@ citApp.controller('ProcessoController', ['$scope', 'ProcessoRepository', 'Domini
67 68 acaoAlteracao : "INCLUSAO_PROCESSO"
68 69 };
69 70 HistoricoAlteracaoProcessoRepository.saveParams(historicoAlteracaoProcesso).then(function(result){
70   -
  71 + $scope.setLoadingSalva(false);
71 72 });
72 73 } else {
73 74 var historicoAlteracaoProcesso = {
... ... @@ -77,13 +78,12 @@ citApp.controller('ProcessoController', ['$scope', 'ProcessoRepository', 'Domini
77 78 acaoAlteracao : "ALTERACAO_METADADO_PROCESSO"
78 79 };
79 80 HistoricoAlteracaoProcessoRepository.saveParams(historicoAlteracaoProcesso).then(function(result){
80   -
  81 + $scope.setLoadingSalva(false);
81 82 });
82 83 }
83 84 $scope.processoForm.$submitted = false;
84 85 $scope.resetForm();
85 86 });
86   - $scope.setLoadingSalva(false);
87 87 }else{
88 88 //Mensagem de erro de campos obrigatorios não preenchidos
89 89 $scope.showAlert('error', $translate.instant('MSG.MN001'), " ", false);
... ...