mkm/work
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工作台-我的任务优化

Browse Source 
Signed-off-by: vilson <545522390@qq.com>
This commit is contained in:
vilson 2020-03-03 21:11:53 +08:00
parent 88d8be3908
commit 826c9c4e79
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
application/common/Model/Task.php
View File

@ -481,7 +481,16 @@ class Task extends CommonModel
return false;
}
public function getMemberTasks($memberCode = '', $done = 0, $page = 1, $pageSize = 10)
/**
* 成员任务
* @param string $memberCode
* @param int $done
* @param int $taskType 搜索类型 1-我执行的 2-我参与的 3-我创建的
* @param int $page
* @param int $pageSize
* @return array
*/
public function getMemberTasks($memberCode = '', $done = 0, $taskType = 1, $page = 1, $pageSize = 10)
{
if (!$memberCode) {
$memberCode = getCurrentMember()['code'];
@ -496,7 +505,18 @@ class Task extends CommonModel
if ($done != -1) {
$doneSql = " and t.done = {$done}";
}
//我执行的
if ($taskType == 1) {
$sql = "select *,t.id as id,t.name as name,t.code as code,t.create_time as create_time,t.end_time,t.begin_time from {$prefix}task as t join {$prefix}project as p on t.project_code = p.code where t.deleted = 0 {$doneSql} and t.assign_to = '{$memberCode}' and p.deleted = 0 order by t.id desc";
}
//我参与的
if ($taskType == 2) {
$sql = "select *,t.id as id,t.name as name,t.code as code,t.create_time as create_time,t.end_time,t.begin_time from {$prefix}task as t join {$prefix}project as p on t.project_code = p.code left join {$prefix}task_member as tm on tm.task_code = t.code where t.deleted = 0 {$doneSql} and tm.member_code = '{$memberCode}' and p.deleted = 0 order by t.id desc";
}
//我创建的
if ($taskType == 3) {
$sql = "select *,t.id as id,t.name as name,t.code as code,t.create_time as create_time,t.end_time,t.begin_time from {$prefix}task as t join {$prefix}project as p on t.project_code = p.code where t.deleted = 0 {$doneSql} and t.create_by = '{$memberCode}' and p.deleted = 0 order by t.id desc";
}
$total = Db::query($sql);
$total = count($total);
$sql .= " limit {$offset},{$limit}";

5
application/project/controller/Task.php
View File

@ -77,6 +77,7 @@ class Task extends BasicApi
*/
public function selfList()
{
$taskType = Request::post('taskType', 1);
$type = Request::post('type', 0);
$memberCode = Request::post('memberCode', '');
if (!$memberCode) {
@ -89,9 +90,11 @@ class Task extends BasicApi
$done = 0;
}
$type == -1 && $done = $type;
$list = $this->model->getMemberTasks($member['code'], $done, Request::post('page'), Request::post('pageSize'));
$list = $this->model->getMemberTasks($member['code'], $done, $taskType, Request::post('page'), Request::post('pageSize'));
$status = [0 => '普通', 1 => '紧急', 2 => '非常紧急'];
if ($list['list']) {
foreach ($list['list'] as &$task) {
$task['priText'] = $status[$task['pri']];
$task['executor'] = Member::where(['code' => $task['assign_to']])->field('name,avatar')->find();
$task['projectInfo'] = \app\common\Model\Project::where(['code' => $task['project_code']])->field('name,code')->find();
}