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

Merge pull request '队长档案统计' (#17) from mkm into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/17
This commit is contained in:
mkm 2023-08-03 11:52:07 +08:00
commit 52176df21c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/api/controller/CompanyController.php
View File

@ -11,6 +11,7 @@ use app\common\model\user\User;
use app\common\model\user\UserAccountLog; use app\common\model\user\UserAccountLog;
use think\facade\Db; use think\facade\Db;
use app\common\logic\CompanyLogic as CommonCompanyLogic; use app\common\logic\CompanyLogic as CommonCompanyLogic;
use app\common\model\informationg\UserInformationg;
/** /**
* Class CompanyController * Class CompanyController
@ -111,10 +112,15 @@ class CompanyController extends BaseApiController
$count = $query->count(); $count = $query->count();
$users = $query->page($page)->limit($limit)->with(['company' => function ($query) { $users = $query->page($page)->limit($limit)->with(['company' => function ($query) {
$query->field('id,company_name'); $query->field('id,company_name');
}])->append(['province_name', 'city_name', 'area_name', 'street_name'])->field('id,avatar,real_name,account,mobile as phone,province,city,area,street,company_id,qualification,nickname,is_contract,is_captain')->select()->each(function ($item, $key) { }])->append(['province_name', 'city_name', 'area_name', 'street_name'])
->field('id,avatar,real_name,account,mobile as phone,province,city,area,street,company_id,qualification,nickname,is_contract,is_captain')
->select()->each(function ($item, $key) {
if ($item['qualification'] != '') { if ($item['qualification'] != '') {
$item['qualification'] = json_decode($item['qualification'], true); $item['qualification'] = json_decode($item['qualification'], true);
} }
if($item['is_captain']==1){
$item['informationg_count']=UserInformationg::where(['create_user_id'=>$item['id'],'status'=>1])->count();
}
}); });
return $this->success('success', ['count' => $count, 'data' => $users]); return $this->success('success', ['count' => $count, 'data' => $users]);
} }