Browse Source

✨ feat: 增加账户更新时间选择

Pchen. 2 months ago
parent
commit
358890012c

+ 4 - 4
apis/Lepao/Account/AddAccount.js

@@ -101,8 +101,8 @@ class AddAccount extends API {
 
         if (!id) {
             if (countRows.length !== 0) {
-                sql = 'UPDATE lepao_account SET create_user = ?, email = ?, area = ?, auto_time = ?, auto_run = ?, target_count = ?, create_time = ?, notes = ?, auto_day = ? WHERE id = ?'
-                r = await db.query(sql, [uuid, email, area, auto_time, auto_run, target_count, time, notes ?? '', JSON.stringify(auto_day), countRows[0].id])
+                sql = 'UPDATE lepao_account SET create_user = ?, email = ?, area = ?, auto_time = ?, auto_run = ?, target_count = ?, create_time = ?, update_time = ?, notes = ?, auto_day = ? WHERE id = ?'
+                r = await db.query(sql, [uuid, email, area, auto_time, auto_run, target_count, time, time, notes ?? '', JSON.stringify(auto_day), countRows[0].id])
             }
             else {
                 const face_code = await this.generateCode()
@@ -116,8 +116,8 @@ class AddAccount extends API {
                     return res.json({ ...BaseStdResponse.ERR, msg: '添加乐跑账号失败!数据库错误' })
             }
         } else {
-            sql = 'UPDATE lepao_account SET student_num = ?, email = ?, area = ?, auto_time = ?, target_count = ?, auto_run = ?, notes = ?, auto_day = ? WHERE id = ?'
-            r = await db.query(sql, [student_num, email, area, auto_time, target_count, auto_run, notes ?? '', JSON.stringify(auto_day), id])
+            sql = 'UPDATE lepao_account SET student_num = ?, email = ?, area = ?, auto_time = ?, target_count = ?, auto_run = ?, notes = ?, auto_day = ?, update_time = ? WHERE id = ?'
+            r = await db.query(sql, [student_num, email, area, auto_time, target_count, auto_run, notes ?? '', JSON.stringify(auto_day), time, id])
         }
 
         try {

+ 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, auto_time, pagesize, current } = req.query
+        let { uuid, session, email, area, user_uuid, username, student_num, state, auto_time, queryTime, pagesize, current } = req.query
 
         if ([uuid, session, pagesize, current].some(value => value === '' || value === null || value === undefined))
             return res.json({
@@ -157,6 +157,13 @@ class GetAccountList extends API {
             countParams.push(state)
         }
 
+        if (queryTime || (Array.isArray(queryTime) && queryTime.length === 2)) {
+            sql += ` AND ((l.update_time >= ? AND l.update_time < ?) OR (l.create_time >= ? AND l.create_time < ?))`
+            countSql += ` AND ((l.update_time >= ? AND l.update_time < ?) OR (l.create_time >= ? AND l.create_time < ?))`
+            params.push(queryTime[0], queryTime[1], queryTime[0], queryTime[1])
+            countParams.push(queryTime[0], queryTime[1], queryTime[0], queryTime[1])
+        }
+
         sql += `
             ORDER BY l.create_time DESC
             LIMIT ? OFFSET ?;

+ 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, auto_time, pagesize, current } = req.query
+        let { uuid, session, email, area, username, student_num, state, auto_time, queryTime, pagesize, current } = req.query
 
         if ([uuid, session, pagesize, current].some(value => value === '' || value === null || value === undefined))
             return res.json({
@@ -129,6 +129,13 @@ class GetAccount extends API {
             countParams.push(state)
         }
 
+        if(queryTime || (Array.isArray(queryTime) && queryTime.length === 2)) {
+            sql += ` AND ((l.update_time >= ? AND l.update_time < ?) OR (l.create_time >= ? AND l.create_time < ?))`
+            countSql += ` AND ((l.update_time >= ? AND l.update_time < ?) OR (l.create_time >= ? AND l.create_time < ?))`
+            params.push(queryTime[0], queryTime[1], queryTime[0], queryTime[1])
+            countParams.push(queryTime[0], queryTime[1], queryTime[0], queryTime[1])
+        }
+
         sql += `
             ORDER BY l.create_time DESC
             LIMIT ? OFFSET ?;

+ 1 - 2
apis/Lepao/Record/GetLepaoRecords.js

@@ -16,8 +16,7 @@ class GetLepaoRecords extends API {
 
         if ([uuid, session, pagesize, current].some(value => value === '' || value === null || value === undefined))
             return res.json({
-                ...BaseStdResponse.MISSING_PARAMETER,
-                endpoint: 1513126
+                ...BaseStdResponse.MISSING_PARAMETER
             })
 
         // 校验分页参数