diff --git a/apps/ofm/filters.py b/apps/ofm/filters.py index 17088aa2..1910303c 100644 --- a/apps/ofm/filters.py +++ b/apps/ofm/filters.py @@ -1,6 +1,8 @@ from django_filters import rest_framework as filters from apps.ofm.models import MroomBooking +from .models import LendingSeal +from apps.utils.filters import MyJsonListFilter class MroomBookingFilterset(filters.FilterSet): class Meta: @@ -11,4 +13,12 @@ class MroomBookingFilterset(filters.FilterSet): 'slot_b__mdate': ['exact', 'gte', 'lte'], 'create_by': ['exact'], "id": ["exact"] - } \ No newline at end of file + } + + +class SealFilter(filters.FilterSet): + seal = MyJsonListFilter(label='按印章名称查询', field_name="seal") + + class Meta: + model = LendingSeal + fields = ['seal'] \ No newline at end of file diff --git a/apps/ofm/services.py b/apps/ofm/services.py index 405e30fd..f9e221e1 100644 --- a/apps/ofm/services.py +++ b/apps/ofm/services.py @@ -15,7 +15,7 @@ def bind_lendingseal(ticket: Ticket, transition, new_ticket_data: dict): ins = SealManage.objects.get(id=new_ticket_data['t_id']) if ins.submit_time is not None: raise ParseError('该印章申请不可提交审批') - seal_submit_validate(ins) + # seal_submit_validate(ins) ticket_data = ticket.ticket_data ticket_data.update({ 't_model': 'LendingSeal', diff --git a/apps/ofm/views.py b/apps/ofm/views.py index 5e515439..fd9a0e67 100644 --- a/apps/ofm/views.py +++ b/apps/ofm/views.py @@ -10,7 +10,7 @@ from .serializers import (MroomSerializer, MroomBookingSerializer, MroomSlotSeri from rest_framework.decorators import action from apps.utils.mixins import CustomListModelMixin from rest_framework.exceptions import ParseError -from apps.ofm.filters import MroomBookingFilterset +from apps.ofm.filters import MroomBookingFilterset, SealFilter class MroomViewSet(CustomModelViewSet): @@ -132,7 +132,7 @@ class LendingSealViewSet(CustomModelViewSet): 'put': 'seal.update', 'delete': 'seal.delete'} queryset = LendingSeal.objects.all() serializer_class = LendingSealSerializer - filterset_fields = ["seal"] + filterset_class = SealFilter ordering = ["create_time"]