Merge branch 'service_evaluate' into develop

app/Controller/ServiceEvaluateController.php

@@ -69,9 +69,8 @@ class ServiceEvaluateController extends BaseController
      */
     public function getEvaluateList(PersonnelRequest $validator)
     {
-        //根据服务专员iD 获取服务专员评价列表
-        $service_personnel_id = $this->request->input('service_personnel_id', 0);
-        return $this->success($this->evaluateService->getEvaluateList($service_personnel_id));
+        //获取服务专员评价列表
+        return $this->success($this->evaluateService->getEvaluateList($this->request->all()));
     }
 
 }

app/Service/ServiceEvaluateService.php

@@ -62,15 +62,17 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface
         return $res;
     }
 
-    public function getEvaluateList($service_personnel_id)
+    public function getEvaluateList($data)
     {
+        //踩坑 paginate 只能接收int型参数
+        $par_page = $data['par_page'] > 0 ? intval($data['par_page']) : '2';
         //查询评论列表 按照创建时间降序排序
         $res = Db::table('lanzu_service_evaluate as e')
             ->join('ims_cjdc_user as u','u.id','=','e.user_id')
-            ->where(['e.service_personnel_id'=>$service_personnel_id])
+            ->where(['e.service_personnel_id'=>$data['service_personnel_id']])
             ->select('e.*','u.name','u.img')
             ->orderBy('created_at','desc')
-            ->paginate(4);
+            ->paginate($par_page);
         return $res;
     }
 

app/Service/ServiceEvaluateServiceInterface.php

@@ -11,7 +11,7 @@ interface ServiceEvaluateServiceInterface
 
     public function getPersonnelInfo($service_personnel_id);
 
-    public function getEvaluateList($service_personnel_id);
+    public function getEvaluateList($data);
 
     public function getQuickEvaluate();