Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

未完成项目概况

Browse Source
This commit is contained in:
kuaifan
2022-01-04 20:23:01 +08:00
parent f1f1d784ff
commit 186290e355
6 changed files with 487 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Models/ProjectTask.php
View File

@@ -54,8 +54,8 @@ use Request;
* @property-read int|null $task_tag_count
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectTaskUser[] $taskUser
* @property-read int|null $task_user_count
* @method static \Illuminate\Database\Eloquent\Builder|ProjectTask allData($userid = null)
* @method static \Illuminate\Database\Eloquent\Builder|ProjectTask authData($userid = null)
* @method static \Illuminate\Database\Eloquent\Builder|ProjectTask joinData($userid = null)
* @method static \Illuminate\Database\Eloquent\Builder|ProjectTask ownerData($userid = null)
* @method static \Illuminate\Database\Eloquent\Builder|ProjectTask betweenTime($start, $end)
* @method static \Illuminate\Database\Eloquent\Builder|ProjectTask newModelQuery()
@@ -257,17 +257,27 @@ class ProjectTask extends AbstractModel
}
/**
* 查询自己负责的任务
* 查询所有任务（与正常查询多返回owner字段）
* @param self $query
* @param null $userid
* @return self
*/
public function scopeAuthData($query, $userid = null)
public function scopeAllData($query, $userid = null)
{
DB::statement("SET SQL_MODE=''");
$pre = DB::connection()->getTablePrefix();
$userid = $userid ?: User::userid();
$query->whereIn('id', function ($qy) use ($userid) {
$qy->select('task_pid')->from('project_task_users')->where('userid', $userid)->where('owner', 1);
});
$query
->select([
'project_tasks.*',
DB::raw("MAX({$pre}project_task_users.owner) as owner")
])
->leftJoin('project_task_users', function ($leftJoin) use ($userid) {
$leftJoin
->on('project_task_users.userid', '=', DB::raw($userid))
->on('project_tasks.id', '=', 'project_task_users.task_id');
})
->groupBy('project_tasks.id');
return $query;
}
@@ -277,7 +287,7 @@ class ProjectTask extends AbstractModel
* @param null $userid
* @return self
*/
public function scopeJoinData($query, $userid = null)
public function scopeAuthData($query, $userid = null)
{
DB::statement("SET SQL_MODE=''");
$pre = DB::connection()->getTablePrefix();
@@ -294,7 +304,7 @@ class ProjectTask extends AbstractModel
}
/**
* 查询自己参与的任务（参与条件非必须）
* 查询自己负责的任务
* @param self $query
* @param null $userid
* @return self
@@ -309,11 +319,9 @@ class ProjectTask extends AbstractModel
'project_tasks.*',
DB::raw("MAX({$pre}project_task_users.owner) as owner")
])
->leftJoin('project_task_users', function ($leftJoin) use ($userid) {
$leftJoin
->on('project_task_users.userid', '=', DB::raw($userid))
->on('project_tasks.id', '=', 'project_task_users.task_id');
})
->join('project_task_users', 'project_tasks.id', '=', 'project_task_users.task_id')
->where('project_task_users.userid', $userid)
->where('project_task_users.owner', 1)
->groupBy('project_tasks.id');
return $query;
}