diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index 767fd12..b79ca3c 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -52,12 +52,12 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet): return TaksDetailSerializer return TaskListSerializer - # def destroy(self, request, *args, **kwargs): - # instance = self.get_object() - # instance.delete() - # TaskDept.objects.filter(task=instance).delete() - # Record.objects.filter(task=instance).delete() - # return Response(status=status.HTTP_204_NO_CONTENT) + def destroy(self, request, *args, **kwargs): + instance = self.get_object() + instance.delete() + TaskDept.objects.filter(task=instance).delete() + Record.objects.filter(task=instance).delete() + return Response(status=status.HTTP_204_NO_CONTENT) @action(methods=['post'], detail=True, perms_map = {'post':'task_init'}) def init(self, request, *args, **kwargs): @@ -544,14 +544,14 @@ class Task2DoViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet): 我的任务 """ - queryset = Task2Do.objects.exclude(task2__state=10).order_by('-create_time') - belong_dept = self.request.query_params.get('belong_dept', None) - if belong_dept: - queryset = queryset.filter(belong_dept=belong_dept) - else: - mydept = request.user.dept - belong_depts = get_child_queryset2(mydept) - queryset = queryset.filter(belong_dept__in = belong_depts) + mydept = request.user.dept + belong_depts = get_child_queryset2(mydept) + queryset = Task2Do.objects.filter(belong_dept__in = belong_depts).exclude(task2__state=10).order_by('-create_time') + queryset = self.filter_queryset(queryset) + page = self.paginate_queryset(queryset) + if page is not None: + serializer = Task2DoSerializer(page, many=True) + return self.get_paginated_response(serializer.data) serializer = Task2DoSerializer(queryset, many=True) return Response(serializer.data)