diff --git a/crov-prase-controller/src/main/java/com/crov/prase/controller/prase/PagosPolizaController.java b/crov-prase-controller/src/main/java/com/crov/prase/controller/prase/PagosPolizaController.java index 5258bd4..7e4cfb8 100644 --- a/crov-prase-controller/src/main/java/com/crov/prase/controller/prase/PagosPolizaController.java +++ b/crov-prase-controller/src/main/java/com/crov/prase/controller/prase/PagosPolizaController.java @@ -98,7 +98,7 @@ public class PagosPolizaController extends ConnectionManager implements Serializ Predicate criterio1 = builder.equal(root.get("poliza").get("location"), location); Predicate criterio2 = builder.equal(root.get("estatusActivo"), GenericEnumType.ENABLED); Predicate criterio3 = builder.equal(root.get("pagoEstatus"), GenericEnumType.DISABLED); - Predicate criterio4 = builder.notEqual(root.get("poliza").get("estatus"), PolizaEstatus.CANCELADO); + Predicate criterio4 = builder.equal(root.get("poliza").get("active"), true); Predicate criterio5 = builder.greaterThanOrEqualTo(root.get("poliza").get("endDate").as(LocalDate.class), localHoy); Predicate startDatePredicate = builder.greaterThanOrEqualTo(root.get("fechaAPagar").as(LocalDate.class), localStartDate); Predicate endDatePredicate = builder.lessThanOrEqualTo(root.get("fechaAPagar").as(LocalDate.class), localEndDate); diff --git a/crov-prase-controller/src/main/java/com/crov/prase/controller/prase/PolizaController.java b/crov-prase-controller/src/main/java/com/crov/prase/controller/prase/PolizaController.java index e3aad27..d8543cf 100644 --- a/crov-prase-controller/src/main/java/com/crov/prase/controller/prase/PolizaController.java +++ b/crov-prase-controller/src/main/java/com/crov/prase/controller/prase/PolizaController.java @@ -12,7 +12,6 @@ import com.arrebol.taxiservicios.controller.util.HibernateUtil; import com.arrebol.taxiservicios.model.catalog.Location; import com.arrebol.taxiservicios.model.core.Address; import com.arrebol.taxiservicios.model.core.User; -import com.arrebol.taxiservicios.model.enums.PolizaEstatus; import com.crov.prase.model.prase.DetellePagoPoliza; import com.crov.prase.model.prase.PagosPoliza; import com.crov.prase.model.prase.Poliza; @@ -375,7 +374,7 @@ public class PolizaController extends ConnectionManager implements Serializable LocalDate localEndDate = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); Predicate criterio = builder.equal(root.get("active"), Boolean.TRUE); - Predicate criterio2 = builder.notEqual(root.get("estatus"), PolizaEstatus.CANCELADO); + Predicate criterio2 = builder.equal(root.get("active"), true); Predicate criterio3 = builder.equal(root.get("location"), location); Predicate startDatePredicate = builder.greaterThanOrEqualTo(root.get("endDate").as(LocalDate.class), localStartDate); Predicate endDatePredicate = builder.lessThanOrEqualTo(root.get("endDate").as(LocalDate.class), localEndDate);