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

Merge branch 'hitosea-pro' into pro

Browse Source 
# Conflicts:
#	public/manifest.json
#	resources/assets/js/components/UserInput.vue
#	resources/assets/js/pages/manage/components/TaskDetail.vue
This commit is contained in:
kuaifan
2023-06-27 18:49:07 +08:00
parent 1fdaecf7b4 6c84319fca
commit ee3c3a0497
10 changed files with 321 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
app/Http/Controllers/Api/ProjectController.php
View File

@@ -16,6 +16,7 @@ use App\Models\ProjectLog;
use App\Models\ProjectTask;
use App\Models\ProjectTaskFile;
use App\Models\ProjectTaskFlowChange;
use App\Models\ProjectTaskUser;
use App\Models\ProjectUser;
use App\Models\User;
use App\Models\WebSocketDialog;
@@ -895,8 +896,17 @@ class ProjectController extends AbstractController
public function task__lists()
{
$user = User::auth();
//
// 任务可见性
$project_ids = Project::whereUserid($user->userid)->pluck('id')->toArray(); // 负责人项目ids
$main_task_ids = ProjectTask::whereIn('project_id', $project_ids)->pluck('id')->toArray(); // 负责人项目任务ids
$other_task_ids = ProjectTaskUser::whereUserid($user->userid)->whereColumn('task_id', '=', 'task_pid')->whereNotIn('project_id', $project_ids)->pluck('task_id')->toArray(); // 非负责人项目任务ids
$all_visible_task_ids = ProjectTask::whereIsAllVisible(1)->pluck('id')->toArray(); // 所有人可见项目ids
$one_task_ids = array_merge($main_task_ids, $other_task_ids);
$visibility_task_ids = array_merge($one_task_ids, $all_visible_task_ids);
$builder = ProjectTask::with(['taskUser', 'taskTag']);
$builder->whereIn("project_tasks.id", $visibility_task_ids);
//
$parent_id = intval(Request::input('parent_id'));
$project_id = intval(Request::input('project_id'));
@@ -1341,17 +1351,26 @@ class ProjectController extends AbstractController
*/
public function task__one()
{
User::auth();
$user = User::auth();
//
$task_id = intval(Request::input('task_id'));
$archived = Request::input('archived', 'no');
//
$isArchived = str_replace(['all', 'yes', 'no'], [null, false, true], $archived);
$task = ProjectTask::userTask($task_id, $isArchived, true, false, ['taskUser', 'taskTag']);
// 项目可见性
$project_userid = Project::whereId($task->project_id)->value('userid'); // 项目负责人
if ($task->is_all_visible != 1 && $user->userid != $project_userid) {
$visibleUserids = ProjectTaskUser::whereTaskId($task_id)->pluck('userid')->toArray();
if (!in_array($user->userid, $visibleUserids)) {
return Base::retError('无任务权限');
}
}
//
$data = $task->toArray();
$data['project_name'] = $task->project?->name;
$data['column_name'] = $task->projectColumn?->name;
$data['visibility_appointor'] = $task->is_all_visible==1 ? [0] : ProjectTaskUser::whereTaskId($task_id)->whereOwner(2)->pluck('userid');
return Base::retSuccess('success', $data);
}
@@ -1557,7 +1576,7 @@ class ProjectController extends AbstractController
*/
public function task__add()
{
User::auth();
$user = User::auth();
//
$data = Request::input();
$project_id = intval($data['project_id']);
@@ -1602,6 +1621,17 @@ class ProjectController extends AbstractController
$data = $data->toArray();
$data['new_column'] = $newColumn;
}
if ($data['is_all_visible'] == 1) {
$data['is_visible'] = 1;
} else {
$projectOwner = Project::whereId($data['project_id'])->pluck('userid')->toArray(); // 项目负责人
$taskOwnerAndAssists = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($data['id'])->pluck('userid')->toArray();
$visibleIds = array_merge($projectOwner, $taskOwnerAndAssists);
$data['is_visible'] = in_array($user->userid, $visibleIds) ? 1 : 0;
}
$task->pushMsg('add', $data);
$task->taskPush(null, 0);
return Base::retSuccess('添加成功', $data);
@@ -1663,6 +1693,7 @@ class ProjectController extends AbstractController
* @apiParam {String} [content] 任务详情（子任务不支持）
* @apiParam {String} [color] 背景色（子任务不支持）
* @apiParam {Array} [assist] 修改协助人员（子任务不支持）
* @apiParam {Array} [visibility_appointor] 修改可见性人员
*
* @apiParam {Number} [p_level] 优先级相关（子任务不支持）
* @apiParam {String} [p_name] 优先级相关（子任务不支持）
@@ -1679,17 +1710,47 @@ class ProjectController extends AbstractController
{
User::auth();
//
$data = Request::input();
$task_id = intval($data['task_id']);
$param = Request::input();
$task_id = intval($param['task_id']);
//
$task = ProjectTask::userTask($task_id, true, true, 2);
$taskUser = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($task_id)->whereIn('owner', [0, 1])->get();
$owners = $taskUser->where('owner', 1)->pluck('userid')->toArray(); // 负责人
$assist = $taskUser->where('owner', 0)->pluck('userid')->toArray(); // 协助人
// 更新任务
$updateMarking = [];
$task->updateTask($data, $updateMarking);
$task->updateTask($param, $updateMarking);
//
$data = ProjectTask::oneTask($task->id)->toArray();
$data['update_marking'] = $updateMarking ?: json_decode('{}');
$data['visibility_appointor'] = $data['is_all_visible'] == 1 ? [0] : ProjectTaskUser::whereTaskId($task->id)->whereOwner(2)->pluck('userid');
$task->pushMsg('update', $data);
// 可见性推送
if (Arr::exists($param, 'visibility_appointor')) {
if ($data['is_all_visible'] == 1) {
$task->pushMsgVisibleAdd($data);
}
if ($data['is_all_visible'] == 0) {
if ($param['visibility_appointor']) {
$task->pushMsgVisibleUpdate($data);
} else {
$task->pushMsgVisibleRemove();
}
}
}
if (Arr::exists($param, 'owner') && $data['is_all_visible'] == 0) {
$diff = array_diff($owners, $param['owner']);
if ($diff) {
$task->pushMsgVisibleRemove($diff);
}
}
if (Arr::exists($param, 'assist') && $data['is_all_visible'] == 0) {
$diff = array_diff($owners, $param['assist']);
if ($diff) {
$task->pushMsgVisibleRemove($diff);
}
}
//
return Base::retSuccess('修改成功', $data);
}