Merge branch 'service_evaluate' into develop

app/Model/ServiceEvaluate.php

@@ -19,4 +19,12 @@ class ServiceEvaluate extends Model
      */
     protected $attributes = [];
 
+    /**
+     *
+     */
+    protected $casts = [
+        'created_at' => 'datetime:Y-m-d h:i:s',
+        'updated_at' => 'datetime:Y-m-d h:i:s',
+    ];
+
 }

app/Service/ServiceEvaluateService.php

@@ -3,6 +3,7 @@
 namespace App\Service;
 
 use App\Model\ServiceEvaluate;
+use App\Model\ServicePersonnel;
 use App\Model\Users;
 use Hyperf\DbConnection\Db;
 use Hyperf\HttpServer\Contract\RequestInterface;
@@ -39,9 +40,9 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface
         $res = Db::table('lanzu_service_personnel')
             ->where([
                 ['user_id','=',$user_id],
-                ['status','=',1]
             ])
-            ->exists();
+            ->select('id')
+            ->first();
         return $res;
     }
 
@@ -66,11 +67,10 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface
         //踩坑 paginate 只能接收int型参数
         $per_page = isset($data['per_page']) && $data['per_page'] > 0 ? intval($data['per_page']) : 6;
         //查询评论列表 按照创建时间降序排序
-        $res = Db::table('lanzu_service_evaluate as e')
-            ->join('ims_cjdc_user as u','u.id','=','e.user_id')
-            ->where(['e.service_personnel_id'=>$data['service_personnel_id']])
-            ->select('e.*','u.name','u.img')
-            ->orderBy('created_at','desc')
+        $res = ServiceEvaluate::join('ims_cjdc_user as u','u.id','=','lanzu_service_evaluate.user_id')
+            ->where(['lanzu_service_evaluate.service_personnel_id'=>$data['service_personnel_id']])
+            ->select('lanzu_service_evaluate.*','u.name','u.img')
+            ->orderBy('lanzu_service_evaluate.created_at','desc')
             ->paginate($per_page);
         return $res;
     }