|
@@ -30,29 +30,35 @@ class MemberController
|
|
|
SELECT t1.month, t1.member_count,
|
|
|
SUM(t2.member_count) AS member_month_count
|
|
|
FROM (
|
|
|
- SELECT DATE_FORMAT(FROM_UNIXTIME(member_addtimes), '%Y%m') AS month,
|
|
|
+ SELECT DATE_FORMAT(FROM_UNIXTIME(member_addtimes), '%Y/%m') AS month,
|
|
|
COUNT(member_id) AS member_count
|
|
|
FROM app_member
|
|
|
WHERE member_mobile != '0000'
|
|
|
GROUP BY month
|
|
|
- ORDER BY month ASC
|
|
|
) t1
|
|
|
JOIN (
|
|
|
- SELECT DATE_FORMAT(FROM_UNIXTIME(member_addtimes), '%Y%m') AS month,
|
|
|
+ SELECT DATE_FORMAT(FROM_UNIXTIME(member_addtimes), '%Y/%m') AS month,
|
|
|
COUNT(member_id) AS member_count
|
|
|
FROM app_member
|
|
|
WHERE member_mobile != '0000'
|
|
|
GROUP BY month
|
|
|
- ORDER BY month ASC
|
|
|
) t2 ON t1.month >= t2.month
|
|
|
GROUP BY t1.month;
|
|
|
");
|
|
|
- dump($newAddition);
|
|
|
+
|
|
|
$newAdditionData = [];
|
|
|
+ $newAddition = json_decode(json_encode($newAddition), true);
|
|
|
+ foreach ($newAddition as $key => $item) {
|
|
|
+ $newAddition[$key]['monthNbr'] = intval(str_replace('/', '', $item['month']));
|
|
|
+ }
|
|
|
+ usort($newAddition,function ($a,$b){
|
|
|
+ return $a['monthNbr'] - $b['monthNbr'];
|
|
|
+ });
|
|
|
+
|
|
|
foreach ($newAddition as $item) {
|
|
|
- $newAdditionData['category'][] = $item->month;
|
|
|
- $newAdditionData['data'][] = $item->member_count;
|
|
|
- $newAdditionData['month_total'][] = $item->member_month_count;
|
|
|
+ $newAdditionData['category'][] = $item['month'];
|
|
|
+ $newAdditionData['data'][] = $item['member_count'];
|
|
|
+ $newAdditionData['month_total'][] = $item['member_month_count'];
|
|
|
}
|
|
|
|
|
|
// 饼图
|