mirror of
https://github.com/kuaifan/dootask.git
synced 2026-02-02 19:08:12 +00:00
fix:任务列表接口 - 消息数量错误修复
This commit is contained in:
parent
3ae3acf705
commit
0e12a08076
@ -995,10 +995,10 @@ class ProjectController extends AbstractController
|
|||||||
->groupBy('task_id');
|
->groupBy('task_id');
|
||||||
}, 'task_files', 'task_files.task_id', '=', 'project_tasks.id');
|
}, 'task_files', 'task_files.task_id', '=', 'project_tasks.id');
|
||||||
$builder->leftJoinSub(function ($query) {
|
$builder->leftJoinSub(function ($query) {
|
||||||
$query->select('id', DB::raw('count(*) as msg_num'))
|
$query->select('dialog_id', DB::raw('count(*) as msg_num'))
|
||||||
->from('web_socket_dialogs')
|
->from('web_socket_dialog_msgs')
|
||||||
->groupBy('id');
|
->groupBy('dialog_id');
|
||||||
}, 'socket_dialogs', 'socket_dialogs.id', '=', 'project_tasks.id');
|
}, 'socket_dialog_msgs', 'socket_dialog_msgs.dialog_id', '=', 'project_tasks.dialog_id');
|
||||||
$builder->leftJoinSub(function ($query) {
|
$builder->leftJoinSub(function ($query) {
|
||||||
$query->select('parent_id', DB::raw('count(*) as sub_num, sum(CASE WHEN complete_at IS NOT NULL THEN 1 ELSE 0 END) sub_complete') )
|
$query->select('parent_id', DB::raw('count(*) as sub_num, sum(CASE WHEN complete_at IS NOT NULL THEN 1 ELSE 0 END) sub_complete') )
|
||||||
->from('project_tasks')
|
->from('project_tasks')
|
||||||
@ -1007,7 +1007,7 @@ class ProjectController extends AbstractController
|
|||||||
// 给前缀“_”是为了不触发获取器
|
// 给前缀“_”是为了不触发获取器
|
||||||
$prefix = DB::getTablePrefix();
|
$prefix = DB::getTablePrefix();
|
||||||
$builder->selectRaw("{$prefix}task_files.file_num as _file_num");
|
$builder->selectRaw("{$prefix}task_files.file_num as _file_num");
|
||||||
$builder->selectRaw("{$prefix}socket_dialogs.msg_num as _msg_num");
|
$builder->selectRaw("{$prefix}socket_dialog_msgs.msg_num as _msg_num");
|
||||||
$builder->selectRaw("{$prefix}sub_task.sub_num as _sub_num");
|
$builder->selectRaw("{$prefix}sub_task.sub_num as _sub_num");
|
||||||
$builder->selectRaw("{$prefix}sub_task.sub_complete as _sub_complete");
|
$builder->selectRaw("{$prefix}sub_task.sub_complete as _sub_complete");
|
||||||
$builder->selectRaw("
|
$builder->selectRaw("
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user