Merge remote-tracking branch 'origin/master'

apps/tenant/inspection_order/filters.py

@@ -5,8 +5,14 @@ from .models import InspectionOrder
 
 
 class InspectionOrderFilter(django_filters.FilterSet):
-    status = django_filters.CharFilter(field_name='status')
+    status = django_filters.CharFilter(method='query_status')
     no = django_filters.CharFilter(field_name='no', lookup_expr='icontains')
+
     class Meta:
         model = InspectionOrder
         fields = '__all__'
+
+    def query_status(self, queryset, *args):
+        queryset = queryset.filter(status__in=args[1].split(','))
+        print(queryset)
+        return queryset

apps/wxapp/inspection_order/views.py

@@ -27,7 +27,7 @@ class InspectionOrderDetailView(generics.RetrieveAPIView):
 
 class InspectionOrderAllView(generics.ListAPIView):
     permission_classes = [isLogin, ]
-    queryset = InspectionOrder.objects.filter(status=InspectionOrder.NOT_REPAIR)
+    queryset = InspectionOrder.objects.filter()
     serializer_class = InspectionOrderListSerializer
 
     def filter_queryset(self, queryset):