From 73b225fa1922c9b23a16f384c3947f6a3a46342f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 28 Aug 2025 10:52:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96mlog=20list=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wpm/views.py | 50 +++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/apps/wpm/views.py b/apps/wpm/views.py
index 8d73f7f8..730ebb75 100644
--- a/apps/wpm/views.py
+++ b/apps/wpm/views.py
@@ -188,7 +188,7 @@ class MlogViewSet(CustomModelViewSet):
     serializer_class = MlogSerializer
     list_serializer_class = MlogListSerializer
     select_related_fields = ["create_by", "update_by", "handle_user", "equipment", "mgroup", "material_in", "material_out",
-                             'material_in__process', 'material_out__process', "mgroup__process"]
+                             'material_in__process', 'material_out__process', "mgroup__process", "submit_user"]
     # select_related_fields = ['create_by', 'update_by', 'mtask', 'mtaskb', 'mgroup',
     #                          'handle_user', 'handle_user_2', 'equipment', 'mgroup__belong_dept',
     #                          'equipment_2', 'material_in', 'material_out', 'route__routepack', 'submit_user',
@@ -211,35 +211,35 @@ class MlogViewSet(CustomModelViewSet):
             return MlogSerializer
         return super().get_serializer_class()
 
-    # def list(self, request, *args, **kwargs):
-    #     from django.db import connection
-    #     from django.conf import settings
-    #     # 清空之前的查询记录
-    #     connection.queries_log.clear()
+    def list(self, request, *args, **kwargs):
+        from django.db import connection
+        from django.conf import settings
+        # 清空之前的查询记录
+        connection.queries_log.clear()
         
-    #     # 调用父类的 list 方法
-    #     response = super().list(request, *args, **kwargs)
+        # 调用父类的 list 方法
+        response = super().list(request, *args, **kwargs)
         
-    #     # 获取执行的 SQL 查询
-    #     queries = connection.queries
-    #     sql_queries = []
+        # 获取执行的 SQL 查询
+        queries = connection.queries
+        sql_queries = []
         
-    #     for query in queries:
-    #         sql_queries.append({
-    #             'sql': query['sql'],
-    #             'time': query['time'],
-    #             'params': query.get('params', [])
-    #         })
+        for query in queries:
+            sql_queries.append({
+                'sql': query['sql'],
+                'time': query['time'],
+                'params': query.get('params', [])
+            })
         
-    #     # 将 SQL 信息添加到响应中（仅在调试模式）
-    #     if settings.DEBUG:
-    #         response.data['_debug'] = {
-    #             'sql_queries': sql_queries,
-    #             'total_queries': len(queries),
-    #             'total_time': sum(float(q['time']) for q in queries)
-    #         }
+        # 将 SQL 信息添加到响应中（仅在调试模式）
+        if settings.DEBUG:
+            response.data['_debug'] = {
+                'sql_queries': sql_queries,
+                'total_queries': len(queries),
+                'total_time': sum(float(q['time']) for q in queries)
+            }
         
-    #     return response
+        return response
     
     def add_info_for_list(self, data):
         czx_dict = {}