zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 修改 enm/qua_data 排序问题

This commit is contained in:
zty 2024-12-18 14:16:11 +08:00
parent 28d89176e6
commit 0df2506f26
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/enm/serializers.py
View File

@ -159,6 +159,7 @@ class EnStatSerializer(CustomModelSerializer):
else: else:
ret[key] = "{:.2f}".format(round(ret_one_val, 2)) ret[key] = "{:.2f}".format(round(ret_one_val, 2))
qua_data = ret.get("qua_data", {}) qua_data = ret.get("qua_data", {})
equip_elec_data = ret.get("equip_elec_data", {}) equip_elec_data = ret.get("equip_elec_data", {})
if qua_data: if qua_data:
for item in qua_data: for item in qua_data:
@ -175,6 +176,9 @@ class EnStatSerializer(CustomModelSerializer):
if val: if val:
val = "{:.2f}".format(round(val, 2)) val = "{:.2f}".format(round(val, 2))
ret[f'{item["equipment_name"]}_consume_unit'] = val 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 return ret

1
apps/wpm/filters.py
View File

@ -24,6 +24,7 @@ class StLogFilter(filters.FilterSet):
"mgroup": ["exact"], "mgroup": ["exact"],
"mgroup__name": ["exact"], "mgroup__name": ["exact"],
"start_time": ["day", "month", "year", "gte", "lte"], "start_time": ["day", "month", "year", "gte", "lte"],
"sflogs__team": ["exact"],
"end_time": ["isnull"], "end_time": ["isnull"],
"sflog": ["exact"], "sflog": ["exact"],
"sflogs": ["exact"] "sflogs": ["exact"]