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']