Commit b9309b03 authored by zhuwei's avatar zhuwei

1

parent 688f5abf
......@@ -42,10 +42,6 @@ class OfficeRemark extends Basic
return $this->response(101, '时间格式错误', []);
}
if (!strtotime($this->params['start_date']) || !strtotime($this->params['end_date'])) {
return $this->response(101, '时间格式错误', []);
}
if (!empty($this->params['start_date']) || !empty($this->params['end_date'])) {
$time = strtotime($this->params['end_date']) - strtotime($this->params['start_date']);
if ($time > 2592000 || $time < 0) {
......@@ -84,7 +80,6 @@ class OfficeRemark extends Basic
}
$result = [];
if ($site_id == "10001" && ($this->params['agent_id'] > 0 || !empty($this->params["content"])) && $is_today && empty($this->params['user_id'])) {
dump('33333');
$searchService = new SearchService();
$this->params['search_content'] = $this->params['content'];
$this->params['start_time'] = strtotime($this->params['start_date'] . ' 00:00:00');
......
......@@ -93,7 +93,7 @@ class OfficePhoneFollowUpService
}
}
$data = $this->phoneFollowUp->getFollowList($page_no, $page_size, $order_ = '', $field, $where);
$data = $this->phoneFollowUp->getFollowList($page_no, $page_size, $order_ = 'id desc', $field, $where);
return ['code'=>'200','data'=>$data];
}
......
......@@ -223,12 +223,15 @@ class OfficePhoneFollowUp extends BaseModel
* @throws \think\exception\DbException
*/
public function getFollowList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '') {
return $this->UPhoneFollowUp->field($field)
$return= $this->UPhoneFollowUp->field($field)
->where($params)
->order($order_)
->limit($pageSize)
->page($pageNo)
->select();
//echo $this->getLastSql();
// big_log($this->getLastSql());
return $return;
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment