From def22f6b182fce564b493c2b37d98cbcee814f70 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 12 Jan 2026 10:28:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20handover=E5=8F=AF=E4=BB=A5=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E4=BB=85=E4=BA=A4=E6=8E=A5=E5=88=B0=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=E7=9A=84=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/filters.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/wpm/filters.py b/apps/wpm/filters.py index d649b0d3..ca2631ba 100644 --- a/apps/wpm/filters.py +++ b/apps/wpm/filters.py @@ -154,10 +154,16 @@ class MlogFilter(filters.FilterSet): class HandoverFilter(filters.FilterSet): cbatch = filters.CharFilter(label='批次号', method='filter_cbatch') mgroup = filters.CharFilter(label='MgroupId', method='filter_mgroup') + mgroupx = filters.CharFilter(label='MgroupId', method='filter_mgroupx') dept = filters.CharFilter(label='DeptId', method='filter_dept') def filter_mgroup(self, queryset, name, value): return queryset.filter(send_mgroup__id=value)|queryset.filter(recive_mgroup__id=value) + + def filter_mgroupx(self, queryset, name, value): + dept = Mgroup.objects.get(id=value).belong_dept + return (queryset.filter(send_mgroup__id=value)|queryset.filter(recive_mgroup__id=value)| + queryset.filter(send_dept=dept, send_mgroup__isnull=True)|queryset.filter(recive_dept=dept, recive_mgroup__isnull=True)) def filter_dept(self, queryset, name, value): return queryset.filter(send_dept__id=value)|queryset.filter(recive_dept__id=value)