zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

This commit is contained in:
shijing 2023-06-26 10:35:06 +08:00
parent dd54864b23 e2126ff0b7
commit 73bc15a62f
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/apps/supervision/views.py
View File

@ -52,12 +52,12 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
return TaksDetailSerializer return TaksDetailSerializer
return TaskListSerializer return TaskListSerializer
# def destroy(self, request, *args, **kwargs): def destroy(self, request, *args, **kwargs):
# instance = self.get_object() instance = self.get_object()
# instance.delete() instance.delete()
# TaskDept.objects.filter(task=instance).delete() TaskDept.objects.filter(task=instance).delete()
# Record.objects.filter(task=instance).delete() Record.objects.filter(task=instance).delete()
# return Response(status=status.HTTP_204_NO_CONTENT) return Response(status=status.HTTP_204_NO_CONTENT)
@action(methods=['post'], detail=True, perms_map = {'post':'task_init'}) @action(methods=['post'], detail=True, perms_map = {'post':'task_init'})
def init(self, request, *args, **kwargs): 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 mydept = request.user.dept
belong_depts = get_child_queryset2(mydept) belong_depts = get_child_queryset2(mydept)
queryset = queryset.filter(belong_dept__in = belong_depts) 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) serializer = Task2DoSerializer(queryset, many=True)
return Response(serializer.data) return Response(serializer.data)