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

app/Controller/FooterController.php

@@ -289,27 +289,12 @@ class FooterController extends AbstractController
                 'pageSize.required' => '每页显示数量不能为空'
             ]
         );
-        if($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        if(isset($requireData['con_title'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'con_title' =>'required'
-                ],
-                [
-                    'con_title.required' => '内容标题不能为空'
-                ]
-            );
-            if($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
+        if(isset($requireData['con_title']) && !empty($requireData['con_title'])){
             $data['con_title'] = $requireData['con_title'];
         }
-        
+        if(isset($requireData['list_title']) &&!empty($requireData['list_title'])){
+            $data['list_title'] = $requireData['list_title'];
+        }
         $data['fcat_id'] = $requireData['fcat_id'];
         $data['page'] = $requireData['page'];
         $data['pageSize'] = $requireData['pageSize'];

app/Controller/NewsController.php

@@ -1046,15 +1046,18 @@ class NewsController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'page' => 'integer|required',
-                'page_size' => 'integer|required',
+                'page'=> 'integer|required',
+                'page_size'=> 'integer|required',
+                'checkout' => 'integer|required',
             ],
             [
                 'page.integer' => 'page必须是整型',
                 'page_size.integer' => 'page_size必须是整型',
                 'page.required' => 'page不能为空',
                 'page_size.required' => 'page_size不能为空',
-            ]
+                'checkout.required' => 'checkout不能为空',
+                'checkout.integer' => 'checkout必须是整型',
+            ]   
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
@@ -1493,7 +1496,38 @@ class NewsController extends AbstractController
     {
         $requireData = $this->request->all();
         $result = $this->newsServiceClient->getCompanyNature($requireData);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code']==200? Result::success($result['data']) : Result::error($result['message']);   
+    }
+    /*
+    *后端-招聘 职位审核
+    * @return array
+    */
+    public function checkJobRecruiting(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id'=>'required',
+                'status' => 'required|integer|in:0,1,2',
+            ], 
+            [
+                'id.required' => 'id不能为空',
+                'status.required' => 'status不能为空',
+                'status.integer' => 'status必须是整数',
+                'status.in' => 'status必须是1,2,3中的一个' 
+            ]);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        if($requireData['status']=='2'){
+            if(empty($requireData['refuse_reason'])){
+                return Result::error('请填写审核不通过原因');
+            }
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->newsServiceClient->checkJobRecruiting($requireData);
+        return $result['code']==200? Result::success($result['data']) : Result::error($result['message']);
     }
     //202504084  审核状态
     public function updateGoodStatus()

app/JsonRpc/NewsService.php

@@ -512,4 +512,12 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
-}
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function checkJobRecruiting(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+}

app/JsonRpc/NewsServiceInterface.php

@@ -188,83 +188,84 @@ interface NewsServiceInterface
    */
   public function addJobRecruiting(array $data);
 
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getJobRecruitingArea(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getIndustry(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getPositionList(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getJobNature(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getExperience(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getEducation(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getSalary(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getLanguage(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getLevel(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getCompanySize(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getCompanyNature(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function upJobRecruiting(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function delJobRecruiting(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getJobCompany(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function upJobCompany(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getJobRecruitingArea(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getIndustry(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getPositionList(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getJobNature(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getExperience(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getEducation(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSalary(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getLanguage(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getLevel(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getCompanySize(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getCompanyNature(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upJobRecruiting(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delJobRecruiting(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getJobCompany(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upJobCompany(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function checkJobRecruiting(array $data);
 }

composer.lock

@@ -9248,11 +9248,11 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                },
                 "hyperf": {
                     "config": "Hyperf\\Watcher\\ConfigProvider"
+                },
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -12232,12 +12232,12 @@
     ],
     "aliases": [],
     "minimum-stability": "dev",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
         "php": ">=8.1"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "plugin-api-version": "2.6.0"
 }

config/api/news.php

@@ -97,6 +97,7 @@ Router::addGroup(
         Router::post('/addJobRecruiting', [NewsController::class, 'addJobRecruiting']);
         Router::post('/upJobRecruiting', [NewsController::class, 'upJobRecruiting']);
         Router::post('/delJobRecruiting', [NewsController::class, 'delJobRecruiting']);
+        Router::post('/checkJobRecruiting', [NewsController::class, 'checkJobRecruiting']);
         // 菜单
         Router::get('/getJobRecruitingArea', [NewsController::class, 'getJobRecruitingArea']);
         Router::get('/getIndustry', [NewsController::class, 'getIndustry']);