Download as
Browse Code »

Commit b551c4febe51f94656d6df33c65688faf76727bd

Authored by erick.sato
1 parent c46f18f6
Exists in master

[Redmine Atendimento #4709]Permissão alterar status bem não encontrado

Showing 5 changed files with 20 additions and 8 deletions   Show diff stats
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/BemPatrimonialService.java
  Diff comments   View file @b551c4f
... ... @@ -904,5 +904,5 @@ public interface BemPatrimonialService extends GenericService<BemPatrimonial, Lo
904 904 */
905 905 List<Long> buscaIdBensPorEntradaItem(Long entradaItemId);
906 906  
907   - void alterarStatusBemPatrimonialInventario(Dominio novoStatus, Long idBem);
  907 + void alterarStatusBemPatrimonialInventario(Dominio novoStatus, Long idBem, Long idInventarioBemPatrimonial);
908 908 }
... ...
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/BemPatrimonialServiceImpl.java
  Diff comments   View file @b551c4f
... ... @@ -2705,7 +2705,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl&lt;BemPatrimonial
2705 2705 dominioInconsistencia.setDominioTrataInconsistencia(this.dominioService.findByChaveAndCodigo(Dominio.TIPO_TRATAMENTO_INCONSISTENCIA, Dominio.TIPO_TRATAMENTO_STATUS_PATRIMONIO));
2706 2706  
2707 2707 DadosBemPatrimonial dadosBemPatrimonial = this.dadosBemPatrimonialService.find(inventarioBemPatrimonial.getDadosBemPatrimonial().getId());
2708   - alterarStatusBemPatrimonialInventario(tratamentoInconsistenciaVH.getNovoStatusBem(), dadosBemPatrimonial.getBemPatrimonial().getId());
  2708 + alterarStatusBemPatrimonialInventario(tratamentoInconsistenciaVH.getNovoStatusBem(), dadosBemPatrimonial.getBemPatrimonial().getId(), inventarioBemPatrimonial.getId());
2709 2709  
2710 2710 }
2711 2711 dominioInconsistencia.setInventarioBemPatrimonial(inventarioBemPatrimonial);
... ... @@ -2718,7 +2718,9 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl&lt;BemPatrimonial
2718 2718  
2719 2719 }
2720 2720  
2721   - public void alterarStatusBemPatrimonialInventario(Dominio novoStatus, Long idBem) {
  2721 + public void alterarStatusBemPatrimonialInventario(Dominio novoStatus, Long idBem, Long idInventarioBemPatrimonial) {
  2722 +
  2723 +
2722 2724 BemPatrimonial bemPatrimonial = this.getReference(idBem);
2723 2725 AlteracaoBemVH alteracaoBemVH = new AlteracaoBemVH();
2724 2726 alteracaoBemVH.setDataAlteracao(UtilDate.getDataAtualCalendar());
... ... @@ -2728,6 +2730,10 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl&lt;BemPatrimonial
2728 2730  
2729 2731 bemPatrimonial.setDominioStatus(novoStatus);
2730 2732 this.merge(bemPatrimonial);
  2733 +
  2734 + InventarioBemPatrimonial inventarioBemPatrimonial = this.inventarioBemPatrimonialService.find(idInventarioBemPatrimonial);
  2735 + inventarioBemPatrimonial.setDominioStatus(novoStatus);
  2736 + this.inventarioBemPatrimonialService.merge(inventarioBemPatrimonial);
2731 2737 }
2732 2738  
2733 2739 @Override
... ...
citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/BemPatrimonialController.java
  Diff comments   View file @b551c4f
... ... @@ -27,6 +27,7 @@ import br.com.centralit.api.service.AdicaoBemPrincipalService;
27 27 import br.com.centralit.api.service.BemPatrimonialService;
28 28 import br.com.centralit.api.service.DominioService;
29 29 import br.com.centralit.api.service.EntradaItemService;
  30 +import br.com.centralit.api.service.InventarioBemPatrimonialService;
30 31 import br.com.centralit.api.service.OrganizacaoService;
31 32 import br.com.centralit.api.service.TransferenciaService;
32 33 import br.com.centralit.api.service.UsuarioService;
... ... @@ -712,8 +713,8 @@ public class BemPatrimonialController extends GenericController&lt;BemPatrimonial&gt;
712 713  
713 714 @RequestMapping(value = "/alterarStatusBemPatrimonialInventario", method = RequestMethod.GET, produces = "application/json")
714 715 @ResponseBody
715   - public Boolean alterarStatusBemPatrimonialInventario(@RequestParam(value = "idDominioStatusBem") Long idDominioStatusBem, @RequestParam(value = "idBemPatrimonial") Long idBemPatrimonial) {
716   - this.bemPatrimonialService.alterarStatusBemPatrimonialInventario(this.dominioService.find(idDominioStatusBem), idBemPatrimonial);
  716 + public Boolean alterarStatusBemPatrimonialInventario(@RequestParam(value = "idDominioStatusBem") Long idDominioStatusBem, @RequestParam(value = "idBemPatrimonial") Long idBemPatrimonial, @RequestParam(value = "idInventarioBemPatrimonial") Long idInventarioBemPatrimonial) {
  717 + this.bemPatrimonialService.alterarStatusBemPatrimonialInventario(this.dominioService.find(idDominioStatusBem), idBemPatrimonial, idInventarioBemPatrimonial);
717 718 return true;
718 719 }
719 720  
... ...
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/InventarioController.js
  Diff comments   View file @b551c4f
... ... @@ -4197,7 +4197,7 @@ citApp.controller(&#39;InventarioController&#39;, [&#39;$scope&#39;, &#39;$filter&#39;, &#39;$translate&#39;, &#39;$
4197 4197 $scope.setLoadingSalva(true);
4198 4198 var idBem = $scope.dadosBemPatrimonialSelecionado['bemPatrimonial.id'] ? $scope.dadosBemPatrimonialSelecionado['bemPatrimonial.id'] : $scope.dadosBemPatrimonialSelecionado.bemPatrimonial.id;
4199 4199 // Salva a baixa
4200   - BemPatrimonialRepository.alterarStatusBemPatrimonialInventario(dominioStatusBem.id, idBem).then(function(result) {
  4200 + BemPatrimonialRepository.alterarStatusBemPatrimonialInventario(dominioStatusBem.id, idBem, $scope.dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.id).then(function(result) {
4201 4201 $timeout(function(){
4202 4202 // Salva a alteração do dominío inconsistência - Data tratamento
4203 4203 DominioRepository.buscaDominioByCodigoAndChave(2, 'tipoTratamentoInconsistencia').then(function(result) {
... ... @@ -4207,12 +4207,17 @@ citApp.controller(&#39;InventarioController&#39;, [&#39;$scope&#39;, &#39;$filter&#39;, &#39;$translate&#39;, &#39;$
4207 4207 });
4208 4208  
4209 4209 if($scope.executarAlteracaoStatusBemModalConfirm){
  4210 + $scope.dadosBemPatrimonialSelecionado.$showInconsistencias = false;
4210 4211 $scope.$modalConfirmInstance.dismiss('cancel');
4211 4212 $scope.tratarInconsistenciasAutomaticamente();
4212 4213 } else {
  4214 + $scope.dadosBemPatrimonialSelecionado.$showInconsistencias = false;
4213 4215 $scope.$modalInstance.dismiss('cancel');
4214 4216 $scope.setLoading(false);
4215 4217 }
  4218 + $scope.scrollToCadastro('#atualizarMultiplosBensPatrimoniais');
  4219 + $scope.getBensPatrimoniaisEstruturaOrganizacional($scope.estruturaOrganizacional);
  4220 + $scope.irParaFim();
4216 4221 });
4217 4222  
4218 4223 };
... ...
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/repository/BemPatrimonialRepository.js
  Diff comments   View file @b551c4f
... ... @@ -153,8 +153,8 @@ citApp.factory(&#39;BemPatrimonialRepository&#39;, [&#39;RestangularPatrimonio&#39;, &#39;AbstractRe
153 153 return restangularPatrimonio.one(this.route+"/veirificaTransferenciaMaisRecenteBemPatrimonial").get({"idBem": idBem}).then();
154 154 };
155 155  
156   - this.alterarStatusBemPatrimonialInventario = function(idStatusBem, idBem) {
157   - return restangularPatrimonio.one(this.route+"/alterarStatusBemPatrimonialInventario").get({"idDominioStatusBem": idStatusBem , "idBemPatrimonial": idBem}).then();
  156 + this.alterarStatusBemPatrimonialInventario = function(idStatusBem, idBem, idInventarioBemPatrimonial) {
  157 + return restangularPatrimonio.one(this.route+"/alterarStatusBemPatrimonialInventario").get({"idDominioStatusBem": idStatusBem , "idBemPatrimonial": idBem, "idInventarioBemPatrimonial": idInventarioBemPatrimonial}).then();
158 158 };
159 159  
160 160 }
... ...