增加年检项目id

@@ -573,11 +573,14 @@ return array (
     ],
     'add_year_test' => [
         'rule' => [
+            'project_id'            =>'require|number',
             'test_time'             => 'require|number',
             'address'               => 'require',
             'remark'                => 'require',
         ],
         'msg' => [
+            'project_id.require'         => '项目id不能为空',
+            'project_id.number'          => '项目id必须是数字',
             'test_time.require'          => '检测时间不能为空',
             'test_time.number'           => '检测时间必须为数字',
             'address.require'            => '检测地点不能为空',

@@ -96,15 +96,15 @@ class InformationController extends RestBaseController
             //月检
             if($user['identity'] == config('site.a_leaders')){
                 //总领导
-                $where = ['pid'=>$company_id];
+                $where = ['id'=>$company_id];
             }else{
                 //领导
-                $where = ['pid'=>$user['company_id']];
+                $where = ['id'=>$user['company_id']];
             }
             //查看甲方领导的对应的乙方
-            $b_company_id = $common->getCompany($where,'id');
-            $res['data'] = $common->getCheckByCompanyBId($b_company_id['id'],$data);
-            $res['total_page'] = $common->getCheckByCompanyBPage($b_company_id['id'],$data);
+            $b_company_id = $common->getCompany($where,'pid');
+            $res['data'] = $common->getCheckByCompanyBId($b_company_id['pid'],$data);
+            $res['total_page'] = $common->getCheckByCompanyBPage($b_company_id['pid'],$data);
             //查找乙方项目组下的乙方员工
             foreach($res['data'] as &$value){
                 $value['user_group'] = $common->getUserByProjectId($value['project_id'],'id,b_sid');

@@ -29,6 +29,7 @@ class YearsController extends RestBaseController
      *
      * @header name:token require:1 default: desc:header
      * @param name:test_time type:inter require:1 default: other desc:检测点时间
+     * @param name:project_id type:inter require:1 default: other desc:项目id
      * @param name:address type:string require:1 default: other desc:检测点地点
      * @param name:remark type:string require:1 default: other desc:检测点备注
      */
@@ -48,7 +49,6 @@ class YearsController extends RestBaseController
                 $this->error($validate->getError());
             }
 
-            $data['project_id'] = $user['project_id'];
             $data['create_time'] = time();
             //单号
             $data['number'] = $common->genOrderSn();
@@ -75,6 +75,7 @@ class YearsController extends RestBaseController
      * @header name:token require:1 default: desc:header
      *
      * @param name:page type:inter require:1 default: other desc:分页页码
+     * @param name:project_id type:inter require:1 default: other desc:项目id
      * @return data: @
      * @data id:年检检测id project_id:项目id test_time:检测时间 address:检测地点 remark:检测备注 company_name:检测甲方公司
      * @return page:当前页数
@@ -83,9 +84,11 @@ class YearsController extends RestBaseController
     public function testList(){
         if($this->request->isGet()){
             $page = $this->request->get('page');
+            $project_id = $this->request->get('project_id');
+
             $rule = config('site.pages');
             $validate = new Validate($rule['rule'],$rule['msg']);
-            if (!$validate->check(['page'=>$page])) {
+            if (!$validate->check(['page'=>$page,'project_id'=>$project_id])) {
                 $this->error($validate->getError());
             }
             $common = new CommonController();