liugc преди 1 година
родител
ревизия
d213cc5f5f
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      app/adminapi/lists/master_worker/MasterWorkerServiceOrderLists.php

+ 1 - 1
app/adminapi/lists/master_worker/MasterWorkerServiceOrderLists.php

@@ -90,7 +90,7 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
         }
         }
         // ( ( b.finished_time >= 1743436800  AND b.finished_time < 1746028800 ) or ( b.create_time >= 1743436800  AND b.create_time < 1746028800) )
         // ( ( b.finished_time >= 1743436800  AND b.finished_time < 1746028800 ) or ( b.create_time >= 1743436800  AND b.create_time < 1746028800) )
         if (!empty($this->params['start_time']) && !empty($this->params['end_time'])) {
         if (!empty($this->params['start_time']) && !empty($this->params['end_time'])) {
-            $this->sqlJoin = ' and ( ( b.finished_time >= '.strtotime($this->params['start_time']).'  AND b.finished_time < '.strtotime($this->params['end_time']).' ) or ( b.create_time >= '.strtotime($this->params['start_time']).'  AND b.create_time < '.strtotime($this->params['end_time']).') )';
+            $this->sqlJoin = ' and ( ( b.finished_time >= '.strtotime($this->params['start_time']).'  AND b.finished_time < '.(strtotime($this->params['end_time'])+86399).' ) or ( b.create_time >= '.strtotime($this->params['start_time']).'  AND b.create_time < '.(strtotime($this->params['end_time'])+86399).') )';
         }
         }
         //dd($this->sqlJoin);
         //dd($this->sqlJoin);
         $where[] = ['a.audit_state','=' ,1];
         $where[] = ['a.audit_state','=' ,1];