whitefang 1 year ago
parent
commit
dab10dfc3d
1 changed files with 4 additions and 0 deletions
  1. 4 0
      app/workerapi/lists/ServiceWorkLists.php

+ 4 - 0
app/workerapi/lists/ServiceWorkLists.php

@@ -33,9 +33,11 @@ class ServiceWorkLists extends BaseWorkerDataLists
         $status = $this->params['status'] ?? 0;
         switch ($status){
             case 0:
+                $where[] = ['work_status','<>',1];
                 $where[] = ['service_status','in','0,1,2'];
                 break;
             case 1:
+                $where[] = ['work_status','<>',1];
                 $where['service_status'] = ['in','0,1,2'];
                 // 创建 DateTime 对象并设置为今天午夜
                 $startOfDay = new DateTime('today midnight');
@@ -48,6 +50,7 @@ class ServiceWorkLists extends BaseWorkerDataLists
                 $where[] = ['appointment_time','between',[$startOfDayTimestamp, $endOfDayTimestamp]];
                 break;
             case 2:
+                $where[] = ['work_status','<>',1];
                 $where['service_status'] = ['in','0,1,2'];
                 // 创建一个 DateTime 对象表示当前时间
                 $dateNow = new DateTime();
@@ -62,6 +65,7 @@ class ServiceWorkLists extends BaseWorkerDataLists
                 $where[] = ['appointment_time','between',[$midnightTimestamp, $lastSecondTimestamp]];
                 break;
             case 3:
+                $where[] = ['work_status','<>',1];
                 $where['approval'] = 0;
                 break;
             case 4: