*
Showing
6 changed files
with
10 additions
and
6 deletions
| ... | @@ -4,6 +4,7 @@ namespace App\Models\Legal; | ... | @@ -4,6 +4,7 @@ namespace App\Models\Legal; |
| 4 | 4 | ||
| 5 | use App\Models\BaseModel; | 5 | use App\Models\BaseModel; |
| 6 | use Illuminate\Database\Eloquent\Factories\HasFactory; | 6 | use Illuminate\Database\Eloquent\Factories\HasFactory; |
| 7 | use Illuminate\Database\Eloquent\SoftDeletes; | ||
| 7 | 8 | ||
| 8 | /** | 9 | /** |
| 9 | * Class Contract | 10 | * Class Contract |
| ... | @@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; | ... | @@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; |
| 11 | */ | 12 | */ |
| 12 | class Contract extends BaseModel | 13 | class Contract extends BaseModel |
| 13 | { | 14 | { |
| 14 | use HasFactory; | 15 | use HasFactory,SoftDeletes; |
| 15 | 16 | ||
| 16 | /** | 17 | /** |
| 17 | * The attributes that should be cast to native types. | 18 | * The attributes that should be cast to native types. | ... | ... |
| ... | @@ -4,6 +4,7 @@ namespace App\Models\Legal; | ... | @@ -4,6 +4,7 @@ namespace App\Models\Legal; |
| 4 | 4 | ||
| 5 | use App\Models\BaseModel; | 5 | use App\Models\BaseModel; |
| 6 | use Illuminate\Database\Eloquent\Factories\HasFactory; | 6 | use Illuminate\Database\Eloquent\Factories\HasFactory; |
| 7 | use Illuminate\Database\Eloquent\SoftDeletes; | ||
| 7 | 8 | ||
| 8 | /** | 9 | /** |
| 9 | * Class Song | 10 | * Class Song |
| ... | @@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; | ... | @@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; |
| 11 | */ | 12 | */ |
| 12 | class Song extends BaseModel | 13 | class Song extends BaseModel |
| 13 | { | 14 | { |
| 14 | use HasFactory; | 15 | use HasFactory,SoftDeletes; |
| 15 | 16 | ||
| 16 | /** | 17 | /** |
| 17 | * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany | 18 | * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany | ... | ... |
| ... | @@ -4,6 +4,7 @@ namespace App\Models\Legal; | ... | @@ -4,6 +4,7 @@ namespace App\Models\Legal; |
| 4 | 4 | ||
| 5 | use App\Models\BaseModel; | 5 | use App\Models\BaseModel; |
| 6 | use Illuminate\Database\Eloquent\Factories\HasFactory; | 6 | use Illuminate\Database\Eloquent\Factories\HasFactory; |
| 7 | use Illuminate\Database\Eloquent\SoftDeletes; | ||
| 7 | 8 | ||
| 8 | /** | 9 | /** |
| 9 | * Class SongsIp | 10 | * Class SongsIp |
| ... | @@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; | ... | @@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; |
| 11 | */ | 12 | */ |
| 12 | class SongsIp extends BaseModel | 13 | class SongsIp extends BaseModel |
| 13 | { | 14 | { |
| 14 | use HasFactory; | 15 | use HasFactory,SoftDeletes; |
| 15 | 16 | ||
| 16 | /** | 17 | /** |
| 17 | * @var string | 18 | * @var string | ... | ... |
| ... | @@ -4,6 +4,7 @@ namespace App\Models\Legal; | ... | @@ -4,6 +4,7 @@ namespace App\Models\Legal; |
| 4 | 4 | ||
| 5 | use App\Models\BaseModel; | 5 | use App\Models\BaseModel; |
| 6 | use Illuminate\Database\Eloquent\Factories\HasFactory; | 6 | use Illuminate\Database\Eloquent\Factories\HasFactory; |
| 7 | use Illuminate\Database\Eloquent\SoftDeletes; | ||
| 7 | 8 | ||
| 8 | /** | 9 | /** |
| 9 | * Class Stakeholder | 10 | * Class Stakeholder |
| ... | @@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; | ... | @@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; |
| 11 | */ | 12 | */ |
| 12 | class Stakeholder extends BaseModel | 13 | class Stakeholder extends BaseModel |
| 13 | { | 14 | { |
| 14 | use HasFactory; | 15 | use HasFactory,SoftDeletes; |
| 15 | 16 | ||
| 16 | /** | 17 | /** |
| 17 | * @return \Illuminate\Database\Eloquent\Relations\HasMany | 18 | * @return \Illuminate\Database\Eloquent\Relations\HasMany | ... | ... |
| ... | @@ -4,6 +4,7 @@ namespace App\Models\Legal; | ... | @@ -4,6 +4,7 @@ namespace App\Models\Legal; |
| 4 | 4 | ||
| 5 | use App\Models\BaseModel; | 5 | use App\Models\BaseModel; |
| 6 | use Illuminate\Database\Eloquent\Factories\HasFactory; | 6 | use Illuminate\Database\Eloquent\Factories\HasFactory; |
| 7 | use Illuminate\Database\Eloquent\SoftDeletes; | ||
| 7 | 8 | ||
| 8 | /** | 9 | /** |
| 9 | * Class Treaty | 10 | * Class Treaty |
| ... | @@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; | ... | @@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; |
| 11 | */ | 12 | */ |
| 12 | class Treaty extends BaseModel | 13 | class Treaty extends BaseModel |
| 13 | { | 14 | { |
| 14 | use HasFactory; | 15 | use HasFactory,SoftDeletes; |
| 15 | 16 | ||
| 16 | /** | 17 | /** |
| 17 | * @var string | 18 | * @var string | ... | ... |
| ... | @@ -30,7 +30,6 @@ class MusicianSongService extends Service | ... | @@ -30,7 +30,6 @@ class MusicianSongService extends Service |
| 30 | $song_table = Song::table(); | 30 | $song_table = Song::table(); |
| 31 | $songip_table = SongsIp::table(); | 31 | $songip_table = SongsIp::table(); |
| 32 | 32 | ||
| 33 | |||
| 34 | $res = Song::query()->join($songip_table, "{$song_table}.id", '=', "{$songip_table}.song_id") | 33 | $res = Song::query()->join($songip_table, "{$song_table}.id", '=', "{$songip_table}.song_id") |
| 35 | ->with(['contractDetail', 'cover'])->whereIn("{$songip_table}.song_id", $song_ids)->select(["{$song_table}.id", 'publish_song']) | 34 | ->with(['contractDetail', 'cover'])->whereIn("{$songip_table}.song_id", $song_ids)->select(["{$song_table}.id", 'publish_song']) |
| 36 | ->groupBy(["song_id"])->paginate($this->pageSize); | 35 | ->groupBy(["song_id"])->paginate($this->pageSize); | ... | ... |
-
Please register or sign in to post a comment