数量信息显示

apps/wxapp/repair_order/views.py

@@ -1,6 +1,7 @@
 # coding=utf-8
 from django.conf import settings
 from django.db import transaction
+from django.db.models import Q
 from rest_framework import generics
 from rest_framework.views import APIView
 from rest_framework.decorators import action
@@ -49,13 +50,21 @@ class RepairOrderCountView(APIView):
             return response_ok({
                 'NOT_CHECKED_COUNT':0,
                 'CHECKED_COUNT':0,
+                'USER_NOT_CHECKED_COUNT': 0,
+                'USER_CHECKED_COUNT': 0,
                 'APPRAISE_COUNT': 0,
+                'FINISH':0,
+                'DISPATCH':0,
             })
         queryset = RepairOrder.objects.filter(delete=False, tenant=self.request.user.employee.tenant)
         return response_ok({
             'NOT_CHECKED_COUNT':queryset.filter(status__lte=settings.CHECKED).count(),
-            'CHECKED_COUNT':queryset.filter(status=settings.CHECKED).count(),
+            'CHECKED_COUNT':queryset.filter(status=settings.CHECKED,).count(),
+            'USER_NOT_CHECKED_COUNT':queryset.filter(status=settings.NOT_CHECKED,user = request.user).count(),
+            'USER_CHECKED_COUNT':queryset.filter(status=settings.CHECKED,user = request.user).count(),
             'APPRAISE_COUNT': queryset.filter(status=settings.APPRAISE, user = request.user).count(),
+            'FINISH':queryset.filter(status=settings.FINISH, user = request.user).count(),
+            'DISPATCH':queryset.filter(status=settings.DISPATCH, user = request.user).count(),
         })
 
 
@@ -67,7 +76,7 @@ class RepairOrderAllView(generics.ListAPIView):
     def filter_queryset(self, queryset):
         queryset = queryset.filter(tenant=self.request.user.employee.tenant)
         if self.request.user.is_employee:
-            queryset = queryset.filter(repair_user__suser=self.request.user)
+            queryset = queryset.filter(Q(repair_users=self.request.user) | Q(user=self.request.user))
         elif self.request.user.is_repair:
             queryset = queryset.filter(user=self.request.user)
         f = RepairOrderFilter(self.request.GET, queryset=queryset)