修改巡检查询

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/serializers.py

@@ -52,13 +52,13 @@ class InspectionOrderSerializer(serializers.ModelSerializer):
             device = self.initial_data['device']
         if inspection_result == '0':
             # 巡检状态如果为正常，判断当前教室是否还存有未完成保修的工单
-            repair_orders = RepairOrder.objects.filter(device_address=self.initial_data['device_address'],
-                                                       device_name=self.initial_data['device_name'],
-                                                       device=device,
-                                                       status__in=[settings.NOT_CHECKED, settings.CHECKED,
-                                                                   settings.DISPATCH, settings.HANG_UP])
-            if repair_orders:
-                raise CustomError('该地区还存在未完成的报修！')
+            # repair_orders = RepairOrder.objects.filter(device_address=self.initial_data['device_address'],
+            #                                            device_name=self.initial_data['device_name'],
+            #                                            device=device,
+            #                                            status__in=[settings.NOT_CHECKED, settings.CHECKED,
+            #                                                        settings.DISPATCH, settings.HANG_UP])
+            # if repair_orders:
+            #     raise CustomError('该地区还存在未完成的报修！')
 
             # 状态保存为正常
             validated_data['status'] = InspectionOrder.NOT_REPAIR

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):