From d64f51e631235370249b538b15826fa535599fdc Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 18 Mar 2022 16:50:29 +0800 Subject: [PATCH] =?UTF-8?q?plan=20near=5Fdone=20out=5Fdone=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/pm/filters.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hb_server/apps/pm/filters.py b/hb_server/apps/pm/filters.py index a53c29d..f01736b 100644 --- a/hb_server/apps/pm/filters.py +++ b/hb_server/apps/pm/filters.py @@ -27,10 +27,11 @@ class PlanFilterSet(DynamicFieldsFilterMixin, filters.FilterSet): ProductionPlan.PLAN_MTEST_DONE]) elif value == 'near_done': queryset = queryset.filter(count_ok__lt=F('count'), - end_date__lte = datetime.date(day7_after)) + end_date__lte = datetime.date(day7_after), + end_date__gte = datetime.date(now)) elif value == 'out_done': queryset = queryset.filter(count_ok__lt=F('count'), - end_date__gt = datetime.date(now)) + end_date__lt = datetime.date(now)) return queryset def filter_material(self, queryset, name, value):