yaooo
/
lihai-oa
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新获取待办事项

This commit is contained in:
yaooo 2023-11-07 18:38:27 +08:00
parent 5f7d7b3d3f
commit 747fe3a718
1 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/api/controller/Common.php
View File

@ -77,8 +77,6 @@ class Common extends ApiController
'approve'=>Db::name('Approve')->where([['', 'exp', Db::raw("FIND_IN_SET('{$this->uid}',check_admin_ids)")]])->count(), 'approve'=>Db::name('Approve')->where([['', 'exp', Db::raw("FIND_IN_SET('{$this->uid}',check_admin_ids)")]])->count(),
'expenses'=>Db::name('Expense')->where([['', 'exp', Db::raw("FIND_IN_SET('{$this->uid}',check_admin_ids)")],['delete_time', '=', 0]])->count(), 'expenses'=>Db::name('Expense')->where([['', 'exp', Db::raw("FIND_IN_SET('{$this->uid}',check_admin_ids)")],['delete_time', '=', 0]])->count(),
'invoice'=>Db::name('Invoice')->where([['', 'exp', Db::raw("FIND_IN_SET('{$this->uid}',check_admin_ids)")],['delete_time', '=', 0]])->count(), 'invoice'=>Db::name('Invoice')->where([['', 'exp', Db::raw("FIND_IN_SET('{$this->uid}',check_admin_ids)")],['delete_time', '=', 0]])->count(),
// 'income'=>Db::name('Invoice')->where([['is_cash', '<', 2],['admin_id','=',$this->uid],['check_status', '=', 5],['delete_time', '=', 0]])->count(),
// 'contract'=>Db::name('Contract')->where([['', 'exp', Db::raw("FIND_IN_SET('{$this->uid}',check_admin_ids)")],['delete_time', '=', 0]])->count(),
'task'=>$handle['task'] = Db::name('ProjectTask')->where([['director_uid', '=', $this->uid],['flow_status', '<', 3],['delete_time', '=', 0]])->count() 'task'=>$handle['task'] = Db::name('ProjectTask')->where([['director_uid', '=', $this->uid],['flow_status', '<', 3],['delete_time', '=', 0]])->count()
]; ];
$this->apiSuccess('获取成功', $subject); $this->apiSuccess('获取成功', $subject);
@ -87,42 +85,20 @@ class Common extends ApiController
//获取待办任务 //获取待办任务
public function get_task_list() public function get_task_list()
{ {
$this->uid = JWT_UID; $user_id = JWT_UID;
$where = array();
$whereOr = array();
$map1 = []; $map1 = [];
$map2 = []; $map1[] = ['', 'exp', Db::raw("FIND_IN_SET('{$user_id}',check_admin_ids)")];
$map3 = []; $approve = Db::name('Approve')->where($map1)->order('id desc')->limit(2)->select();
$map1[] = ['admin_id', '=', $this->uid];
$map2[] = ['director_uid', '=', $this->uid]; $map1 = [];
$map3[] = ['', 'exp', Db::raw("FIND_IN_SET({$this->uid},assist_admin_ids)")]; $map1[] = ['', 'exp', Db::raw("FIND_IN_SET('{$user_id}',check_admin_ids)")];
if($this->isAuthProject($this->uid)==0){ $expense = Db::name('Expense')->where($map1)->order('id desc')->limit(2)->select();
$whereOr =[$map1,$map2,$map3];
} $map1 = [];
$where[] = ['delete_time', '=', 0]; $map1[] = ['', 'exp', Db::raw("FIND_IN_SET('{$user_id}',check_admin_ids)")];
$list = Db::name('ProjectTask') $invoice = Db::name('Invoice')->where($map1)->order('id desc')->limit(2)->select();
->where(function ($query) use ($whereOr) { $this->apiSuccess('获取成功', compact('approve', 'expense', 'invoice'));
if (!empty($whereOr))
$query->whereOr($whereOr);
})
->where($where)
->withoutField('content,md_content')
->order('flow_status asc')
->order('id desc')
->limit(8)
->select()->toArray();
foreach ($list as $key => &$val) {
$val['director_name'] = Db::name('Admin')->where(['id' => $val['director_uid']])->value('name');
if($val['end_time']>0){
$val['end_time'] = date('Y-m-d', $val['end_time']);
}
else{
$val['end_time'] = '-';
}
$val['flow_name'] = \app\project\model\ProjectTask::$FlowStatus[(int) $val['flow_status']];
}
$res['data'] = $list;
$this->apiSuccess('获取成功', $res);
} }
private function isAuthProject($uid) private function isAuthProject($uid)