feat: 修改ofm seal 过滤查询功能

This commit is contained in:
zty 2025-09-05 14:49:50 +08:00
parent 6b246f147d
commit f97f51e72c
3 changed files with 14 additions and 4 deletions

View File

@ -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"]
}
}
class SealFilter(filters.FilterSet):
seal = MyJsonListFilter(label='按印章名称查询', field_name="seal")
class Meta:
model = LendingSeal
fields = ['seal']

View File

@ -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',

View File

@ -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"]