diff --git a/apps/enm/serializers.py b/apps/enm/serializers.py index 214b2442..8701a05d 100644 --- a/apps/enm/serializers.py +++ b/apps/enm/serializers.py @@ -84,6 +84,8 @@ class MpointStatSerializer(CustomModelSerializer): class EnStatSerializer(CustomModelSerializer): mgroup_name = serializers.CharField(source='mgroup.name', read_only=True) + team_name = serializers.CharField(source='team.name', read_only=True) + belong_dept_name = serializers.CharField(source='mgroup.belong_dept.name', read_only=True) class Meta: model = EnStat fields = '__all__' \ No newline at end of file diff --git a/apps/enm/views.py b/apps/enm/views.py index 97b18ff2..5023cca5 100644 --- a/apps/enm/views.py +++ b/apps/enm/views.py @@ -65,5 +65,5 @@ class EnStatViewSet(ListModelMixin, CustomGenericViewSet): perms_map = {'get': '*'} queryset = EnStat.objects.all() serializer_class = EnStatSerializer - select_related_fields = ['mgroup'] + select_related_fields = ['mgroup', 'team', 'mgroup__belong_dept'] filterset_class = EnStatFilter \ No newline at end of file diff --git a/apps/mtm/views.py b/apps/mtm/views.py index aaa987ea..c8e3f5f7 100644 --- a/apps/mtm/views.py +++ b/apps/mtm/views.py @@ -66,6 +66,6 @@ class GoalViewSet(CustomModelViewSet): """ queryset = Goal.objects.all() serializer_class = GoalSerializer - select_related_fields = ['mgroup', 'product', 'team', 'goal_cate'] - filterset_fields = ['mgroup', 'product', 'team', 'goal_cate', 'year', 'goal_cate__code'] + select_related_fields = ['mgroup', 'goal_cate'] + filterset_fields = ['mgroup', 'goal_cate', 'year', 'goal_cate__code'] search_fields = ['name'] \ No newline at end of file