首页

app/Controller/WebsiteController.php

@@ -760,13 +760,97 @@ class WebsiteController extends AbstractController
                     if ($result['data']['monthArticle']) {
                         $list = PublicData::arrayColumnAsKey($result['data']['monthArticle'], 'date');
                     }
-                    $newResult = [];
+                    $newResult[1] = [];
+                    $newResult[2] = [];
+                    $newResult[3] = [];
+                    $newResult[4] = [];
+                    $newResult[10000] = [];
                     if ($dates) {
                         foreach ($dates as $key => $val) {
-                            $newResult[$key]['date'] = $val;
-                            $newResult[$key]['total_count'] = $list[$val]['total_count'] ?? 0;
+                            // 初始化默认值
+                            $defaultData = [
+                                'date' => $val,
+                                'count' => 0
+                            ];
+                            // 检查 $list[$val] 是否存在且 type_id 为 1
+                            if (isset($list[$val]) && $list[$val]['type_id'] == 1) {
+                                $newResult[1][$key] = [
+                                    'date' => $val,
+                                    'count' => $list[$val]['count'] ?? 0
+                                ];
+                            } else {
+                                // 若不存在，使用默认值
+                                $newResult[1][$key] = $defaultData;
+                            }
+
+                            if (isset($list[$val]) && $list[$val]['type_id'] == 10000) {
+                                $newResult[10000][$key] = [
+                                    'date' => $val,
+                                    'count' => $list[$val]['count'] ?? 0
+                                ];
+                            } else {
+                                // 若不存在，使用默认值
+                                $newResult[10000][$key] = $defaultData;
+                            }
+
+
+                            if (isset($list[$val]) && $list[$val]['type_id'] == 2) {
+                                $newResult[2][$key] = [
+                                    'date' => $val,
+                                    'count' => $list[$val]['count'] ?? 0
+                                ];
+                            } else {
+                                // 若不存在，使用默认值
+                                $newResult[2][$key] = $defaultData;
+                            }
+
+                            if (isset($list[$val]) && $list[$val]['type_id'] == 3) {
+                                $newResult[3][$key] = [
+                                    'date' => $val,
+                                    'count' => $list[$val]['count'] ?? 0
+                                ];
+                            } else {
+                                // 若不存在，使用默认值
+                                $newResult[3][$key] = $defaultData;
+                            }
+
+
+                            if (isset($list[$val]) && $list[$val]['type_id'] == 4) {
+                                $newResult[4][$key] = [
+                                    'date' => $val,
+                                    'count' => $list[$val]['count'] ?? 0
+                                ];
+                            } else {
+                                // 若不存在，使用默认值
+                                $newResult[4][$key] = $defaultData;
+                            }
                         }
                     }
+                    $newResult_new = [
+                        [
+                            'usertype' => 10000,
+                            'data' => $newResult[10000],
+                        ],
+                        [
+                            'usertype' => 1,
+                            'data' => $newResult[1],
+                        ],
+                        [
+                            'usertype' => 2,
+                            'data' => $newResult[2],
+                        ],
+                        [
+                            'usertype' => 3,
+                            'data' => $newResult[3],
+                        ],
+                        [
+                            'usertype' => 4,
+                            'data' => $newResult[4],
+                        ],
+
+                    ];
+
+
                     //1:个人会员 2：政务会员 3：企业会员 4:调研员 10000：管理员
                     $userType = [
                         '1' => '个人会员',
@@ -781,7 +865,8 @@ class WebsiteController extends AbstractController
                             $result['data']['userType'][$k]['typeName'] = $userType[$v['type_id']];
                         }
                     }
-                    $result['data']['monthArticle'] = $newResult;
+                    $result['data']['monthArticle'] = $newResult_new;
+                    $result['data']['list'] = $list;
                     return Result::success($result['data']);
                 } else {
                     return Result::error($result['message']);