Merge pull request #114 from viniciosarodrigues/develop

bug: ajuste em filtros de Procedimentos
NivLabs · May 22, 2020 · 315bb2b · 315bb2b
2 parents fc26a04 + c3f4a93
commit 315bb2b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/src/main/java/br/com/nivlabs/gp/controller/filters/ProcedureOrEventFilters.java b/src/main/java/br/com/nivlabs/gp/controller/filters/ProcedureOrEventFilters.java
@@ -13,21 +13,15 @@
 @EqualsAndHashCode(callSuper = true)
 public class ProcedureOrEventFilters extends CustomFilters {
 
-    private static final long serialVersionUID = -8122726857291316469L;
+	private static final long serialVersionUID = -8122726857291316469L;
 
-    private String id;
+	private String id;
 
-    private String description = "";
+	private String description = "";
 
-    private ActiveType activeType;
+	private ActiveType activeType;
 
-    public ActiveType getActiveType() {
-        if (activeType == null)
-            this.activeType = ActiveType.ACTIVE;
-        return this.activeType;
-    }
-
-    public String getDescription() {
-        return "%".concat(this.description).concat("%");
-    }
+	public String getDescription() {
+		return "%".concat(this.description).concat("%");
+	}
 }
diff --git a/...m/nivlabs/gp/repository/custom/procedureorevent/ProcedureOrEventRepositoryCustomImpl.java b/...m/nivlabs/gp/repository/custom/procedureorevent/ProcedureOrEventRepositoryCustomImpl.java
@@ -50,7 +50,7 @@ protected List<IExpression<ProcedureOrEvent>> createRestrictions(CustomFilters c
 			attributes.add((cb, from) -> cb.equal(from.get("id"), Long.parseLong(filters.getId())));
 		}
 		if (!StringUtils.isNullOrEmpty(filters.getDescription())) {
-			attributes.add((cb, from) -> cb.equal(from.get("description"), filters.getDescription()));
+			attributes.add((cb, from) -> cb.like(from.get("description"), filters.getDescription()));
 		}
 		if (filters.getActiveType() != null) {
 			attributes.add((cb, from) -> cb.equal(from.get("active"), filters.getActiveType() == ActiveType.ACTIVE));