|
|
|
@ -52,6 +52,10 @@ public class GrantDaoImpl extends DatabaseAccess<Grant> implements GrantDao {
|
|
|
|
|
if (criteria.isPublic()) {
|
|
|
|
|
query.where((builder, root) -> builder.equal(root.join("dmps").get("status"), DMP.DMPStatus.FINALISED.getValue())).distinct();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (criteria.isActive()) {
|
|
|
|
|
query.where((builder, root) -> builder.notEqual(root.join("dmps").get("status"), DMP.DMPStatus.DELETED.getValue())).distinct();
|
|
|
|
|
}
|
|
|
|
|
if (criteria.getFunderId() != null && !criteria.getFunderId().trim().isEmpty())
|
|
|
|
|
query.where((builder, root) -> builder.equal(root.get("funder").get("id"), UUID.fromString(criteria.getFunderId())));
|
|
|
|
|
if (criteria.getFunderReference() != null && !criteria.getFunderReference().isEmpty())
|
|
|
|
|