From 0840479e397c8d441d4c91c03ff710ea3446b838 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sun, 25 Jun 2023 14:47:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20task2do=E5=A2=9E=E5=8A=A0=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/supervision/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index a339d45..0070057 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -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'] From 91b67940e2cf5027f8b11c166e0e9207434a8807 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sun, 25 Jun 2023 14:54:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20task2=20start=20=E4=B8=8D=E9=99=90?= =?UTF-8?q?=E5=88=B6task2=20=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/supervision/views.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index 0070057..767fd12 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -442,23 +442,23 @@ class Task2ViewSet(CreateUpdateCustomMixin, ModelViewSet): 开始执行 """ obj = self.get_object() + tds = Task2Do.objects.filter(task2=obj) + if not tds.exists(): + raise ParseError('未添加执行公司') + if obj.type == Task2.TASK2_F: + try: + pg = Pgoal.objects.get(year=obj.year) + except: + raise ParseError('未配置年度基础目标') + for i in tds: + for key in Pgoal.basedict: + pds = PgoalDept.objects.filter(task2do=i, goal_key=key) + if pds.exists(): + pds.update(**{'goal_name': Pgoal.basedict[key], 'goal_value_a': getattr(pg, key)}) + 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: - tds = Task2Do.objects.filter(task2=obj) - if not tds.exists(): - raise ParseError('未添加执行公司') - if obj.type == Task2.TASK2_F: - try: - pg = Pgoal.objects.get(year=obj.year) - except: - raise ParseError('未配置年度基础目标') - for i in tds: - for key in Pgoal.basedict: - pds = PgoalDept.objects.filter(task2do=i, goal_key=key) - if pds.exists(): - pds.update(**{'goal_name': Pgoal.basedict[key], 'goal_value_a': getattr(pg, key)}) - 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)}) obj.state = Task2.TASK2_DOING obj.save() return Response()