From bb1b6d8994b25bd953a9483548a75b8f6dc732e2 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 8 Aug 2023 17:08:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test_server/analyse/views.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test_server/analyse/views.py b/test_server/analyse/views.py index 4647b5c..8885e8e 100644 --- a/test_server/analyse/views.py +++ b/test_server/analyse/views.py @@ -23,18 +23,22 @@ class BasicCount(APIView): ret={} q1 = Consumer.objects.filter(is_delete=False) q1 = q1.filter(create_time__gte = request.query_params.get('datestart')) if request.query_params.get('datestart', None) else q1 + q1 = q1.filter(create_time__lte = request.query_params.get('dateend')) if request.query_params.get('dateend', None) else q1 ret['consumer1_count'] = q1.count() q2 = Consumer.objects.filter(is_delete=False).exclude(create_admin=None) - q2 = q2.filter(create_time__gte = request.query_params.get('datestart')) if request.query_params.get('datestart', None) else q2 + q2 = q2.filter(create_time__gte = request.query_params.get('datestart')) if request.query_params.get('datestart', None) else q2 + q2 = q2.filter(create_time__lte = request.query_params.get('dateend')) if request.query_params.get('dateend', None) else q2 ret['consumer2_count'] = q2.count() q3 = ExamTest.objects.filter(is_delete=False) - q3 = q3.filter(create_time__gte = request.query_params.get('datestart')) if request.query_params.get('datestart', None) else q3 + q3 = q3.filter(create_time__gte = request.query_params.get('datestart')) if request.query_params.get('datestart', None) else q3 + q3 = q3.filter(create_time__lte = request.query_params.get('dateend')) if request.query_params.get('dateend', None) else q3 ret['test_count'] = q3.count() q4 = Question.objects.filter(is_delete=False) - q4 = q4.filter(create_time__gte = request.query_params.get('datestart')) if request.query_params.get('datestart', None) else q4 + # q4 = q4.filter(create_time__gte = request.query_params.get('datestart')) if request.query_params.get('datestart', None) else q4 + # q4 = q4.filter(create_time__lte = request.query_params.get('dateend')) if request.query_params.get('dateend', None) else q4 ret['question_count'] = q4.count() return Response(ret)