From 317fa3887bfddccf120be9560c78dfa89396f725 Mon Sep 17 00:00:00 2001 From: Akhil S A <109232859+saakhil@users.noreply.github.com> Date: Fri, 3 May 2024 18:44:58 +0530 Subject: [PATCH] Cric 1880 new irb report request (#1833) --- .../services/org/broadinstitute/orsp/QueryService.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/grails-app/services/org/broadinstitute/orsp/QueryService.groovy b/grails-app/services/org/broadinstitute/orsp/QueryService.groovy index 04bbdeb5e..9315ae641 100644 --- a/grails-app/services/org/broadinstitute/orsp/QueryService.groovy +++ b/grails-app/services/org/broadinstitute/orsp/QueryService.groovy @@ -1995,7 +1995,9 @@ class QueryService implements Status { .append("LEFT JOIN ( ") .append("SELECT project_key, CONCAT(GROUP_CONCAT(CONCAT(' ', source, ': \"', name, '\"'))) as funding_source ") .append("FROM funding GROUP BY project_key) t3 ON t1.project_key = t3.project_key ") - .append("WHERE t1.type = 'IRB Project' AND (t1.status = 'Approved' OR t1.approval_status = 'Approved') ") + .append("WHERE t1.type = 'IRB Project' AND ( ") + .append("(t1.status = 'Approved' AND t1.approval_status != \"Withdrawn\" AND t1.approval_status != \"Closed\" AND t1.approval_status != \"Abandoned\") ") + .append("OR t1.approval_status = 'Approved') ") .append("GROUP BY t1.project_key, t1.request_date ORDER BY t1.request_date;") final SQLQuery sqlQuery = session.createSQLQuery(query) final result = sqlQuery.with {