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 2019-08-28 10:20:57 +08:00
parent 03a52f8d09
commit a47c4c8d31
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -484,7 +484,7 @@ class Task extends CommonModel
if ($done != -1) {
$doneSql = " and t.done = {$done}";
}
$sql = "select *,t.id as id,t.name as name,t.code as code,t.create_time as create_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";
$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";
$total = Db::query($sql);
$total = count($total);
$sql .= " limit {$offset},{$limit}";

3
application/project/controller/Account.php
View File

@ -73,11 +73,14 @@ class Account extends BasicApi
}
$list = $this->model->_list($where, 'id asc');
if ($list['list']) {
$organizaionCode = getCurrentOrganizationCode();
foreach ($list['list'] as &$item) {
$memberInfo = Member::where(['code' => $item['member_code']])->field('id', true)->find();
if ($memberInfo) {
$item['avatar'] = $memberInfo['avatar'];
}
$memberAccount = MemberAccount::where(['member_code' => $memberInfo['code'], 'organization_code' => $organizaionCode])->field('code,status,authorize')->find();
$item['membar_account_code'] = $memberAccount ? $memberAccount['code'] : '';
$departments = [];
$departmentCodes = $item['department_code'];
if ($departmentCodes) {

14
application/project/controller/DepartmentMember.php
View File

@ -48,6 +48,20 @@ class DepartmentMember extends BasicApi
$this->success('', $list);
}
/**
* 成员详情
* @throws DataNotFoundException
* @throws DbException
* @throws ModelNotFoundException
*/
public function detail()
{
$code = Request::param('code');
$organization = Request::param('organization');
$member = MemberAccount::alias('m')->join('projectAuth a', 'a.id = m.authorize')->join('member mb','mb.code = m.member_code')->where(['m.member_code' => $code,'m.organization_code'=>$organization])->field('*,m.member_code as code,m.name as name')->find();
$this->success('', $member);
}
/**
* 邀请成员查询

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

@ -29,11 +29,14 @@ class TaskMember extends BasicApi
$taskCode = Request::post('taskCode');
$where = [];
$where[] = ['task_code', '=', $taskCode];
$list = $this->model->_list($where,'is_owner desc');
$list = $this->model->_list($where, 'is_owner desc');
if ($list['list']) {
$organizaionCode = getCurrentOrganizationCode();
foreach ($list['list'] as &$item) {
$member = Member::where(['code' => $item['member_code']])->field('id,name,avatar,code')->find();
!$member && $member = [];
$memberAccount = MemberAccount::where(['member_code' => $member['code'], 'organization_code' => $organizaionCode])->field('code,status,authorize')->find();
$member['membar_account_code'] = $memberAccount ? $memberAccount['code'] : '';
$member['is_executor'] = $item['is_executor'];
$member['is_owner'] = $item['is_owner'];
$item = $member;