作者 jinglong
1 个管道 的构建 通过 耗费 44 秒

取消报修确认环节

@@ -359,7 +359,7 @@ return array ( @@ -359,7 +359,7 @@ return array (
359 // 'video' => 'require', 359 // 'video' => 'require',
360 // 'audio' => 'require', 360 // 'audio' => 'require',
361 'description' => 'require', 361 'description' => 'require',
362 - 'u_id' => 'require|number', 362 +// 'u_id' => 'require|number',
363 ], 363 ],
364 'msg' => [ 364 'msg' => [
365 'title.require' => '表头信息不能为空', 365 'title.require' => '表头信息不能为空',
@@ -370,8 +370,8 @@ return array ( @@ -370,8 +370,8 @@ return array (
370 // 'video.require' => '视频凭证不能为空', 370 // 'video.require' => '视频凭证不能为空',
371 // 'audio.require' => '音频凭证不能为空', 371 // 'audio.require' => '音频凭证不能为空',
372 'description.require' => '故障问题不能为空', 372 'description.require' => '故障问题不能为空',
373 - 'u_id.require' => '指派人员不能为空',  
374 - 'u_id.number' => '指派人员必须为数字', 373 +// 'u_id.require' => '指派人员不能为空',
  374 +// 'u_id.number' => '指派人员必须为数字',
375 ] 375 ]
376 ], 376 ],
377 'data' => [ 377 'data' => [
@@ -32,7 +32,7 @@ class RepairController extends RestBaseController @@ -32,7 +32,7 @@ class RepairController extends RestBaseController
32 * @param name:video type:file require:0 default: other desc:视频凭证 32 * @param name:video type:file require:0 default: other desc:视频凭证
33 * @param name:audio type:file require:0 default: other desc:音频凭证 33 * @param name:audio type:file require:0 default: other desc:音频凭证
34 * @param name:description type:string require:1 default: other desc:故障问题描述 34 * @param name:description type:string require:1 default: other desc:故障问题描述
35 - * @param name:u_id type:inter require:1 default: other desc:指派人员id 35 + * @param name:u_id type:inter require:0 default: other desc:指派人员id
36 */ 36 */
37 public function addRepairPost(){ 37 public function addRepairPost(){
38 if($this->request->isPost()){ 38 if($this->request->isPost()){
@@ -70,41 +70,45 @@ class RepairController extends RestBaseController @@ -70,41 +70,45 @@ class RepairController extends RestBaseController
70 $data['images'] = $common->relationUrl($data['images']); 70 $data['images'] = $common->relationUrl($data['images']);
71 71
72 //指派人员uid 72 //指派人员uid
73 - $data['h_uid'] = $data['u_id'];  
74 - unset($data['u_id']);  
75 - 73 + //$data['h_uid'] = $data['u_id'];
  74 + //unset($data['u_id']);
  75 + $data['status'] = 1;
76 $repairModel = new RepairModel(); 76 $repairModel = new RepairModel();
77 $res = $repairModel->create($data); 77 $res = $repairModel->create($data);
78 if($res){ 78 if($res){
79 //极光推送 79 //极光推送
80 - if($data['party'] == 0){  
81 - //甲方发起,提醒指派乙方员工  
82 - $user_ids = [$data['h_uid']];  
83 - $content = config('site.repair_content_add_a');  
84 - }else{  
85 - //乙方发起,提醒指派甲方员工  
86 - $user_ids = [$data['h_uid']];  
87 - $content = config('site.repair_content_add_b');  
88 - }  
89 - $registration_id = $common->getPushUsers($user_ids);  
90 - if($registration_id){  
91 - $common = new CommonController();  
92 - $title = config('site.title');  
93 - $common->pushMessage($registration_id,$content,$title,$data['project_id']);  
94 - } 80 +// if($data['party'] == 0){
  81 +// //甲方发起,提醒指派乙方员工
  82 +// $user_ids = [$data['h_uid']];
  83 +// $content = config('site.repair_content_add_a');
  84 +// }else{
  85 +// //乙方发起,提醒指派甲方员工
  86 +// $user_ids = [$data['h_uid']];
  87 +// $content = config('site.repair_content_add_b');
  88 +// }
  89 +// $registration_id = $common->getPushUsers($user_ids);
  90 +// if($registration_id){
  91 +// $common = new CommonController();
  92 +// $title = config('site.title');
  93 +// $common->pushMessage($registration_id,$content,$title,$data['project_id']);
  94 +// }
95 95
96 //处理流程 96 //处理流程
97 $id = $res->id; 97 $id = $res->id;
98 $data1['create_time'] = time(); 98 $data1['create_time'] = time();
99 if($party['party'] == 0){ 99 if($party['party'] == 0){
100 - //甲方 100 + //甲方发起步骤
101 $step_name = config('site.a_step')[0]; 101 $step_name = config('site.a_step')[0];
102 }else{ 102 }else{
103 - //乙方 103 + //乙方发起步骤
104 $step_name = config('site.b_step')[0]; 104 $step_name = config('site.b_step')[0];
105 } 105 }
106 $common->repairStep($id,$step_name); 106 $common->repairStep($id,$step_name);
107 107
  108 + //乙方维修设备步骤
  109 + $step_name = config('site.a_step')[2];
  110 + $common->repairStep($id,$step_name);
  111 +
108 //记录参与人员id 112 //记录参与人员id
109 $join_uid['project_id'] = $data['project_id']; 113 $join_uid['project_id'] = $data['project_id'];
110 $join_uid['create_time'] = $data['create_time']; 114 $join_uid['create_time'] = $data['create_time'];