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-25 15:07:27 +08:00
parent 18712da6bf 91b67940e2
commit 6bba84dbef
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -442,7 +442,6 @@ class Task2ViewSet(CreateUpdateCustomMixin, ModelViewSet):
开始执行 开始执行
""" """
obj = self.get_object() obj = self.get_object()
if obj.state == Task2.TASK2_CREATE:
tds = Task2Do.objects.filter(task2=obj) tds = Task2Do.objects.filter(task2=obj)
if not tds.exists(): if not tds.exists():
raise ParseError('未添加执行公司') raise ParseError('未添加执行公司')
@ -459,6 +458,7 @@ class Task2ViewSet(CreateUpdateCustomMixin, ModelViewSet):
else: else:
PgoalDept.objects.create(**{'year': i.task2.year, 'task2do': i, 'belong_dept': i.belong_dept, PgoalDept.objects.create(**{'year': i.task2.year, 'task2do': i, 'belong_dept': i.belong_dept,
'goal_name': Pgoal.basedict[key], 'goal_key': key, 'goal_value_a': getattr(pg, key)}) 'goal_name': Pgoal.basedict[key], 'goal_key': key, 'goal_value_a': getattr(pg, key)})
if obj.state == Task2.TASK2_CREATE:
obj.state = Task2.TASK2_DOING obj.state = Task2.TASK2_DOING
obj.save() obj.save()
return Response() return Response()
@ -481,8 +481,8 @@ class Task2ViewSet(CreateUpdateCustomMixin, ModelViewSet):
return Response() return Response()
class Task2DoViewSet(ListModelMixin, GenericViewSet): class Task2DoViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
perms_map = {'get': '*'} perms_map = {'get': '*', 'delete': 'task2'}
queryset = Task2Do.objects.select_related('belong_dept', 'task2').all() queryset = Task2Do.objects.select_related('belong_dept', 'task2').all()
serializer_class = Task2DoSerializer serializer_class = Task2DoSerializer
ordering = ['belong_dept__sort'] ordering = ['belong_dept__sort']