diff --git a/app/admin/controller/Statistics.php b/app/admin/controller/Statistics.php index 37e92da..c742327 100755 --- a/app/admin/controller/Statistics.php +++ b/app/admin/controller/Statistics.php @@ -2175,7 +2175,7 @@ class Statistics extends Base AND u.istest = 0 AND o.status = 1 AND o.addtime >= UNIX_TIMESTAMP(?) - AND o.addtime < UNIX_TIMESTAMP(?) + AND o.addtime <= UNIX_TIMESTAMP(?) GROUP BY DATE(FROM_UNIXTIME(o.addtime)) ", [$startDate, $endDate]); @@ -2186,7 +2186,7 @@ class Statistics extends Base COUNT(1) as user_login FROM user_login_log WHERE login_date >= ? - AND login_date < ? + AND login_date <= ? GROUP BY login_date ", [$startDate, $endDate]); @@ -2199,7 +2199,7 @@ class Statistics extends Base WHERE status = 1 AND istest = 0 AND addtime >= UNIX_TIMESTAMP(?) - AND addtime < UNIX_TIMESTAMP(?) + AND addtime <= UNIX_TIMESTAMP(?) GROUP BY DATE(FROM_UNIXTIME(addtime)) ", [$startDate, $endDate]); @@ -2214,7 +2214,7 @@ class Statistics extends Base AND u.status = 1 AND u.istest = 0 AND o.created_at >= ? - AND o.created_at < ? + AND o.created_at <= ? GROUP BY DATE(o.created_at) ", [$startDate, $endDate]); @@ -2222,7 +2222,7 @@ class Statistics extends Base $allDates = []; $currentDate = strtotime($startDate); $endTimestamp = strtotime($endDate); - while ($currentDate < $endTimestamp) { + while ($currentDate <= $endTimestamp) { $allDates[] = date('Y-m-d', $currentDate); $currentDate = strtotime('+1 day', $currentDate); }