维保流程

application/api/controller/worker/Maintain.php

@@ -19,12 +19,21 @@ class Maintain extends Api
         $status = input('status',0);
 
         $map = [
-            'worker_id' => $this->auth->id,
-            'status'  => $status,
+            'm.worker_id' => $this->auth->id,
+            'm.status'  => $status,
+        ];
+
+        $field = [
+            'm.id','m.orderno','m.info','m.filedata','m.mobile','m.address','m.status','m.cailiao_time','m.lingqu_time','m.shangmen_time','m.wancheng_time',
+            'user.contactname',
+            'uc.projectname'
         ];
-        $list = Db::name('maintain')->field('id,orderno,createtime,info,filedata,status,eva_time')
-            ->where($map)->order('id desc')
+        $list = Db::name('maintain')->alias('m')->field($field)
+            ->join('user','m.user_id = user.id','LEFT')
+            ->join('user_company uc','m.user_id = uc.user_id','LEFT')
+            ->where($map)->order('m.id desc')
             ->autopage()->select();
+
         if(!empty($list)){
 
             $maintain_model = new Maintainmodel();
@@ -252,6 +261,8 @@ class Maintain extends Api
             'shangmen_time' => $nowtime, //上门时间
             'weixiu_times' => $weixiu['weixiu_times'],
             'weixiu_id' => $weixiu_id,
+
+            'wancheng_time' => 0, //清空完成时间
         ];
         $rs2 = Db::name('maintain')->where('id',$order_id)->update($update);
         if($rs2 === false){