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:14:13 +08:00
parent 80a6d64b7c
commit e0bab4e6bd
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -480,7 +480,7 @@
$page_size = !empty($params['page_size']) ? $params['page_size'] : 15;
$lists = Db::name('oa_approve')
->field('f.*,a.name,d.name as department_name,t.title as flow_type')
->field('f.*,a.name as user_name,d.name as dept_name,t.title as type_name')
->alias('f')
->join('admin a', 'a.id = f.admin_id', 'left')
->join('dept d', 'd.id = a.dept_id', 'left')
@ -491,15 +491,14 @@
->page($page_no, $page_size)->select()
->each(function($item){
$item['create_time'] = date('Y-m-d H:i', $item['create_time']);
$item['check_user'] = '-';
if($item['check_status']<2 && !empty($item['check_admin_ids'])){
$check_user = Db::name('admin')->where('id','in',$item['check_admin_ids'])->column('name');
$item['check_user'] = implode(',',$check_user);
$item['check_admin_users'] = implode(',',$check_user);
}
return $item;
})->toArray();
$count = Db::name('oa_approve')
->field('f.*,a.name,d.name as department_name,t.title as flow_type')
->field('f.*,a.name as user_name,d.name as dept_name,t.title as type_name')
->alias('f')
->join('admin a', 'a.id = f.admin_id', 'left')
->join('dept d', 'd.id = a.dept_id', 'left')
@ -524,7 +523,7 @@
$count = 0;
if($status == 0){
$lists = Db::name('oa_approve')
->field('f.*,a.name,d.name as department_name,t.title as flow_type')
->field('f.*,a.name as user_name,d.name as dept_name,t.title as type_name')
->alias('f')
->join('admin a', 'a.id = f.admin_id', 'left')
->join('dept d', 'd.id = a.dept_id', 'left')
@ -535,15 +534,14 @@
->page($page_no, $page_size)->select()
->each(function($item){
$item['create_time'] = date('Y-m-d H:i', $item['create_time']);
$item['check_user'] = '-';
if($item['check_status']<2 && !empty($item['check_admin_ids'])){
$check_user = Db::name('admin')->where('id','in',$item['check_admin_ids'])->column('name');
$item['check_user'] = implode(',',$check_user);
$item['check_admin_users'] = implode(',',$check_user);
}
return $item;
})->toArray();
$count = Db::name('oa_approve')
->field('f.*,a.name,d.name as department_name,t.title as flow_type')
->field('f.*,a.name as user_name,d.name as dept_name,t.title as type_name')
->alias('f')
->join('admin a', 'a.id = f.admin_id', 'left')
->join('dept d', 'd.id = a.dept_id', 'left')
@ -553,7 +551,7 @@
if($status == 1){
$lists = Db::name('oa_approve')
->field('f.*,a.name,d.name as department_name,t.title as flow_type')
->field('f.*,a.name as user_name,d.name as dept_name,t.title as type_name')
->alias('f')
->join('admin a', 'a.id = f.admin_id', 'left')
->join('dept d', 'd.id = a.dept_id', 'left')
@ -564,15 +562,14 @@
->page($page_no, $page_size)->select()
->each(function($item){
$item['create_time'] = date('Y-m-d H:i', $item['create_time']);
$item['check_user'] = '-';
if($item['check_status']<2 && !empty($item['check_admin_ids'])){
$check_user = Db::name('admin')->where('id','in',$item['check_admin_ids'])->column('name');
$item['check_user'] = implode(',',$check_user);
$item['check_admin_users'] = implode(',',$check_user);
}
return $item;
})->toArray();
$count = Db::name('oa_approve')
->field('f.*,a.name,d.name as department_name,t.title as flow_type')
->field('f.*,a.name as user_name,d.name as dept_name,t.title as type_name')
->alias('f')
->join('admin a', 'a.id = f.admin_id', 'left')
->join('dept d', 'd.id = a.dept_id', 'left')
@ -581,7 +578,7 @@
}
if($status == 2){
$lists = Db::name('oa_approve')
->field('f.*,a.name,d.name as department_name,t.title as flow_type')
->field('f.*,a.name as user_name,d.name as dept_name,t.title as type_name')
->alias('f')
->join('admin a', 'a.id = f.admin_id', 'left')
->join('dept d', 'd.id = a.dept_id', 'left')
@ -592,15 +589,14 @@
->page($page_no, $page_size)->select()
->each(function($item, $key){
$item['create_time'] = date('Y-m-d H:i', $item['create_time']);
$item['check_user'] = '-';
if($item['check_status']<2 && !empty($item['check_admin_ids'])){
$check_user = Db::name('admin')->where('id','in',$item['check_admin_ids'])->column('name');
$item['check_user'] = implode(',',$check_user);
$item['check_admin_users'] = implode(',',$check_user);
}
return $item;
})->toArray();
$count = Db::name('oa_approve')
->field('f.*,a.name,d.name as department_name,t.title as flow_type')
->field('f.*,a.name as user_name,d.name as dept_name,t.title as type_name')
->alias('f')
->join('admin a', 'a.id = f.admin_id', 'left')
->join('dept d', 'd.id = a.dept_id', 'left')