Browse Source

✨ feat: 支持乐跑时段检索

Pchen. 6 months ago
parent
commit
bad1067d04

+ 8 - 1
apis/Lepao/Account/Admin/GetAccountList.js

@@ -12,7 +12,7 @@ class GetAccountList extends API {
     }
 
     async onRequest(req, res) {
-        let { uuid, session, email, area, user_uuid, username, student_num, state, pagesize, current } = req.query
+        let { uuid, session, email, area, user_uuid, username, student_num, state, auto_time, pagesize, current } = req.query
 
         if ([uuid, session, pagesize, current].some(value => value === '' || value === null || value === undefined))
             return res.json({
@@ -138,6 +138,13 @@ class GetAccountList extends API {
             countParams.push(`%${username}%`)
         }
 
+        if (auto_time !== -1) {
+            sql += ` AND l.auto_time = ?`
+            countSql += ` AND l.auto_time = ?`
+            params.push(auto_time)
+            countParams.push(auto_time)
+        }
+
         if (state !== -1) {
             sql += ` AND l.state = ?`
             countSql += ` AND l.state = ?`

+ 8 - 1
apis/Lepao/Account/GetAccount.js

@@ -12,7 +12,7 @@ class GetAccount extends API {
     }
 
     async onRequest(req, res) {
-        let { uuid, session, email, area, username, student_num, state, pagesize, current } = req.query
+        let { uuid, session, email, area, username, student_num, state, auto_time, pagesize, current } = req.query
 
         if ([uuid, session, pagesize, current].some(value => value === '' || value === null || value === undefined))
             return res.json({
@@ -112,6 +112,13 @@ class GetAccount extends API {
             countParams.push(`%${username}%`)
         }
 
+        if (auto_time !== -1) {
+            sql += ` AND l.auto_time = ?`
+            countSql += ` AND l.auto_time = ?`
+            params.push(auto_time)
+            countParams.push(auto_time)
+        }
+
         if (state !== -1) {
             sql += ` AND l.state = ?`
             countSql += ` AND l.state = ?`

+ 7 - 1
apis/Lepao/Record/Admin/GetLepaoRecords.js

@@ -57,13 +57,19 @@ class AdminGetLepaoRecords extends API {
                     r.result,
                     r.lepao_account,
                     a.name,
-                    a.user_avatar
+                    a.user_avatar,
+                    u.username,
+                    u.avatar
                 FROM 
                     lepao_record r
                 LEFT JOIN 
                     lepao_account a
                 ON 
                     r.lepao_account = a.student_num
+                LEFT JOIN 
+                    users u
+                ON 
+                    a.create_user = u.uuid
                 WHERE 
                     1 = 1
             `

+ 1 - 1
apis/Public/GetAppVersion.js

@@ -13,7 +13,7 @@ class GetAppVersion extends API {
         res.json({
             ...BaseStdResponse.OK,
             data: {
-                version: '1.3',
+                version: '1.4',
                 msg: '\n更新内容:\n修复已知问题,优化用户体验'
             }
         })