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

update

Browse Source
This commit is contained in:
weiz 2024-05-25 20:09:36 +08:00
parent 4cebdc52cd
commit 80a6d64b7c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/adminapi/controller/works/bgsp/OaApproveController.php
View File

@ -479,7 +479,7 @@
$page_no = !empty($params['page_no']) ? $params['page_no'] : 1;
$page_size = !empty($params['page_size']) ? $params['page_size'] : 15;
$list = Db::name('oa_approve')
$lists = Db::name('oa_approve')
->field('f.*,a.name,d.name as department_name,t.title as flow_type')
->alias('f')
->join('admin a', 'a.id = f.admin_id', 'left')
@ -505,7 +505,7 @@
->join('dept d', 'd.id = a.dept_id', 'left')
->join('oa_flow_type t', 't.id = f.type', 'left')
->where($map)->count();
return $this->success('成功', compact('count', 'list', 'page_no', 'page_size'));
return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size'));
}
public function lst(){
@ -520,10 +520,10 @@
$page_no = !empty($params['page_no']) ? $params['page_no'] : 1;
$page_size = !empty($params['page_size']) ? $params['page_size'] : 15;
$list = [];
$lists = [];
$count = 0;
if($status == 0){
$list = Db::name('oa_approve')
$lists = Db::name('oa_approve')
->field('f.*,a.name,d.name as department_name,t.title as flow_type')
->alias('f')
->join('admin a', 'a.id = f.admin_id', 'left')
@ -552,7 +552,7 @@
}
if($status == 1){
$list = Db::name('oa_approve')
$lists = Db::name('oa_approve')
->field('f.*,a.name,d.name as department_name,t.title as flow_type')
->alias('f')
->join('admin a', 'a.id = f.admin_id', 'left')
@ -580,7 +580,7 @@
->where($map1)->count();
}
if($status == 2){
$list = Db::name('oa_approve')
$lists = Db::name('oa_approve')
->field('f.*,a.name,d.name as department_name,t.title as flow_type')
->alias('f')
->join('admin a', 'a.id = f.admin_id', 'left')
@ -607,7 +607,7 @@
->join('oa_flow_type t', 't.id = f.type', 'left')
->where($map2)->count();
}
return $this->success('成功', compact('count', 'list', 'page_no', 'page_size'));
return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size'));
}
}