zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: mlog和handover添加cbatch查询条件2

This commit is contained in:
caoqianming 2025-05-20 16:03:36 +08:00
parent 8fb204a93d
commit a672a76eee
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/wpm/filters.py
View File

@ -111,7 +111,7 @@ class MlogFilter(filters.FilterSet):
} }
def filter_cbatch(self, queryset, name, value): def filter_cbatch(self, queryset, name, value):
return queryset.filter(b_mlog__batch=value)|queryset.filter(batch=value) return queryset.filter(Q(b_mlog__batch=value) | Q(batch=value)).distinct()
class HandoverFilter(filters.FilterSet): class HandoverFilter(filters.FilterSet):
@ -126,7 +126,7 @@ class HandoverFilter(filters.FilterSet):
return queryset.filter(send_dept__id=value)|queryset.filter(recive_dept__id=value) return queryset.filter(send_dept__id=value)|queryset.filter(recive_dept__id=value)
def filter_cbatch(self, queryset, name, value): def filter_cbatch(self, queryset, name, value):
return queryset.filter(b_handover__batch=value)|queryset.filter(batch=value) return queryset.filter(Q(b_handover__batch=value) | Q(batch=value)).distinct()
class Meta: class Meta:
model = Handover model = Handover