feat: enstat list返回数据打平2

This commit is contained in:
caoqianming 2023-08-09 14:20:00 +08:00
parent 1ee3eb4db3
commit fef37ebcd7
1 changed files with 7 additions and 6 deletions

View File

@ -70,18 +70,19 @@ class EnStatViewSet(ListModelMixin, CustomGenericViewSet):
ordering = ['mgroup__sort', 'year_s', 'month_s', 'day_s', 'hour'] ordering = ['mgroup__sort', 'year_s', 'month_s', 'day_s', 'hour']
def handle_data(self, data): def handle_data(self, data):
for i in data: print(len(data))
for ind, val in enumerate(data):
# imaterial_data = i['imaterial_data'] # imaterial_data = i['imaterial_data']
# other_cost_data = i['other_cost_data'] # other_cost_data = i['other_cost_data']
qua_data = i['qua_data'] qua_data = val['qua_data']
equip_elec_data = i['equip_elec_data'] equip_elec_data = val['equip_elec_data']
if qua_data: if qua_data:
for item in 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: if equip_elec_data:
for item in equip_elec_data: for item in equip_elec_data:
i[f'{item["equipment_name"]}_consume_unit'] = item.get('consume_unit', None) val[f'{item["equipment_name"]}_consume_unit'] = item.get('consume_unit', None)
return data return data
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
queryset = self.filter_queryset(self.get_queryset()) queryset = self.filter_queryset(self.get_queryset())