From 666d317f01355d2232b61d9e828b812786bf2f15 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 27 Feb 2024 14:31:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20carwash=E5=A2=9E=E5=8A=A0=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enp/serializers.py | 2 ++ apps/enp/views.py | 1 + 2 files changed, 3 insertions(+) diff --git a/apps/enp/serializers.py b/apps/enp/serializers.py index 27b9a471..e1359156 100644 --- a/apps/enp/serializers.py +++ b/apps/enp/serializers.py @@ -163,6 +163,8 @@ class EnvDataExportSerializer(serializers.Serializer): class CarWashSerializer(CustomModelSerializer): + station_name = serializers.CharField(source='station.name', read_only=True) + class Meta: model = CarWash fields = "__all__" diff --git a/apps/enp/views.py b/apps/enp/views.py index fa80064a..c8cdb3b7 100644 --- a/apps/enp/views.py +++ b/apps/enp/views.py @@ -138,6 +138,7 @@ class CarWashViewSet(ListModelMixin, CustomGenericViewSet): perms_map = {'get': '*'} queryset = CarWash.objects.all() serializer_class = CarWashSerializer + select_related_fields = ['station'] filterset_fields = { "station": ['exact'], "start_time": ['exact', 'gte', 'lte', 'year', 'month', 'day'],