From 3c2c7d9c27d744a23bfd602dc46651aec7aed5b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Wed, 7 Sep 2022 10:53:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E8=84=B8=E6=8E=88=E6=9D=83=E9=97=A8?=
 =?UTF-8?q?=E7=A6=81sleep=201.5s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/hrm/services.py |  2 +-
 apps/opm/views.py    |  1 +
 apps/rpm/filters.py  | 12 ++++++++++++
 apps/rpm/views.py    |  4 +++-
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 apps/rpm/filters.py

diff --git a/apps/hrm/services.py b/apps/hrm/services.py
index 573b83a0..fc96f6b3 100755
--- a/apps/hrm/services.py
+++ b/apps/hrm/services.py
@@ -149,7 +149,7 @@ class HrmService:
                 "endDate": endDate
             }
             _, res = dhClient.request(**dhapis['card_add'], json=json_data)
-            time.sleep(1)
+            time.sleep(1.5)
             cls.save(ep, data={'dh_face_card': cardNumber})
             return cardNumber
 
diff --git a/apps/opm/views.py b/apps/opm/views.py
index ff594c9d..31837103 100644
--- a/apps/opm/views.py
+++ b/apps/opm/views.py
@@ -33,6 +33,7 @@ class OperationViewSet(CustomModelViewSet):
     retrieve_serializer_class = OperationDetailSerializer
     select_related_fields = ['area', 'dept_bus', 'dept_ter', 'coordinator']
     prefetch_related_fields = ['cates']
+    search_fields = ['name']
     filterset_fields = ['state', 'cates', 'area', 'create_by']
 
     def update(self, request, *args, **kwargs):
diff --git a/apps/rpm/filters.py b/apps/rpm/filters.py
new file mode 100644
index 00000000..da07c0db
--- /dev/null
+++ b/apps/rpm/filters.py
@@ -0,0 +1,12 @@
+from django_filters import rest_framework as filters
+
+from apps.rpm.models import Rpj
+
+
+class RpjFilterSet(filters.FilterSet):
+    start_come = filters.DateTimeFilter(field_name="come_time", lookup_expr='gte')
+    end_come = filters.DateTimeFilter(field_name="come_time", lookup_expr='lte')
+
+    class Meta:
+        model = Rpj
+        fields = ['rparty', 'belong_dept', 'state', 'create_by', 'start_come', 'end_come']
diff --git a/apps/rpm/views.py b/apps/rpm/views.py
index 733950d8..cb758b8c 100644
--- a/apps/rpm/views.py
+++ b/apps/rpm/views.py
@@ -1,4 +1,5 @@
 
+from apps.rpm.filters import RpjFilterSet
 from apps.rpm.models import Rcertificate, Remployee, Rparty, Rfile, Rpjfile, Rpjmember, Rpj
 from apps.rpm.serializers import (RcertificateCreateUpdateSerializer,
                                   RcertificateSerializer, RemployeeCreateSerializer, RemployeeSerializer,
@@ -141,7 +142,8 @@ class RpjViewSet(CustomModelViewSet):
     update_serializer_class = RpjCreateUpdateSerializer
     serializer_class = RpjListSerializer
     select_related_fields = ['rparty', 'belong_dept', 'ticket', 'ticket__state']
-    filterset_fields = ['rparty', 'belong_dept', 'state', 'create_by']
+    search_fields = ['name']
+    filterset_class = RpjFilterSet
 
     def get_queryset(self):
         queryset = super().get_queryset()