用户更改时间确认，如果15分钟不确认进行后台页面提醒

app/adminapi/lists/works/ServiceWorkLists.php

@@ -40,7 +40,7 @@ class ServiceWorkLists extends BaseAdminDataLists implements ListsSearchInterfac
     public function setSearch(): array
     {
         return [
-            '=' => ['id','work_sn', 'real_name', 'mobile', 'address', 'title', 'category_type', 'base_service_fee', 'service_fee', 'work_status','work_pay_status', 'service_status',  'finished_images', 'master_worker_id', 'work_amount','work_type'],
+            '=' => ['id','work_sn', 'real_name', 'mobile', 'address', 'title', 'category_type', 'base_service_fee', 'service_fee', 'work_status','work_pay_status', 'service_status',  'finished_images', 'master_worker_id', 'work_amount','work_type','appoint_approval'],
 
         ];
     }
@@ -71,6 +71,11 @@ class ServiceWorkLists extends BaseAdminDataLists implements ListsSearchInterfac
             $time = [strtotime($this->params['update_time'][0]), strtotime($this->params['update_time'][1])];
             $where[] = ['update_time', 'between', $time];
         }
+        if(isset($this->params['appoint_approval']) && !empty($this->params['appoint_approval'])){
+            // 时间 超过15分钟未确认
+            $time = time()-15*60;
+            $where[] = ['update_time', '<', $time];
+        }
         if(isset($this->params['workid']) && !empty($this->params['workid'])){
             $where[] = ['master_worker_id', '=', $this->params['workid']];
             $where[] = ['work_status', 'NOT IN', [7,8,9]];
@@ -114,7 +119,7 @@ class ServiceWorkLists extends BaseAdminDataLists implements ListsSearchInterfac
         ])
             ->where($this->searchWhere)
             ->where($this->queryWhere())
-            ->field(['id', 'work_sn', 'real_name', 'mobile', 'address', 'title', 'category_type', 'goods_category_ids', 'goods_category_id', 'base_service_fee', 'service_fee', 'work_status','work_pay_status', 'service_status', 'dispatch_time', 'receive_time', 'appointment_time', 'finished_images', 'finished_time', 'master_worker_id', 'work_amount', 'work_type', 'create_time', 'update_time','lon', 'lat'])
+            ->field(['id', 'work_sn', 'real_name', 'mobile', 'address', 'title', 'category_type', 'goods_category_ids', 'goods_category_id', 'base_service_fee', 'service_fee', 'work_status','work_pay_status', 'service_status', 'dispatch_time', 'receive_time', 'appointment_time', 'finished_images', 'finished_time', 'master_worker_id', 'work_amount', 'work_type', 'create_time', 'update_time','lon', 'lat','appoint_approval'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()

app/workerapi/controller/WorksController.php

@@ -274,6 +274,14 @@ class WorksController extends BaseApiController
         if (false === $result) {
             return $this->fail(ServiceWorkLogic::getError());
         }
+        // 工程师再次上门通知【给用户的通知】
+        $workDetail = ServiceWorkLogic::detail(['work_sn'=>$params['work_sn']]);
+        event('Notice',  [
+            'scene_id' => 119,
+            'params' => [
+                'user_id' => $workDetail['user_id'],
+            ]
+        ]);
         return $this->success('操作成功，已确定新的预约时间', [], 1, 1);
     }