修复时间筛选bug

apis/Lepao/Record/Admin/GetLepaoRecords.js

@@ -62,6 +62,7 @@ class AdminGetLepaoRecords extends API {
                     r.distance,
                     r.state,
                     a.name,
+                    a.user_avatar,
                     u.avatar,
                     u.username
                 FROM 
@@ -109,9 +110,21 @@ class AdminGetLepaoRecords extends API {
             countParams.push(`%${name}%`)
         }
 
-        if(queryTime || (Array.isArray(queryTime) && queryTime.length === 2)) {
-            sql += ` AND r.time >= ? AND r.time < ?`
-            countSql += ` AND r.time >= ? AND r.time < ?`
+        if (queryTime && Array.isArray(queryTime) && queryTime.length === 2) {
+            sql += `
+                AND STR_TO_DATE(r.startTime, '%Y-%m-%d %H:%i:%s')
+                    >= FROM_UNIXTIME(? / 1000)
+                AND STR_TO_DATE(r.startTime, '%Y-%m-%d %H:%i:%s')
+                    < FROM_UNIXTIME(? / 1000)
+            `
+
+            countSql += `
+                AND STR_TO_DATE(r.startTime, '%Y-%m-%d %H:%i:%s')
+                    >= FROM_UNIXTIME(? / 1000)
+                AND STR_TO_DATE(r.startTime, '%Y-%m-%d %H:%i:%s')
+                    < FROM_UNIXTIME(? / 1000)
+            `
+
             params.push(queryTime[0], queryTime[1])
             countParams.push(queryTime[0], queryTime[1])
         }

apis/Lepao/Record/GetLepaoRecords.js

@@ -54,7 +54,8 @@ class GetLepaoRecords extends API {
                     r.endTime,
                     r.distance,
                     r.state,
-                    a.name
+                    a.name,
+                    a.user_avatar
                 FROM 
                     lepao_record r
                 LEFT JOIN 
@@ -96,9 +97,21 @@ class GetLepaoRecords extends API {
             countParams.push(`%${name}%`)
         }
 
-        if(queryTime || (Array.isArray(queryTime) && queryTime.length === 2)) {
-            sql += ` AND r.time >= ? AND r.time < ?`
-            countSql += ` AND r.time >= ? AND r.time < ?`
+        if (queryTime && Array.isArray(queryTime) && queryTime.length === 2) {
+            sql += `
+                AND STR_TO_DATE(r.startTime, '%Y-%m-%d %H:%i:%s')
+                    >= FROM_UNIXTIME(? / 1000)
+                AND STR_TO_DATE(r.startTime, '%Y-%m-%d %H:%i:%s')
+                    < FROM_UNIXTIME(? / 1000)
+            `
+
+            countSql += `
+                AND STR_TO_DATE(r.startTime, '%Y-%m-%d %H:%i:%s')
+                    >= FROM_UNIXTIME(? / 1000)
+                AND STR_TO_DATE(r.startTime, '%Y-%m-%d %H:%i:%s')
+                    < FROM_UNIXTIME(? / 1000)
+            `
+
             params.push(queryTime[0], queryTime[1])
             countParams.push(queryTime[0], queryTime[1])
         }