From 3ea4acabacf551f4faa738db40f5f58ccf20cfeb Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 22 Nov 2023 16:39:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/supervision/views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index fe06874..0f69e87 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -669,7 +669,7 @@ class RcViewSet(ImpMixin, Domixin, CreateUpdateCustomMixin, ModelViewSet): "num_error": {'etype': 10}, "num_overdue": {'etype': 20} } - filterset_fields = ['etype', 'task2do', 'task2do__belong_dept', 'task2do__task2__year'] + filterset_fields = ['etype', 'task2do', 'task2do__belong_dept', 'task2do__task2__year', 'task2do__task2'] def make_data(self, data, sheet, i, etype): @@ -715,7 +715,7 @@ class ComplaintViewSet(ImpMixin, Domixin, CreateUpdateCustomMixin, ModelViewSet) "num_complaint": {}, "num_complaint_10": {'is_satisfied': True} } - filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year'] + filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year', 'task2do__task2'] def make_data(self, data, sheet, i, etype): data['complainant'] = sheet['b'+str(i)].value @@ -742,7 +742,7 @@ class PtViewSet(ImpMixin, Domixin, CreateUpdateCustomMixin, ModelViewSet): "num_pt": {}, "num_pt_10": {'result': 10} } - filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year'] + filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year', 'task2do__task2'] def make_data(self, data, sheet, i, etype): data['name'] = sheet['b'+str(i)].value @@ -769,7 +769,7 @@ class RiskViewSet(ImpMixin, Domixin, CreateUpdateCustomMixin, ModelViewSet): count_dict = { "num_risk": {} } - filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year'] + filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year', 'task2do__task2'] def make_data(self, data, sheet, i, etype): data['content'] = sheet['b'+str(i)].value @@ -794,7 +794,7 @@ class OinspectViewSet(ImpMixin, Domixin, CreateUpdateCustomMixin, ModelViewSet): count_dict = { "num_oinspect": {} } - filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year'] + filterset_fields = ['task2do', 'task2do__belong_dept', 'task2do__task2__year', 'task2do__task2'] def make_data(self, data, sheet, i, etype): data['cate'] = self.get_enum(sheet['b'+str(i)].value, Oinspect.oinspect_cate_choices, i) From a7f008a541fe0cb48e11ec81dd493145cf9193d5 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 22 Nov 2023 16:44:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20ptserializer=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/supervision/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/apps/supervision/serializers.py b/server/apps/supervision/serializers.py index 26ca182..85d4f8a 100644 --- a/server/apps/supervision/serializers.py +++ b/server/apps/supervision/serializers.py @@ -199,7 +199,7 @@ class ComplaintSerializer(ValidateMixin, serializers.ModelSerializer): model = Complaint class PtSerializer(ValidateMixin, serializers.ModelSerializer): - + belong_dept_name = serializers.CharField(source='task2do.belong_dept.name', read_only=True) class Meta(BaseMeta): model = Pt