[BCQ] Pagination query changes

crss-metering/crss-metering-dev.yml

@@ -100,4 +100,4 @@ bcq:
       SELECT COUNT(*) FROM TXN_BCQ_HEADER A INNER JOIN TXN_BCQ_UPLOAD_FILE B ON A.FILE_ID = B.FILE_ID
       WHERE A.TRADING_DATE = ?
     wrapper: >
-      {SELECT_QUERY} LIMIT {PAGE_NO} * {PAGE_SIZE} OFFSET {PAGE_SIZE}
+      {SELECT_QUERY} LIMIT ({PAGE_NO} + 1) * {PAGE_SIZE} OFFSET {PAGE_NO} * {PAGE_SIZE}

crss-metering/crss-metering.yml

@@ -115,5 +115,5 @@ bcq:
     wrapper: >
       SELECT SELLING_PARTICIPANT_NAME, SELLING_PARTICIPANT_SHORT_NAME, SELLING_MTN,
       BUYING_PARTICIPANT, TRADING_DATE, TRANSACTION_ID, SUBMITTED_DATE, STATUS
-      FROM (SELECT AB.*, ROWNUM RNUM FROM ({SELECT_QUERY}) AB WHERE ROWNUM < (({PAGE_NO} * {PAGE_SIZE}) + 1))
-      WHERE RNUM >= ((({PAGE_NO} - 1) * {PAGE_SIZE}) + 1)
+      FROM (SELECT AB.*, ROWNUM RNUM FROM ({SELECT_QUERY}) AB WHERE ROWNUM < ((({PAGE_NO} + 1) * {PAGE_SIZE}) + 1))
+      WHERE RNUM >= (({PAGE_NO} * {PAGE_SIZE}) + 1)