feat: 修改 enm/qua_data 排序问题

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
 
 

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"]