diff --git a/StoredProc/PROC_TRANSACTION_REPORT.sql b/StoredProc/PROC_TRANSACTION_REPORT.sql index e416213..06e86c5 100644 --- a/StoredProc/PROC_TRANSACTION_REPORT.sql +++ b/StoredProc/PROC_TRANSACTION_REPORT.sql @@ -135,7 +135,7 @@ BEGIN FROM REMITTRANTEMP RT(NOLOCK) LEFT JOIN TRANSENDERSTEMP TS (NOLOCK) ON TS.TRANID = RT.ID LEFT JOIN CUSTOMERMASTER CM (NOLOCK) ON CM.CUSTOMERID = TS.CUSTOMERID - WHERE 1=1' + WHERE 1=1 AND RT.PAYSTATUS<>''REJECT''' SET @sql2 = ' SELECT [IME_NO] = ''"''+ CASE WHEN '''+ISNULL(@usertype,'')+''' = ''A'' THEN ''''+DBO.FNADECRYPTSTRING(CONTROLNO)+'''' @@ -185,15 +185,15 @@ BEGIN FROM REMITTRAN RT(NOLOCK) LEFT JOIN TRANSENDERS TS (NOLOCK) ON TS.TRANID = RT.ID LEFT JOIN CUSTOMERMASTER CM (NOLOCK) ON CM.CUSTOMERID = TS.CUSTOMERID - where 1=1 ' + where 1=1 ' IF isnull(@dateFrom,'') <> '' AND isnull(@dateTo,'')<> '' BEGIN - SET @sql1 = @sql1 + ' and rt.createddate BETWEEN ''' + @dateFrom + ''' AND ''' + @dateTo + '''+'' 23:59:59''' - SET @sql2 = @sql2 + ' and rt.createddate BETWEEN ''' + @dateFrom + ''' AND ''' + @dateTo + '''+'' 23:59:59''' + SET @sql1 = @sql1 + ' and rt.createddate BETWEEN ''' + @dateFrom + ''' AND ''' + @dateTo + ' 23:59:59''' + SET @sql2 = @sql2 + ' and rt.createddate BETWEEN ''' + @dateFrom + ''' AND ''' + @dateTo + ' 23:59:59''' END IF isnull(@transactionFrom,'') <> '' @@ -219,13 +219,14 @@ BEGIN SET @sql1 = @sql1 + ' and pCountry = ''' + @pCountry + '''' SET @sql2 = @sql2 + ' and pCountry = ''' + @pCountry + '''' END - + PRINT '@status' + PRINT @status IF isnull(@status,'') <> '' BEGIN SET @sql1 = @sql1 + ' and payStatus = ''' + @status + '''' SET @sql2 = @sql2 + ' and payStatus = ''' + @status + '''' END - + PRINT @sql2; IF isnull(@transType,'') <> '' BEGIN SET @sql1 = @sql1 + ' and transtatus = ''' + @transType + '''' @@ -293,7 +294,7 @@ BEGIN END SET @SQL = @SQL + 'order by xyz.[CREATED_DATE] desc' - PRINT (@SQL) + --PRINT (@SQL) EXEC (@SQL) EXEC proc_errorHandler '0'