update

myapps/pc_management/api/rent_portal.py

@@ -563,13 +563,18 @@ def run_draw_list():
                     draw_record.draw_time,
                     draw_record.draw_time,
                     draw_record.created_at,
                     draw_record.created_at,
                     draw_record.updated_at,
                     draw_record.updated_at,
-                    draw_record.id
+                    draw_record.id,
+                    draw_record.user_id,
+                    draw_record.user_no,
+                    admin_account.user_name
+                    
                     """
                     """
     count_sql = " select count(draw_record.id) as total_count "
     count_sql = " select count(draw_record.id) as total_count "
 
 
     from_sql = """
     from_sql = """
                     FROM
                     FROM
                         draw_record
                         draw_record
+                    left join admin_account on admin_account.id = draw_record.user_id
                     """
                     """
 
 
     where_sql = " WHERE draw_record.status <> '-1' "
     where_sql = " WHERE draw_record.status <> '-1' "
@@ -604,6 +609,9 @@ def run_draw_list():
                 "bill_date": info.bill_date,
                 "bill_date": info.bill_date,
                 "real_total": info.real_total, "status": info.status,
                 "real_total": info.real_total, "status": info.status,
                 "id": info.id,
                 "id": info.id,
+                "user_id": info.user_id,
+                "user_no": info.user_no,
+                "user_name": info.user_name,
                 "create_time": info.created_at.strftime("%Y-%m-%d %H:%M:%S"),
                 "create_time": info.created_at.strftime("%Y-%m-%d %H:%M:%S"),
                 "draw_time": info.draw_time.strftime("%Y-%m-%d %H:%M:%S") if info.draw_time else "",
                 "draw_time": info.draw_time.strftime("%Y-%m-%d %H:%M:%S") if info.draw_time else "",
             }
             }