From c72548b6f9bdb28a995c57aa747094d9c970b63e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Mon, 27 Jun 2022 18:03:10 +0800
Subject: [PATCH] =?UTF-8?q?rcertificate=E8=BF=94=E5=9B=9Eremployee=5Fname?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/rpm/serializers.py | 4 ++++
 apps/rpm/views.py       | 1 +
 requirements.txt        | 1 +
 3 files changed, 6 insertions(+)

diff --git a/apps/rpm/serializers.py b/apps/rpm/serializers.py
index 83bba77e..4ef54c98 100644
--- a/apps/rpm/serializers.py
+++ b/apps/rpm/serializers.py
@@ -1,3 +1,4 @@
+from numpy import True_
 from apps.hrm.models import Certificate, Employee
 from apps.hrm.serializers import phone_check
 from apps.rpm.models import Rcertificate, Remployee, Rfile, Rparty, Rpjcertificate, Rpjfile, Rpjmember, Rpj
@@ -108,6 +109,9 @@ class RcertificateCreateUpdateSerializer(CustomModelSerializer):
 
 
 class RcertificateSerializer(CustomModelSerializer):
+    remployee_name = serializers.CharField(source='remployee.name', read_only=True)
+    rparty_name = serializers.CharField(source='rparty.name', read_only=True)
+
     class Meta:
         model = Rcertificate
         fields = '__all__'
diff --git a/apps/rpm/views.py b/apps/rpm/views.py
index 279952d3..41133361 100644
--- a/apps/rpm/views.py
+++ b/apps/rpm/views.py
@@ -96,6 +96,7 @@ class RcertificateViewSet(CustomModelViewSet):
     create_serializer_class = RcertificateCreateUpdateSerializer
     update_serializer_class = RcertificateCreateUpdateSerializer
     serializer_class = RcertificateSerializer
+    filterset_fields = ['remployee', 'remployee__rparty']
 
     def get_queryset(self):
         queryset = super().get_queryset()
diff --git a/requirements.txt b/requirements.txt
index 4997e817..ba8f7f2d 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,3 +19,4 @@ channels==3.0.4
 channels-redis==3.4.0
 django-restql==0.15.2
 stomp.py==8.0.0
+shapely==1.8.2