From 84525c03c8f7e02fed2127e9ed2f3ae7d3e516e2 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 3 Jan 2025 15:39:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20wpr=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=8A=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpmw/serializers.py | 5 +++++ apps/wpmw/views.py | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/apps/wpmw/serializers.py b/apps/wpmw/serializers.py index 6a049e1e..4995168e 100644 --- a/apps/wpmw/serializers.py +++ b/apps/wpmw/serializers.py @@ -1,7 +1,12 @@ from apps.wpmw.models import Wpr, WprDefect from apps.utils.serializers import CustomModelSerializer +from rest_framework import serializers class WprSerializer(CustomModelSerializer): + + material_name = serializers.StringRelatedField( + source='material', read_only=True) + class Meta: model = Wpr fields = '__all__' \ No newline at end of file diff --git a/apps/wpmw/views.py b/apps/wpmw/views.py index 7659c3c3..968ea91d 100644 --- a/apps/wpmw/views.py +++ b/apps/wpmw/views.py @@ -12,7 +12,11 @@ class WprViewSet(CustomListModelMixin, CustomGenericViewSet): 动态产品 """ perms_map = {"get": "*"} + select_related_fields = ["wm", "mb", "material"] + prefetch_related_fields = ["defects"] queryset = Wpr.objects.all() serializer_class = WprSerializer - ordering = ["number"] - ordering_fields = ["number", "create_time", "update_time"] \ No newline at end of file + filter_fields = ["mb", "wm", "state", "material", "defects"] + ordering = ["-create_time"] + ordering_fields = ["number", "create_time", "update_time"] + search_fields = ["number", "material__name", "material__model", "material__specification"] \ No newline at end of file