|
|
@@ -84,11 +84,12 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
|
|
|
$where[] = ['a.cooperation','=' ,$this->params['cooperation']];
|
|
|
}
|
|
|
if (!empty($this->params['start_time'])) {
|
|
|
- $this->sqlJoin .= ' AND b.update_time >= '.strtotime($this->params['start_time']);
|
|
|
+ $this->sqlJoin .= ' AND b.finished_time >= '.strtotime($this->params['start_time']);
|
|
|
}
|
|
|
if (!empty($this->params['end_time'])) {
|
|
|
- $this->sqlJoin .= ' AND b.update_time < '.strtotime($this->params['end_time'])+86400;
|
|
|
+ $this->sqlJoin .= ' AND b.finished_time < '.strtotime($this->params['end_time'])+86400;
|
|
|
}
|
|
|
+ //dd($this->sqlJoin);
|
|
|
$where[] = ['a.audit_state','=' ,1];
|
|
|
return $where;
|
|
|
}
|