Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search
This commit is contained in:
commit
6bba84dbef
|
@ -442,7 +442,6 @@ class Task2ViewSet(CreateUpdateCustomMixin, ModelViewSet):
|
|||
开始执行
|
||||
"""
|
||||
obj = self.get_object()
|
||||
if obj.state == Task2.TASK2_CREATE:
|
||||
tds = Task2Do.objects.filter(task2=obj)
|
||||
if not tds.exists():
|
||||
raise ParseError('未添加执行公司')
|
||||
|
@ -459,6 +458,7 @@ class Task2ViewSet(CreateUpdateCustomMixin, ModelViewSet):
|
|||
else:
|
||||
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)})
|
||||
if obj.state == Task2.TASK2_CREATE:
|
||||
obj.state = Task2.TASK2_DOING
|
||||
obj.save()
|
||||
return Response()
|
||||
|
@ -481,8 +481,8 @@ class Task2ViewSet(CreateUpdateCustomMixin, ModelViewSet):
|
|||
return Response()
|
||||
|
||||
|
||||
class Task2DoViewSet(ListModelMixin, GenericViewSet):
|
||||
perms_map = {'get': '*'}
|
||||
class Task2DoViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
|
||||
perms_map = {'get': '*', 'delete': 'task2'}
|
||||
queryset = Task2Do.objects.select_related('belong_dept', 'task2').all()
|
||||
serializer_class = Task2DoSerializer
|
||||
ordering = ['belong_dept__sort']
|
||||
|
|
Loading…
Reference in New Issue