From 1e391f36ec67507b6524e6bffec979a9ca11fa6a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 28 Nov 2025 15:33:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20material=20list=20=E5=A6=82=E9=9C=80?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BA=93=E5=AD=98=E6=95=B0=E6=8D=AE=E9=9C=80?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mtm/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/mtm/views.py b/apps/mtm/views.py index e958e01b..de340349 100644 --- a/apps/mtm/views.py +++ b/apps/mtm/views.py @@ -44,15 +44,15 @@ class MaterialViewSet(CustomModelViewSet): def get_queryset(self): qs = super().get_queryset() - if self.action in ["list", "retrieve"]: + if self.action in ["list", "retrieve"] and self.request.query_params.get('wiith_count', None) == 'yes': return qs.annotate( count_mb=Coalesce( - Sum('mb_m__count', filter=Q(mb_m__state=10)), + Sum('mb_m__count', filter=Q(mb_m__state=10, mb_m__count___gt=0)), Value(0), output_field=DecimalField() ), count_wm=Coalesce( - Sum('wm_m__count', filter=Q(wm_m__state=10)), + Sum('wm_m__count', filter=Q(wm_m__state=10, wm_m__count___gt=0)), Value(0), output_field=DecimalField() )