Merge pull request #1102 from deepikaarora88/Dev-2.0

fixed query for BPA PI search
upyog · May 16, 2024 · 5de6515 · 5de6515
2 parents 9270667 + c26f4cf
commit 5de6515
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...workflow-v2/src/main/java/org/egov/wf/repository/querybuilder/EscalationQueryBuilder.java b/...workflow-v2/src/main/java/org/egov/wf/repository/querybuilder/EscalationQueryBuilder.java
@@ -18,7 +18,7 @@ public class EscalationQueryBuilder {
 
     private static final String BASE_QUERY_BPA = "select businessId from (" +
             "  SELECT *,RANK () OVER (PARTITION BY businessId ORDER BY createdtime  DESC) rank_number " +
-            " FROM eg_wf_processinstance_v2 WHERE businessservice = ? AND tenantid= ? AND action in ('PAY','POST_PAYMENT_APPLY') wf  WHERE rank_number = 1 ";
+            " FROM eg_wf_processinstance_v2 WHERE businessservice = ? AND tenantid= ? AND action in ('PAY','POST_PAYMENT_APPLY') ) wf  WHERE rank_number = 1 ";
 
     private static final String QUERY_BPA = "select businessId from eg_wf_processinstance_v2 where businessid in ( ";
 

diff --git a/...v-workflow-v2/src/main/java/org/egov/wf/repository/querybuilder/WorkflowQueryBuilder.java b/...v-workflow-v2/src/main/java/org/egov/wf/repository/querybuilder/WorkflowQueryBuilder.java
@@ -50,9 +50,9 @@ public WorkflowQueryBuilder(WorkflowConfig config) {
     private static final String STATUS_COUNT_WRAPPER = "select  count(DISTINCT wf_id),cq.applicationStatus,cq.businessservice,cq.PI_STATUS as statusId from ({INTERNAL_QUERY}) as cq GROUP BY cq.applicationStatus,cq.businessservice,cq.PI_STATUS";
 
 
-    private static final String BASE_QUERY_BPA = "select businessId from (" +
+    private static final String BASE_QUERY_BPA = "select id from (" +
             "  SELECT *,RANK () OVER (PARTITION BY businessId ORDER BY createdtime  DESC) rank_number " +
-            " FROM eg_wf_processinstance_v2 WHERE businessservice = ? AND tenantid= ? AND action in ('PAY','POST_PAYMENT_APPLY') wf  WHERE rank_number = 1 ";
+            " FROM eg_wf_processinstance_v2 WHERE businessservice = ? AND tenantid= ? AND action in ('PAY','POST_PAYMENT_APPLY')) wf  WHERE rank_number = 1 ";
 
 
     private final String paginationWrapper = "SELECT * FROM "