查看下级单位的报送反馈

server/apps/supervision/views.py

@@ -1,6 +1,7 @@
 from django.conf import settings
 from django.core.cache import cache
 from django.db.models import Count, Q
+from django.db.models import query
 from django.db.models.query import QuerySet
 from django.shortcuts import render
 from django.utils import timezone
@@ -165,7 +166,12 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
         """
         我的报送任务
         """
-        queryset = TaskDept.objects.filter(dept=request.user.dept).exclude(task__state='待发布').order_by('-create_time')
+        queryset = TaskDept.objects.exclude(task__state='待发布').order_by('-create_time')
+        mydept = request.user.dept
+        belong_depts = get_child_queryset2(mydept)
+        queryset = queryset.filter(dept__in = belong_depts)
+        dept = self.request.query_params.get('dept', mydept)
+        queryset = queryset.filter(dept=dept)
         serializer = TaskDeptSerializer(queryset, many=True)
         return Response(serializer.data)
     
@@ -372,25 +378,6 @@ class TaskDeptViewSet(ModelViewSet):
     filterset_fields = ['task','dept']
     ordering = ['dept__sort']
 
-    def get_queryset(self):
-        queryset = self.queryset
-        if hasattr(self.get_serializer_class(), 'setup_eager_loading'):
-            queryset = self.get_serializer_class().setup_eager_loading(queryset)
-        if self.request.user.is_superuser:
-            pass
-        if hasattr(queryset.model, 'dept'):
-            user = self.request.user
-            roles = user.roles
-            data_range = roles.values_list('datas', flat=True)
-            if '全部' in data_range:
-                pass
-            elif '本级及以下' in data_range:
-                belong_depts = get_child_queryset2(user.dept)
-                queryset = queryset.filter(dept__in = belong_depts)
-            elif '本级' in data_range:
-                queryset = queryset.filter(dept = user.dept)
-        return queryset
-
     @action(methods=['put'], detail=True, perms_map = {'put':'record_confirm'})
     def confirm(self, request, *args, **kwargs):
         """