From f33a3c8f59f9f9cda93f673bf8c58944865bdbad Mon Sep 17 00:00:00 2001
From: Saipo <grasste0403@hotmail.com>
Date: Mon, 12 May 2025 16:34:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/main.py b/main.py
index 83da15e..a918aa4 100644
--- a/main.py
+++ b/main.py
@@ -216,10 +216,10 @@ class MyPlugin(Star):
         ranklist.sort(key=lambda x: x[2], reverse=True)
         ranklist_str = "产量最高排名\n"
         for i in range(len(ranklist)):
-            ranklist_str += f"{i+1} uid:{ranklist[i][0]} nameid:{ranklist[i][1]} 最高产量：{ranklist[i][2]}s 打胶时间：{ranklist[i][3]}\n"
+            ranklist_str += f"{i+1} uid:{ranklist[i][0]} nameid:{ranklist[i][1]} 最高产量：{ranklist[i][2]}ml 打胶时间：{ranklist[i][3]}\n"
         ranklist_str += "\n"
 
-        sql2 = "SELECT du.uid, du.nameid, t.min_volume, MIN(dj.eventTime) AS eventTime FROM dajiaouser du LEFT JOIN (SELECT openid, MIN(volume) AS min_volume FROM dajiao GROUP BY openid) t ON du.openid = t.openid LEFT JOIN dajiao dj ON du.openid = dj.openid AND t.min_volume = dj.volume GROUP BY du.uid, du.nameid, t.min_volume;"
+        sql2 = "SELECT du.uid, du.nameid, t.min_volume, MAX(dj.eventTime) AS eventTime FROM dajiaouser du LEFT JOIN (SELECT openid, MIN(volume) AS min_volume FROM dajiao GROUP BY openid) t ON du.openid = t.openid LEFT JOIN dajiao dj ON du.openid = dj.openid AND t.min_volume = dj.volume GROUP BY du.uid, du.nameid, t.min_volume;"
         cur.execute(sql2)
         date2 = cur.fetchall()
         ranklist2 = []
@@ -228,7 +228,7 @@ class MyPlugin(Star):
         ranklist2.sort(key=lambda x: x[2])
         ranklist_str += "产量最低排名\n"
         for i in range(len(ranklist2)):
-            ranklist_str += f"{i+1} uid:{ranklist2[i][0]} nameid:{ranklist2[i][1]} 最低产量：{ranklist2[i][2]}s 打胶时间：{ranklist2[i][3]}\n"
+            ranklist_str += f"{i+1} uid:{ranklist2[i][0]} nameid:{ranklist2[i][1]} 最低产量：{ranklist2[i][2]}ml 打胶时间：{ranklist2[i][3]}\n"
         yield event.plain_result(ranklist_str)
         cur.close()
         conn.close()
@@ -253,7 +253,7 @@ class MyPlugin(Star):
         ranklist.sort(key=lambda x: x[2], reverse=True)
         ranklist_str = "时长最长排名\n"
         for i in range(len(ranklist)):
-            ranklist_str += f"{i+1} uid:{ranklist[i][0]} {ranklist[i][1]} 最长时长：{ranklist[i][2]}ml 打胶时间：{ranklist[i][3]}\n"
+            ranklist_str += f"{i+1} uid:{ranklist[i][0]} {ranklist[i][1]} 最长时长：{ranklist[i][2]}s 打胶时间：{ranklist[i][3]}\n"
         ranklist_str += "\n"
 
         sql2 = "SELECT du.uid, du.nameid, t.min_timelong, MAX(dj.eventTime) AS eventTime FROM dajiaouser du LEFT JOIN (SELECT openid, MIN(timelong) AS min_timelong FROM dajiao GROUP BY openid) t ON du.openid = t.openid LEFT JOIN dajiao dj ON du.openid = dj.openid AND t.min_timelong = dj.timelong GROUP BY du.uid, du.nameid, t.min_timelong;"
@@ -265,7 +265,7 @@ class MyPlugin(Star):
         ranklist2.sort(key=lambda x: x[2])
         ranklist_str += "时长最短排名\n"
         for i in range(len(ranklist2)):
-            ranklist_str += f"{i+1} uid:{ranklist2[i][0]} {ranklist2[i][1]} 最短时长：{ranklist2[i][2]}ml 打胶时间：{ranklist2[i][3]}\n"
+            ranklist_str += f"{i+1} uid:{ranklist2[i][0]} {ranklist2[i][1]} 最短时长：{ranklist2[i][2]}s 打胶时间：{ranklist2[i][3]}\n"
         yield event.plain_result(ranklist_str)
         cur.close()
         conn.close()