From f303801401d7ec338831bc050243f093befb9059 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 17 Mar 2023 09:28:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20rpj=20update=20=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=8F=90=E4=BE=9Bbelong=5Fdept=E5=92=8Crparty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/rpm/serializers.py | 11 ++++++----- apps/rpm/views.py | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/rpm/serializers.py b/apps/rpm/serializers.py index a670e097..f13862f9 100644 --- a/apps/rpm/serializers.py +++ b/apps/rpm/serializers.py @@ -84,16 +84,17 @@ class RfileListSerializer(CustomModelSerializer): model = Rfile fields = '__all__' - -class RpjCreateUpdateSerializer(CustomModelSerializer): - rparty = serializers.PrimaryKeyRelatedField(queryset=Rparty.objects.all(), required=False, allow_null=True) - belong_dept = serializers.PrimaryKeyRelatedField(queryset=Dept.objects.all(), required=False, allow_null=True) - +class RpjUpdateSerializer(CustomModelSerializer): class Meta: model = Rpj fields = ['id', 'name', 'contract_number', 'type', 'come_time', 'leave_time', 'belong_dept', 'rparty'] +class RpjCreateSerializer(RpjUpdateSerializer): + rparty = serializers.PrimaryKeyRelatedField(queryset=Rparty.objects.all(), required=False, allow_null=True) + belong_dept = serializers.PrimaryKeyRelatedField(queryset=Dept.objects.all(), required=False, allow_null=True) + + class RpjListSerializer(CustomModelSerializer): rparty_name = serializers.CharField(source='rparty.name', read_only=True) belong_dept_name = serializers.CharField(source='belong_dept.name', read_only=True) diff --git a/apps/rpm/views.py b/apps/rpm/views.py index 049762c0..5763540c 100644 --- a/apps/rpm/views.py +++ b/apps/rpm/views.py @@ -5,7 +5,7 @@ from apps.rpm.serializers import (RcertificateCreateUpdateSerializer, RemployeeUpdateSerializer, RpartyAssignSerializer, RpartyCreateUpdateSerializer, RfileListSerializer, RpartySerializer, RpjListSerializer, RpjfileSerializer, RpjfileUpdateSerializer, RpjmemberCreateSerializer, - RpjCreateUpdateSerializer, RpjmemberSerializer, RpjmemberUpdateSerializer) + RpjCreateSerializer, RpjUpdateSerializer, RpjmemberSerializer, RpjmemberUpdateSerializer) from apps.rpm.services import sync_to_rep from apps.system.models import Dictionary, Post, User, UserPost from apps.system.serializers import UserCreateSerializer @@ -160,8 +160,8 @@ class RcertificateViewSet(CustomModelViewSet): class RpjViewSet(CustomModelViewSet): perms_map = {'get': 'rpj.view', 'post': 'rpj.create', 'put': 'rpj.update', 'delete': 'rpj.update'} queryset = Rpj.objects.all() - create_serializer_class = RpjCreateUpdateSerializer - update_serializer_class = RpjCreateUpdateSerializer + create_serializer_class = RpjCreateSerializer + update_serializer_class = RpjUpdateSerializer serializer_class = RpjListSerializer select_related_fields = ['rparty', 'belong_dept', 'ticket', 'ticket__state'] search_fields = ['name']