取消报修确认环节

@@ -359,7 +359,7 @@ return array (
 //            'video'                 => 'require',
 //            'audio'                 => 'require',
             'description'           => 'require',
-            'u_id'                  => 'require|number',
+//            'u_id'                  => 'require|number',
         ],
         'msg' => [
             'title.require'        => '表头信息不能为空',
@@ -370,8 +370,8 @@ return array (
 //            'video.require'        => '视频凭证不能为空',
 //            'audio.require'        => '音频凭证不能为空',
             'description.require'  => '故障问题不能为空',
-            'u_id.require'         => '指派人员不能为空',
-            'u_id.number'          => '指派人员必须为数字',
+//            'u_id.require'         => '指派人员不能为空',
+//            'u_id.number'          => '指派人员必须为数字',
         ]
     ],
     'data' => [

@@ -32,7 +32,7 @@ class RepairController extends RestBaseController
      * @param name:video type:file require:0 default: other desc:视频凭证
      * @param name:audio type:file require:0 default: other desc:音频凭证
      * @param name:description type:string require:1 default: other desc:故障问题描述
-     * @param name:u_id type:inter require:1 default: other desc:指派人员id
+     * @param name:u_id type:inter require:0 default: other desc:指派人员id
      */
     public function addRepairPost(){
         if($this->request->isPost()){
@@ -70,41 +70,45 @@ class RepairController extends RestBaseController
             $data['images'] = $common->relationUrl($data['images']);
 
             //指派人员uid
-            $data['h_uid'] = $data['u_id'];
-            unset($data['u_id']);
-
+            //$data['h_uid'] = $data['u_id'];
+            //unset($data['u_id']);
+            $data['status'] = 1;
             $repairModel = new RepairModel();
             $res = $repairModel->create($data);
             if($res){
                 //极光推送
-                if($data['party'] == 0){
-                    //甲方发起，提醒指派乙方员工
-                    $user_ids = [$data['h_uid']];
-                    $content = config('site.repair_content_add_a');
-                }else{
-                    //乙方发起，提醒指派甲方员工
-                    $user_ids = [$data['h_uid']];
-                    $content = config('site.repair_content_add_b');
-                }
-                $registration_id = $common->getPushUsers($user_ids);
-                if($registration_id){
-                    $common = new CommonController();
-                    $title = config('site.title');
-                    $common->pushMessage($registration_id,$content,$title,$data['project_id']);
-                }
+//                if($data['party'] == 0){
+//                    //甲方发起，提醒指派乙方员工
+//                    $user_ids = [$data['h_uid']];
+//                    $content = config('site.repair_content_add_a');
+//                }else{
+//                    //乙方发起，提醒指派甲方员工
+//                    $user_ids = [$data['h_uid']];
+//                    $content = config('site.repair_content_add_b');
+//                }
+//                $registration_id = $common->getPushUsers($user_ids);
+//                if($registration_id){
+//                    $common = new CommonController();
+//                    $title = config('site.title');
+//                    $common->pushMessage($registration_id,$content,$title,$data['project_id']);
+//                }
 
                 //处理流程
                 $id = $res->id;
                 $data1['create_time'] = time();
                 if($party['party'] == 0){
-                    //甲方
+                    //甲方发起步骤
                     $step_name = config('site.a_step')[0];
                 }else{
-                    //乙方
+                    //乙方发起步骤
                     $step_name = config('site.b_step')[0];
                 }
                 $common->repairStep($id,$step_name);
 
+                //乙方维修设备步骤
+                $step_name = config('site.a_step')[2];
+                $common->repairStep($id,$step_name);
+
                 //记录参与人员id
                 $join_uid['project_id'] = $data['project_id'];
                 $join_uid['create_time'] = $data['create_time'];