From 0df2506f2642d8c9b8a02d9ab2c2ade06d380926 Mon Sep 17 00:00:00 2001 From: zty Date: Wed, 18 Dec 2024 14:16:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=20enm/qua=5Fdata=20?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/serializers.py | 6 +++++- apps/wpm/filters.py | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/enm/serializers.py b/apps/enm/serializers.py index 1df10584..3eea9a40 100644 --- a/apps/enm/serializers.py +++ b/apps/enm/serializers.py @@ -159,8 +159,9 @@ class EnStatSerializer(CustomModelSerializer): else: ret[key] = "{:.2f}".format(round(ret_one_val, 2)) qua_data = ret.get("qua_data", {}) + equip_elec_data = ret.get("equip_elec_data", {}) - if qua_data: + if qua_data: for item in qua_data: if item.get("rate_pass" )is None: ret[f'{item["material_name"]}_{item["testitem_name"].replace("-", "")}_rate_pass'] = 0 @@ -175,6 +176,9 @@ class EnStatSerializer(CustomModelSerializer): if val: val = "{:.2f}".format(round(val, 2)) ret[f'{item["equipment_name"]}_consume_unit'] = val + # 根据material_name分组排序 + if 'qua_data' in ret: + ret['qua_data'] = sorted(ret['qua_data'], key=lambda x: x['material_name']) return ret diff --git a/apps/wpm/filters.py b/apps/wpm/filters.py index c8f60455..3dd7f9db 100644 --- a/apps/wpm/filters.py +++ b/apps/wpm/filters.py @@ -24,6 +24,7 @@ class StLogFilter(filters.FilterSet): "mgroup": ["exact"], "mgroup__name": ["exact"], "start_time": ["day", "month", "year", "gte", "lte"], + "sflogs__team": ["exact"], "end_time": ["isnull"], "sflog": ["exact"], "sflogs": ["exact"]