diff --git a/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/BemPatrimonialServiceImpl.java b/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/BemPatrimonialServiceImpl.java index 9f0b89e..6e526e6 100644 --- a/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/BemPatrimonialServiceImpl.java +++ b/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/BemPatrimonialServiceImpl.java @@ -649,7 +649,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl(); } - if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante() != alteracaoBemVH.getVidaUtil() )) { + if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante().intValue() != alteracaoBemVH.getVidaUtil().intValue() )) { Dominio campoVidaUtilRestante = this.dominioService.findByChaveAndCodigo(DominioMaterial.CAMPO_REFERENCIA, DominioMaterial.CAMPO_REFERENCIA_BEM_PATRIMONIAL_VIDA_UTIL_RESTANTE_CODIGO); BemPatrimonialAlteracaoItem itemVidaUtil = new BemPatrimonialAlteracaoItem(campoVidaUtilRestante, bemPatrimonial.getVidaUtilRestante().toString(), alteracaoBemVH.getVidaUtil().toString()); @@ -1141,13 +1141,13 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl iterator = saida.getSaidaTemporariaItens().iterator(); iterator.hasNext();) { this.saidaTemporariaItemService.removeById(iterator.next().getId()); } + return super.removeById(saida.getId()); } + return false; - return super.removeById(saida.getId()); } /** diff --git a/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaServiceImpl.java b/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaServiceImpl.java index 0b087f9..8e261c5 100644 --- a/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaServiceImpl.java +++ b/citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaServiceImpl.java @@ -249,7 +249,7 @@ public class TransferenciaServiceImpl extends GenericServiceImpl