Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/NewsController.php

@@ -1815,9 +1815,9 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = Context::get("UserId");
+        // $requireData['user_id'] = Context::get("UserId");
         $requireData['type_id'] = Context::get("TypeId");
-        $requireData['website_id'] = Context::get("SiteId");
+        // $requireData['website_id'] = Context::get("SiteId");
         $result = $this->newsServiceClient->addBook($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -1861,7 +1861,7 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = Context::get("UserId");
+        // $requireData['user_id'] = Context::get("UserId");
         $result = $this->newsServiceClient->updateBook($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }

app/Controller/WebController.php

@@ -994,6 +994,17 @@ class WebController extends AbstractController
         $result = $this->newsServiceClient->getWebsiteBookInfo($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
+    /**
+     * c端-获取招工招聘  下拉框及筛选
+     *
+     * 
+     *  */
+    public function getWebsiteJobSelect()
+    {
+        $requireData['website_id'] =  Context::get("SiteId")?? 0;
+        $result = $this->newsServiceClient->getWebsiteJobSelect($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
     /*
      * c端求职招聘-获取职位
      *
@@ -1170,4 +1181,33 @@ class WebController extends AbstractController
         $result = $this->newsServiceClient->getWebsiteJobRecruiting($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
+    /*
+     *  c端  -  验证路由
+     *
+     * */
+    public function checkWebsiteRoute()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'last_route' =>'required|string',
+                'all_route' =>'required|string',
+            ],
+            [
+                'last_route.required' => 'last_route不能为空',
+                'last_route.string' => 'last_route必须为字符串',
+                'all_route.required' => 'all_route不能为空',
+                'all_route.string' => 'all_route必须为字符串',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['website_id'] =  Context::get("SiteId")?? 0;
+        // return Result::success($requireData);
+        $result = $this->newsServiceClient->checkWebsiteRoute($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
 }

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']);

app/JsonRpc/NewsService.php

@@ -417,6 +417,14 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function checkWebsiteRoute(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 
     //20250324  通知，公告，消息
     public function getNoticeList(array $data)
@@ -495,6 +503,14 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteJobSelect(array $data) 
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     /**
      * @param array $data
      * @return mixed

app/JsonRpc/NewsServiceInterface.php

@@ -202,6 +202,11 @@ interface NewsServiceInterface
      * @return mixed
      */
     public function getWebsiteJobRecruiting(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function checkWebsiteRoute(array $data);
 
   /**
    * @param array $data
@@ -365,4 +370,9 @@ interface NewsServiceInterface
    * @return mixed
    */
   public function getJobResumeList(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteJobSelect(array $data);
 }

config/api/web.php

@@ -55,6 +55,9 @@ Router::addGroup(
                 Router::get('/getWebsiteArticles', [WebController::class, 'getWebsiteArticles']);
                 // 匹配路由
                 Router::get('/getWebsiteRoute', [WebController::class, 'getWebsiteRoute']);
+                // 验证路由
+                Router::get('/checkWebsiteRoute', [WebController::class, 'checkWebsiteRoute']);
+
                 // 商城
                 // 获取商城首页
                 Router::get('/getWebsiteshop', [WebController::class, 'getWebsiteshop']);
@@ -73,8 +76,12 @@ Router::addGroup(
                 Router::get('/getWebsiteBookInfo', [WebController::class, 'getWebsiteBookInfo']);
                 // 尝试
                 Router::get('/test', [WebController::class, 'test']);
+               
+
 
                 // 求职招聘
+                // 获取求职招聘下拉选框
+                Router::get('/getWebsiteJobSelect', [WebController::class, 'getWebsiteJobSelect']);
                 // 获取求职招聘
                 Router::get('/getWebsiteJob', [WebController::class, 'getWebsiteJob']);
                 // 获取求职招聘列表
@@ -85,7 +92,7 @@ Router::addGroup(
                 // Router::get('/getWebsiteJobApply', [WebController::class, 'getWebsiteJobApply']);
                 // 沟通简历
                 // Router::get('/getWebsiteJobResume', [WebController::class, 'getWebsiteJobResume']);
-
+                
             },
     ['middleware' => [WebMiddleware::class]]
 );