From d5e48c1ab8d5b2866265d50bb7a38d4ec85ce396 Mon Sep 17 00:00:00 2001 From: zty Date: Mon, 23 Sep 2024 10:04:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20enm=E3=80=81fim=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E8=BF=87=E6=BB=A4=E5=92=8C=E8=83=BD=E6=BA=90?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=8F=AD=E7=BB=84=E5=BC=80=E5=A7=8B=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/serializers.py | 2 ++ apps/fim/views.py | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/enm/serializers.py b/apps/enm/serializers.py index c3e6f9fc..fa739a37 100644 --- a/apps/enm/serializers.py +++ b/apps/enm/serializers.py @@ -82,6 +82,8 @@ class MpointStatSerializer(CustomModelSerializer): ep_belong_name = serializers.CharField(source="mpoint.ep_belong.name", read_only=True) mgroup_name = serializers.CharField(source="mgroup.name", read_only=True) belong_dept_name = serializers.CharField(source="mgroup.belong_dept.name", read_only=True) + sflog_start_time = serializers.CharField(source="sflog.start_time", read_only=True) + sflog_end_time = serializers.CharField(source="sflog.end_time", read_only=True) class Meta: model = MpointStat diff --git a/apps/fim/views.py b/apps/fim/views.py index 1fbe9deb..1692fe83 100644 --- a/apps/fim/views.py +++ b/apps/fim/views.py @@ -46,5 +46,12 @@ class FeeSetViewSet(CustomModelViewSet): queryset = FeeSet.objects.all() serializer_class = FeeSetSerializer select_related_fields = ['fee', 'mgroup'] - filterset_fields = ['fee', 'mgroup', 'year', 'month', 'mgroup__cate'] + filterset_fields = { + "fee": ["exact"], + "mgroup__name": ["exact", "in"], + "mgroup": ["exact"], + "month": ["exact"], + "year": ["exact"], + "mgroup__cate": ["exact", "in"] + } search_fields = ['fee__name', 'mgroup__name']