修改流程加状态，重新发起建议时间

@@ -2237,4 +2237,14 @@ class CommonController extends RestBaseController
         }
         }
         return $res;
         return $res;
     }
     }
+
+    //查询流程报修改造状态
+    public function getStepRepairStatus($table,$id){
+        $res = Db::name($table)
+            ->where('id',$id)
+            ->field('id,status')
+            ->find();
+        $status = !empty($res)?$res['status']:'';
+        return $status;
+    }
 }
 }

@@ -141,6 +141,7 @@ class ExerciseController extends RestBaseController
      * @return exercise_time:演习时间
      * @return exercise_time:演习时间
      * @return address:演习地点
      * @return address:演习地点
      * @return remark:演习备注
      * @return remark:演习备注
+     * @return advice_time:驳回建议时间
      */
      */
     public function reEditExercise(){
     public function reEditExercise(){
         if($this->request->isGet()){
         if($this->request->isGet()){
@@ -151,7 +152,7 @@ class ExerciseController extends RestBaseController
                 $this->error($validate->getError());
                 $this->error($validate->getError());
             }
             }
             $common = new CommonController();
             $common = new CommonController();
-            $field = 'id,exercise_time,address,remark';
+            $field = 'id,exercise_time,address,remark,advice_time';
             $res = $common->getExerciseById(['id'=>$id,'status'=>1],$field);
             $res = $common->getExerciseById(['id'=>$id,'status'=>1],$field);
             $this->success('成功',$res);
             $this->success('成功',$res);
         }else{
         }else{

@@ -337,6 +337,7 @@ class ReformController extends RestBaseController
      * @return data:流程数据@
      * @return data:流程数据@
      * @data id:流程id step_name:流程名称 create_time:流程时间
      * @data id:流程id step_name:流程名称 create_time:流程时间
      * @return flag:标识（0：禁止改造完成，1：可以改造完成）
      * @return flag:标识（0：禁止改造完成，1：可以改造完成）
+     * @return status:状态（0：待确认，1：维修中，2：已完成）
      */
      */
     public function reformProcess(){
     public function reformProcess(){
         if($this->request->isGet()){
         if($this->request->isGet()){
@@ -362,7 +363,9 @@ class ReformController extends RestBaseController
                     $value['create_time'] = date('Y-m-d',$value['create_time']);
                     $value['create_time'] = date('Y-m-d',$value['create_time']);
                 }
                 }
             }
             }
-            $this->success('成功',['data'=>$res,'flag'=>$flag]);
+            $common = new CommonController();
+            $status = $common->getStepRepairStatus('reform',$id);
+            $this->success('成功',['data'=>$res,'flag'=>$flag,'status'=>$status]);
         }else{
         }else{
             $this->error('请求方式错误！');
             $this->error('请求方式错误！');
         }
         }

@@ -338,6 +338,7 @@ class RepairController extends RestBaseController
      * @return data:流程数据@
      * @return data:流程数据@
      * @data id:流程id step_name:流程名称 create_time:流程时间
      * @data id:流程id step_name:流程名称 create_time:流程时间
      * @return flag:标识（0：禁止报修完成，1：可以报修完成）
      * @return flag:标识（0：禁止报修完成，1：可以报修完成）
+     * @return status:状态（0：待确认，1：维修中，2：已完成）
      */
      */
     public function repairProcess(){
     public function repairProcess(){
         if($this->request->isGet()){
         if($this->request->isGet()){
@@ -363,7 +364,9 @@ class RepairController extends RestBaseController
                     $value['create_time'] = date('Y-m-d',$value['create_time']);
                     $value['create_time'] = date('Y-m-d',$value['create_time']);
                 }
                 }
             }
             }
-            $this->success('成功',['data'=>$res,'flag'=>$flag]);
+            $common = new CommonController();
+            $status = $common->getStepRepairStatus('repair',$id);
+            $this->success('成功',['data'=>$res,'flag'=>$flag,'status'=>$status]);
         }else{
         }else{
             $this->error('请求方式错误！');
             $this->error('请求方式错误！');
         }
         }

@@ -141,6 +141,7 @@ class TrainController extends RestBaseController
      * @return train_time:培训时间
      * @return train_time:培训时间
      * @return address:培训地点
      * @return address:培训地点
      * @return remark:培训备注
      * @return remark:培训备注
+     * @return advice_time:驳回建议时间
      */
      */
     public function reEditTrain(){
     public function reEditTrain(){
         if($this->request->isGet()){
         if($this->request->isGet()){
@@ -151,7 +152,7 @@ class TrainController extends RestBaseController
                 $this->error($validate->getError());
                 $this->error($validate->getError());
             }
             }
             $common = new CommonController();
             $common = new CommonController();
-            $field = 'id,train_time,address,remark';
+            $field = 'id,train_time,address,remark,advice_time';
             $res = $common->getTrainById(['id'=>$id,'status'=>1],$field);
             $res = $common->getTrainById(['id'=>$id,'status'=>1],$field);
             $this->success('成功',$res);
             $this->success('成功',$res);
         }else{
         }else{