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

fix：1.仪表盘显示可见性有我，但不是我负责的任务的bug ，2.审批评论间距样式调整与可评论emoj表情加评论通知 ，3,添加任务判断是否存在交集时间内任务调整 ，4. 审批流程撤回后显示错误修复, 5. 审批添加评论后自动滚动到下方

Browse Source
This commit is contained in:
weifashi
2023-07-21 20:59:08 +08:00
parent 94f1e764bc
commit 42f805d7cc
10 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/Api/ApproveController.php
View File

@@ -190,12 +190,25 @@ class ApproveController extends AbstractController
$data['userid'] = (string)$user->userid;
$data['content'] = Request::input('content'); //内容+图片
$processInst = $this->getProcessById($data['proc_inst_id']);
$ret = Ihttp::ihttp_post($this->flow_url.'/api/v1/workflow/process/addGlobalComment', json_encode(Base::arrayKeyToCamel($data)));
$process = json_decode($ret['ret'] == 1 ? $ret['data'] : '{}', true);
if (!$process || $process['status'] != 200) {
return Base::retError($process['message'] ?? '添加失败');
}
//
// 推送通知
$botUser = User::botGetOrCreate('approval-alert');
foreach ( $processInst['userids'] as $id) {
if($id != $user->userid){
$dialog = WebSocketDialog::checkUserDialog($botUser, $id);
$processInst['comment_user_id'] = $user->userid;
$processInst['comment_content'] = json_decode($data['content'],true)['content'];
$this->approveMsg('approve_comment_notifier', $dialog, $botUser, $processInst, $processInst);
}
}
$res = Base::arrayKeyToUnderline($process['data']);
return Base::retSuccess('success', $res);
}
@@ -958,6 +971,8 @@ class ApproveController extends AbstractController
'type' => $process['var']['type'],
'start_time' => $process['var']['start_time'],
'end_time' => $process['var']['end_time'],
'comment_nickname' => $process['comment_user_id'] ? User::userid2nickname($process['comment_user_id']) : '',
'comment_content' => $process['comment_content'] ?? ''
];
$text = view('push.bot', ['type' => $type, 'action' => $action, 'is_finished' => $process['is_finished'], 'data' => (object)$data])->render();
$text = preg_replace("/^\x20+/", "", $text);
@@ -1011,6 +1026,7 @@ class ApproveController extends AbstractController
}
//
$res = Base::arrayKeyToUnderline($process['data']);
$res['userids'] = [];
foreach ($res['node_infos'] as &$val) {
if (isset($val['node_user_list'])) {
$node = $val['node_user_list'];
@@ -1020,10 +1036,12 @@ class ApproveController extends AbstractController
continue;
}
$val['node_user_list'][$k]['userimg'] = User::getAvatar($info->userid, $info->userimg, $info->email, $info->nickname);
$res['userids'][] = $item['target_id'];
}
}else if($val['aprover_id']){
$info = User::whereUserid($val['aprover_id'])->first();
$val['userimg'] = $info ? User::getAvatar($info->userid, $info->userimg, $info->email, $info->nickname) : '';
$res['userids'][] = $val['aprover_id'];
}
}
// 全局评论
@@ -1039,6 +1057,10 @@ class ApproveController extends AbstractController
}
$info = User::whereUserid($res['start_user_id'])->first();
$res['userimg'] = $info ? User::getAvatar($info->userid, $info->userimg, $info->email, $info->nickname) : '';
//
$res['userids'][] = $info->userid;
$res['userids'] = array_unique($res['userids']);
//
return $res;
}

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

@@ -1079,8 +1079,8 @@ class ProjectController extends AbstractController
$timerange = explode(',', $timerange);
}
if (Base::isDateOrTime($timerange[0]) && Base::isDateOrTime($timerange[1])) {
$query->where('project_tasks.start_at', '>=', Carbon::parse($timerange[0])->startOfDay());
$query->where('project_tasks.end_at', '<=', Carbon::parse($timerange[1])->endOfDay());
$query->where('project_tasks.start_at', '<=', Carbon::parse($timerange[1])->endOfDay());
$query->where('project_tasks.end_at', '>=', Carbon::parse($timerange[0])->startOfDay());
}
})
->when(!empty($taskid), function ($query) use ($taskid) {