From fd6c8c138edba67f7e52a2d59c7c38c7752380f8 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 26 Jun 2023 09:09:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=8A=A5=E9=80=81=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E4=BB=BB=E5=8A=A1=E5=88=A0=E9=99=A4=E6=97=B6=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8A=A5=E9=80=81=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/supervision/views.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index 767fd12..09de4ad 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): From 59630d8c514137dcd634dc8067aeeb80d1ca6514 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 26 Jun 2023 09:33:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=88=91=E7=9A=84=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/supervision/views.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index 09de4ad..9693a79 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -545,13 +545,19 @@ 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) + query_params = self.request.query_params + belong_dept = query_params.pop('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) + 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) From e2126ff0b76aa23f9df6d1bbf50611698ab0cc5a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 26 Jun 2023 09:45:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=88=91=E7=9A=84=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/supervision/views.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index 9693a79..b79ca3c 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -544,15 +544,9 @@ class Task2DoViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet): 我的任务 """ - queryset = Task2Do.objects.exclude(task2__state=10).order_by('-create_time') - query_params = self.request.query_params - belong_dept = query_params.pop('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: