From 3e041ec93b36cd8079fe09239ae6ac4611499e7c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 30 Nov 2023 16:00:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=B9=E4=B8=BA=E5=8D=95=E4=B8=AA=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/pm/views.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/pm/views.py b/apps/pm/views.py index efba844f..565e26a3 100644 --- a/apps/pm/views.py +++ b/apps/pm/views.py @@ -158,18 +158,19 @@ class MtaskViewSet(CustomModelViewSet): raise ParseError('该任务非创建中不可删除') return super().perform_destroy(instance) - @action(methods=['post'], detail=False, perms_map={'post': 'mtask.submit'}, serializer_class=PkSerializer) + @action(methods=['post'], detail=True, perms_map={'post': 'mtask.submit'}, serializer_class=PkSerializer) @transaction.atomic def submit(self, request, *args, **kwargs): """提交任务(根据任务ID) 提交任务后不可更新日志 """ - ids = request.data.get('ids', []) + mtask: Mtask = self.get_object() user = request.user - mtasks = Mtask.objects.filter( - id__in=ids, state=Mtask.MTASK_ASSGINED) - PmService.mtasks_submit(mtasks, user) + if mtask.state == Mtask.MTASK_ASSGINED: + PmService.mtasks_submit(Mtask.objects.filter(id=mtask.id), user) + else: + raise ParseError('该任务状态不可提交') return Response() @action(methods=['post'], detail=True, perms_map={'post': 'mtask.submit'}, serializer_class=Serializer)