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 19:57:29 +08:00
parent cd739fab3a
commit 69ad910a1a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -488,7 +488,7 @@
->where($map) ->where($map)
->order('f.id desc') ->order('f.id desc')
->group('f.id') ->group('f.id')
->page($page_no, $page_size) ->page($page_no, $page_size)->select()
->each(function($item){ ->each(function($item){
$item['create_time'] = date('Y-m-d H:i', $item['create_time']); $item['create_time'] = date('Y-m-d H:i', $item['create_time']);
$item['check_user'] = '-'; $item['check_user'] = '-';
@ -497,7 +497,7 @@
$item['check_user'] = implode(',',$check_user); $item['check_user'] = implode(',',$check_user);
} }
return $item; return $item;
}); })->toArray();
$count = Db::name('oa_approve')->where($map)->count(); $count = Db::name('oa_approve')->where($map)->count();
return $this->success('成功', compact('count', 'list', 'page_no', 'page_size')); return $this->success('成功', compact('count', 'list', 'page_no', 'page_size'));
} }
@ -526,7 +526,7 @@
->whereOr([$map1,$map2]) ->whereOr([$map1,$map2])
->order('f.id desc') ->order('f.id desc')
->group('f.id') ->group('f.id')
->page($page_no, $page_size) ->page($page_no, $page_size)->select()
->each(function($item){ ->each(function($item){
$item['create_time'] = date('Y-m-d H:i', $item['create_time']); $item['create_time'] = date('Y-m-d H:i', $item['create_time']);
$item['check_user'] = '-'; $item['check_user'] = '-';
@ -535,7 +535,7 @@
$item['check_user'] = implode(',',$check_user); $item['check_user'] = implode(',',$check_user);
} }
return $item; return $item;
}); })->toArray();
$count = Db::name('oa_approve')->whereOr([$map1,$map2])->count(); $count = Db::name('oa_approve')->whereOr([$map1,$map2])->count();
} }
@ -549,7 +549,7 @@
->where($map1) ->where($map1)
->order('f.id desc') ->order('f.id desc')
->group('f.id') ->group('f.id')
->page($page_no, $page_size) ->page($page_no, $page_size)->select()
->each(function($item){ ->each(function($item){
$item['create_time'] = date('Y-m-d H:i', $item['create_time']); $item['create_time'] = date('Y-m-d H:i', $item['create_time']);
$item['check_user'] = '-'; $item['check_user'] = '-';
@ -558,7 +558,7 @@
$item['check_user'] = implode(',',$check_user); $item['check_user'] = implode(',',$check_user);
} }
return $item; return $item;
}); })->toArray();
$count = Db::name('oa_approve')->where($map1)->count(); $count = Db::name('oa_approve')->where($map1)->count();
} }
if($status == 2){ if($status == 2){
@ -571,7 +571,7 @@
->where($map2) ->where($map2)
->order('f.id desc') ->order('f.id desc')
->group('f.id') ->group('f.id')
->page($page_no, $page_size) ->page($page_no, $page_size)->select()
->each(function($item, $key){ ->each(function($item, $key){
$item['create_time'] = date('Y-m-d H:i', $item['create_time']); $item['create_time'] = date('Y-m-d H:i', $item['create_time']);
$item['check_user'] = '-'; $item['check_user'] = '-';
@ -580,7 +580,7 @@
$item['check_user'] = implode(',',$check_user); $item['check_user'] = implode(',',$check_user);
} }
return $item; return $item;
}); })->toArray();
$count = Db::name('oa_approve')->where($map2)->count(); $count = Db::name('oa_approve')->where($map2)->count();
} }
return $this->success('成功', compact('count', 'list', 'page_no', 'page_size')); return $this->success('成功', compact('count', 'list', 'page_no', 'page_size'));