|
...
|
...
|
@@ -778,7 +778,6 @@ class CommonController extends RestBaseController |
|
|
|
public function getCheckList($page,$project_id){
|
|
|
|
//获取登录人所在的项目
|
|
|
|
$limit = config('site.limit');
|
|
|
|
$user = $this->getUserIdentity();
|
|
|
|
$res = Db::name('check')
|
|
|
|
->alias('c')
|
|
|
|
->join('user u','c.uid = u.id','LEFT')
|
|
...
|
...
|
@@ -788,6 +787,7 @@ class CommonController extends RestBaseController |
|
|
|
->order('c.id desc')
|
|
|
|
->select()
|
|
|
|
->toArray();
|
|
|
|
$user = $this->getProjectName($project_id);
|
|
|
|
foreach($res as &$value){
|
|
|
|
$leader = $this->getUserById(['id'=>$value['a_leader']]);
|
|
|
|
$value['leader'] = '';
|
|
...
|
...
|
@@ -798,6 +798,15 @@ class CommonController extends RestBaseController |
|
|
|
}
|
|
|
|
return $res;
|
|
|
|
}
|
|
|
|
|
|
|
|
//查询项目
|
|
|
|
public function getProjectName($project_id){
|
|
|
|
$res = Db::name('project')
|
|
|
|
->where('id',$project_id)
|
|
|
|
->field('id,name project_name')
|
|
|
|
->find();
|
|
|
|
return $res;
|
|
|
|
}
|
|
|
|
|
|
|
|
//查询月检总页数
|
|
|
|
public function getCheckPage(){
|
...
|
...
|
|
