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()