歌曲文件

@@ -9,6 +9,10 @@ class PropertyTrack extends BaseModel
 {
 {
     use SoftDeletes;
     use SoftDeletes;
 
 
+    public $hidden = [
+        'deleted_at', 'updated_at', 'apply_id', 'song_id', 'project_id', 'company_id'
+    ];
+
     public $guarded = [];
     public $guarded = [];
 
 
     /**
     /**

@@ -5,8 +5,11 @@ namespace App\Services;
 use App\Helper\CosHelper;
 use App\Helper\CosHelper;
 use App\Helper\Response;
 use App\Helper\Response;
 use App\Models\Legal\Contract;
 use App\Models\Legal\Contract;
+use App\Models\Legal\PropertyTrack;
 use App\Models\Legal\StakeholderContract;
 use App\Models\Legal\StakeholderContract;
 use App\Models\Legal\Treaty;
 use App\Models\Legal\Treaty;
+use App\Models\Musician\AppCompanyUser;
+use Illuminate\Database\Eloquent\Builder;
 use Qcloud\Cos\Client;
 use Qcloud\Cos\Client;
 
 
 /**
 /**
@@ -21,9 +24,16 @@ class PropertyTrackService extends Service
      */
      */
     public function list()
     public function list()
     {
     {
+        $res = PropertyTrack::query()->where(['create_admin'=>$this->identifier->company_id, 'from'=>1])
+                    ->when(filled($this->request->input('upload_time')), function (Builder $builder){
+                        list($start, $end) = explode('-', $this->request->input('upload_time'));
+                        $builder->whereBetween('upload_time', [trim($start), trim($end)]);
+                    })
+                    ->when(filled($this->request->input('song_name')), function (Builder $builder){
+                        $builder->where('like', 'like', "%{$this->request->input('song_name')}%");
+                    })->orderByDesc('id')->paginate($this->pageSize);
 
 
-
-        return Response::success();
+        return Response::success($res);
     }
     }
 
 
     /**
     /**
@@ -32,24 +42,35 @@ class PropertyTrackService extends Service
      */
      */
     public function show()
     public function show()
     {
     {
+        $data = [];
+
+        if ($track = PropertyTrack::query()->where(['id'=>$this->request->input('track_id'), 'from'=>1])->first()) {
+            $user  = AppCompanyUser::query()->where(['id'=>$track->create_admin])->first();
+            $track->setAttribute('submit_name', $user ? $user->name : '');
             return Response::success();
             return Response::success();
         }
         }
 
 
+        return Response::success($data);
+    }
+
     /**
     /**
      * 待上传数据
      * 待上传数据
      * @return \Illuminate\Http\JsonResponse
      * @return \Illuminate\Http\JsonResponse
      */
      */
     public function pending()
     public function pending()
     {
     {
-        return Response::success();
+        $count = PropertyTrack::query()->where(['create_admin'=>$this->identifier->company_id])->whereNull('upload_time')->count();
+        return Response::success(['count'=>$count]);
     }
     }
 
 
     /**
     /**
-     * 歌曲上传文件列表
+     * 歌曲上传文件列表 (不登录)
      * @return \Illuminate\Http\JsonResponse
      * @return \Illuminate\Http\JsonResponse
      */
      */
     public function file()
     public function file()
     {
     {
+
+
         return Response::success();
         return Response::success();
     }
     }
 }
 }