diff --git a/core/apps/finance/views/cash_transaction.py b/core/apps/finance/views/cash_transaction.py index 72aefa6..e227c8c 100644 --- a/core/apps/finance/views/cash_transaction.py +++ b/core/apps/finance/views/cash_transaction.py @@ -75,14 +75,14 @@ class CashTransactionStatisticsApiView(views.APIView): end_date = request.query_params.get('end_date') project_ids = request.query_params.getlist('project_ids') + queryset = CashTransaction.objects.all() if cash_transaction_ids: queryset = CashTransaction.objects.filter(id__in=cash_transaction_ids) if start_date and end_date: queryset = CashTransaction.objects.filter(created_at__range=(start_date, end_date)) if project_ids: queryset = CashTransaction.objects.filter(projects__id__in=project_ids) - else: - queryset = CashTransaction.objects.all() + res = queryset.aggregate( total_balance_usd=Sum('total_balance_usd'), income_balance_usd=Sum('income_balance_usd'),