diff --git a/app/Tasks/UnclaimedTaskRemindTask.php b/app/Tasks/UnclaimedTaskRemindTask.php index a91ce6032..49703f435 100644 --- a/app/Tasks/UnclaimedTaskRemindTask.php +++ b/app/Tasks/UnclaimedTaskRemindTask.php @@ -47,7 +47,7 @@ class UnclaimedTaskRemindTask extends AbstractTask Project::whereNull('deleted_at')->whereNull('archived_at')->chunk(100,function($projects) { foreach ($projects as $project) { // - $count = ProjectTask::query() + $projectTasks = ProjectTask::select('project_tasks.id','project_tasks.name') ->leftJoin('project_task_users', function ($query) { $query->on('project_tasks.id', '=', 'project_task_users.task_id'); }) @@ -55,8 +55,10 @@ class UnclaimedTaskRemindTask extends AbstractTask ->whereNull('project_tasks.deleted_at') ->whereNull('project_tasks.archived_at') ->whereNull('project_task_users.id') - ->count(); - if($count > 0){ + ->limit(10) + ->get(); + // + if( !$projectTasks->isEmpty() ){ $botUser = User::botGetOrCreate('task-alert'); if (empty($botUser)) { return; @@ -65,8 +67,13 @@ class UnclaimedTaskRemindTask extends AbstractTask $project->joinProject($botUser->userid); $project->syncDialogUser(); } + // + $taskHtml = '任务待领取
'; + foreach($projectTasks as $projectTask){ + $taskHtml .= "id}\">#{$projectTask->name}
"; + } WebSocketDialogMsg::sendMsg(null, $project->dialog_id , 'text', [ - 'text' => "当前存在{$count}个未领取任务" + 'text' => $taskHtml ], $botUser->userid); } } diff --git a/docker-compose.yml b/docker-compose.yml index d451b2ad3..b0a70a9f5 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -168,7 +168,7 @@ services: ai: container_name: "dootask-ai-${APP_ID}" - image: "kuaifan/dooai:0.0.7" + image: "kuaifan/dooai:0.0.8" networks: extnetwork: ipv4_address: "${APP_IPPR}.12" diff --git a/language/original-web.txt b/language/original-web.txt index 98749ea71..f301e56f1 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -1394,4 +1394,8 @@ APP推送 开启后,键盘上的发送按钮会被替换成换行 仅我的 未领任务提醒 -开启后每天按设定的提醒时间在项目群聊中发送未领取任务通知。 \ No newline at end of file +开启后每天按设定的提醒时间在项目群聊中发送未领取任务通知。 +延期时长 +延期备注 +请输入时长 +必须大于0 diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index 33f08973e..29214922a 100644 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -245,11 +245,28 @@
- {{$L('截止时间')}} + + + {{$L('截止时间')}} + + + +
+ {{$L('任务延期')}} +
+
+ +
+ {{$L('修改时间')}} +
+
+
+