From fef37ebcd7f51857126a994a0fd68852a0b70d57 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 9 Aug 2023 14:20:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20enstat=20list=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=89=93=E5=B9=B32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/views.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/enm/views.py b/apps/enm/views.py index be8c42a9..63be04cb 100644 --- a/apps/enm/views.py +++ b/apps/enm/views.py @@ -70,18 +70,19 @@ class EnStatViewSet(ListModelMixin, CustomGenericViewSet): ordering = ['mgroup__sort', 'year_s', 'month_s', 'day_s', 'hour'] def handle_data(self, data): - for i in data: + print(len(data)) + for ind, val in enumerate(data): # imaterial_data = i['imaterial_data'] # other_cost_data = i['other_cost_data'] - qua_data = i['qua_data'] - equip_elec_data = i['equip_elec_data'] + qua_data = val['qua_data'] + equip_elec_data = val['equip_elec_data'] if qua_data: for item in qua_data: - i[f'{item["material_name"]}_{item["testitem_name"]}_rate_pass'] = item['rate_pass'] + val[f'{item["material_name"]}_{item["testitem_name"]}_rate_pass'] = item['rate_pass'] if equip_elec_data: for item in equip_elec_data: - i[f'{item["equipment_name"]}_consume_unit'] = item.get('consume_unit', None) - return data + val[f'{item["equipment_name"]}_consume_unit'] = item.get('consume_unit', None) + return data def list(self, request, *args, **kwargs): queryset = self.filter_queryset(self.get_queryset())