From 3863e8c83f766a83a6275b458259b2c8378542d7 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 16 Jun 2023 13:37:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=AF=BC=E5=85=A5=E6=97=B6=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=BB=9F=E8=AE=A1=E6=89=A7=E8=A1=8C=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/supervision/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index 9846795..ce88c19 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -640,6 +640,7 @@ class ImpMixin: raise ParseError(err_msg) else: sr.save(create_by=request.user) + self.countup_task2do(task2do) # 统计执行情况 return Response() class RcViewSet(ImpMixin, Domixin, CreateUpdateCustomMixin, ModelViewSet): From 38e337fce7e5c612a0fdc0d46f8154a240167a5c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 16 Jun 2023 13:46:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=97=A5=E5=B8=B8=E7=9B=91=E7=9D=A3?= =?UTF-8?q?=E5=B0=91=E7=BB=9F=E8=AE=A1num=5Facc=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/supervision/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index ce88c19..c16ead6 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -487,7 +487,7 @@ class Task2DoViewSet(ListModelMixin, GenericViewSet): serializer_class = Task2DoSerializer ordering = ['belong_dept__sort'] filterset_fields = ['task2', 'belong_dept', 'task2__year', 'task2__cycle'] - cfields = ['num_issue', 'num_expect', 'num_error', 'num_overdue', 'num_complaint', 'num_pt', 'num_risk', 'num_oinspect'] + cfields = ['num_issue', 'num_expect', 'num_error', 'num_overdue', 'num_complaint', 'num_pt', 'num_risk', 'num_oinspect', 'num_acc'] @classmethod def countup_task2do(cls, instance): From 66cfee6e3db594274de317bbb55733ad80f60e10 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 19 Jun 2023 10:04:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20pgoaldept=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=A4=9A=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/supervision/filters.py | 13 ++++++++++++- server/apps/supervision/serializers.py | 1 + server/apps/supervision/views.py | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/server/apps/supervision/filters.py b/server/apps/supervision/filters.py index fa5cc31..cbaa808 100644 --- a/server/apps/supervision/filters.py +++ b/server/apps/supervision/filters.py @@ -1,5 +1,5 @@ from django_filters import rest_framework as filters -from .models import Record +from .models import Record, PgoalDept class RecordFilter(filters.FilterSet): @@ -13,3 +13,14 @@ class RecordFilter(filters.FilterSet): class Meta: model = Record fields = ['up_date','content__name','belong_dept','state','is_self','task', 'content', 'content__candoself'] + +class PgoalDeptFilter(filters.FilterSet): + ['goal_key', 'belong_dept', 'year', 'task2do'] + class Meta: + model = PgoalDept + fields = { + 'goal_key': ['exact', 'in'], + 'belong_dept': ['exact', 'in'], + 'year': ['exact', 'in'], + 'task2do': ['exact', 'in'], + } \ No newline at end of file diff --git a/server/apps/supervision/serializers.py b/server/apps/supervision/serializers.py index 87f3319..a96cb31 100644 --- a/server/apps/supervision/serializers.py +++ b/server/apps/supervision/serializers.py @@ -146,6 +146,7 @@ class BaseMeta: class PgoalDeptSerializer(serializers.ModelSerializer): goal_file_ = FileSimpleSerializer(source='goal_file', read_only=True) goal_files_ = FileSimpleSerializer(source='goal_files', many=True, read_only=True) + belong_dept_name = serializers.CharField(source='belong_dept.name', read_only=True) class Meta(BaseMeta): model = PgoalDept read_only_fields = BaseMeta.read_only_fields + ['goal_value_a', 'goal_value_c', 'goal_files', 'goal_key', 'goal_file_', 'goal_files_'] diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index c16ead6..a339d45 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -19,7 +19,7 @@ from apps.system.permission import get_permission_list, has_permission from apps.system.permission_data import RbacFilterSet from django.db import transaction -from .filters import RecordFilter +from .filters import RecordFilter, PgoalDeptFilter from .models import * from .serializers import * @@ -591,7 +591,7 @@ class Domixin: class PgoalDeptViewSet(Domixin, CreateUpdateCustomMixin, ModelViewSet): queryset = PgoalDept.objects.all() serializer_class = PgoalDeptSerializer - filterset_fields = ['goal_key', 'belong_dept', 'year', 'task2do'] + filterset_class = PgoalDeptFilter def perform_update(self, serializer): instance = serializer.save()