feat: wmaterial根据current_merged查询2
This commit is contained in:
parent
4bbae8b7df
commit
63002f27c8
|
|
@ -112,6 +112,7 @@ class WMaterialFilter(filters.FilterSet):
|
||||||
wm=OuterRef("pk"),
|
wm=OuterRef("pk"),
|
||||||
handover__mtype=Handover.H_MERGE,
|
handover__mtype=Handover.H_MERGE,
|
||||||
handover__recive_mgroup__id=mgroupxId,
|
handover__recive_mgroup__id=mgroupxId,
|
||||||
|
handover__submit_time__isnull=False
|
||||||
)
|
)
|
||||||
if value is True:
|
if value is True:
|
||||||
return queryset.annotate(_has_merge=Exists(sub_qs)).filter(_has_merge=True)
|
return queryset.annotate(_has_merge=Exists(sub_qs)).filter(_has_merge=True)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue