From 73a88e2f866993f39f1ebf72555aa47d52ad8773 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 10 Jan 2022 10:06:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=A2=9E=E5=8A=A0=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/sam/filters.py | 9 ++++++++- hb_server/apps/sam/views.py | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hb_server/apps/sam/filters.py b/hb_server/apps/sam/filters.py index 72ed1b7..d061985 100644 --- a/hb_server/apps/sam/filters.py +++ b/hb_server/apps/sam/filters.py @@ -8,4 +8,11 @@ class OrderFilterSet(filters.FilterSet): create_time_end = filters.NumberFilter(field_name="create_time", lookup_expr='lte') class Meta: model = Order - fields = ['product', 'contract', 'customer', 'create_time_start', 'create_time_end'] \ No newline at end of file + fields = ['product', 'contract', 'customer', 'create_time_start', 'create_time_end'] + + +class ContractFilterSet(filters.FilterSet): + create_time_start = filters.DateFilter(field_name="create_time", lookup_expr='gte') + create_time_end = filters.NumberFilter(field_name="create_time", lookup_expr='lte') + class Meta: + fields = ['customer', 'create_time_start', 'create_time_end'] \ No newline at end of file diff --git a/hb_server/apps/sam/views.py b/hb_server/apps/sam/views.py index 616ca13..62fd081 100644 --- a/hb_server/apps/sam/views.py +++ b/hb_server/apps/sam/views.py @@ -5,7 +5,7 @@ from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, ListModel from apps.mtm.models import Material from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct, IProduct, WareHouse from apps.inm.signals import update_inm -from apps.sam.filters import OrderFilterSet +from apps.sam.filters import ContractFilterSet, OrderFilterSet from apps.sam.serializers import ContractCreateUpdateSerializer, ContractSerializer, CustomerCreateUpdateSerializer, CustomerSerializer, OrderCreateUpdateSerializer, OrderSerializer, SaleCreateSerializer, SaleListSerializer, SaleProductCreateSerializer, SaleProductListSerializer from apps.sam.models import Contract, Customer, Order, Sale, SaleProduct from rest_framework.viewsets import GenericViewSet, ModelViewSet @@ -44,7 +44,7 @@ class ContractViewSet(CreateUpdateCustomMixin, ModelViewSet): queryset = Contract.objects.select_related('customer').all() serializer_class = ContractSerializer search_fields = ['name'] - filterset_fields = [] + filterset_class = ContractFilterSet ordering_fields = ['create_time'] ordering = ['-create_time']