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

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server

This commit is contained in:
caoqianming 2024-12-06 14:46:28 +08:00
parent 0cf481a69b 3901a57986
commit 9c0160f556
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/enm/views.py
View File

@ -220,7 +220,7 @@ class MpointStatViewSet(BulkCreateModelMixin, BulkDestroyModelMixin, CustomListM
group_by_fields.append(group_by)
qs = qs.values()
qs = qs.order_by()
aggreagte_qs = qs.values(*group_by_fields).annotate(total_val = Sum('val')).values('mpoint__name', 'total_val', 'mpoint__nickname', 'mpoint__unit')
aggreagte_qs = qs.values(*group_by_fields).annotate(total_val = Sum('val')).values('mpoint__name', 'total_val', 'mpoint__nickname', 'mpoint__unit', 'val_level')
result = list(aggreagte_qs)
return Response(result)